diff options
| author | Mark Page <aptitude@btconnect.com> | 2016-12-05 14:03:12 +0000 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-06 18:17:56 +0000 |
| commit | d08db164dcac8f6aa88158b2848abb5ad66a4052 (patch) | |
| tree | bacb0e7b183115e3b00bd4c375b37908264f0f87 /filter | |
| parent | 0c6c37cb01c242ad9324bc91ac15c974529086c5 (diff) | |
Change Read/Write access to Scoped Read/Write access
Change-Id: Idbe8e393b64f2a151e20c1851d7c14fa161acf97
Reviewed-on: https://gerrit.libreoffice.org/31635
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/flash/swfwriter1.cxx | 10 | ||||
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx index e3ab3ac39224..f5d4dba7a09f 100644 --- a/filter/source/flash/swfwriter1.cxx +++ b/filter/source/flash/swfwriter1.cxx @@ -704,8 +704,8 @@ void getBitmapData( const BitmapEx& aBmpEx, sal_uInt8*& tgadata, sal_uInt8*& tga { if( !aBmpEx.IsEmpty() ) { - Bitmap aBmp( aBmpEx.GetBitmap() ); - BitmapReadAccess* pRAcc = aBmp.AcquireReadAccess(); + Bitmap aBmp( aBmpEx.GetBitmap() ); + Bitmap::ScopedReadAccess pRAcc(aBmp); if( pRAcc ) { @@ -727,7 +727,7 @@ void getBitmapData( const BitmapEx& aBmpEx, sal_uInt8*& tgadata, sal_uInt8*& tga aAlpha = AlphaMask( aBmp.GetSizePixel(), &cAlphaVal ); } - BitmapReadAccess* pAAcc = aAlpha.AcquireReadAccess(); + AlphaMask::ScopedReadAccess pAAcc(aAlpha); if( pAAcc ) { @@ -755,11 +755,7 @@ void getBitmapData( const BitmapEx& aBmpEx, sal_uInt8*& tgadata, sal_uInt8*& tga *pAlpha++ = 0xff - nAlpha; } } - - aAlpha.ReleaseAccess( pAAcc ); } - - Bitmap::ReleaseAccess( pRAcc ); } } } diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 74054409fe97..b5e8a5385361 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -5665,7 +5665,7 @@ void PPTPortionObj::ApplyTo( SfxItemSet& rSet, SdrPowerPointImport& rManager, T if ( aSize.Height() > 64 ) aSize.Height() = 64; - BitmapReadAccess* pAcc = aBmp.AcquireReadAccess(); + Bitmap::ScopedReadAccess pAcc(aBmp); if( pAcc ) { sal_uLong nRt = 0, nGn = 0, nBl = 0; @@ -5694,7 +5694,7 @@ void PPTPortionObj::ApplyTo( SfxItemSet& rSet, SdrPowerPointImport& rManager, T } } } - Bitmap::ReleaseAccess( pAcc ); + pAcc.reset(); sal_uInt32 nC = ( aSize.Width() * aSize.Height() ); nRt /= nC; nGn /= nC; |