diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-20 15:51:01 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-22 17:53:16 +0000 |
| commit | ae033e72144645bb86e70071acc6bf7e2f0dda80 (patch) | |
| tree | df8e702672996728fdf2ee832a208a75b6649167 /vcl/source | |
| parent | 57ef4457becdb5c66a3c0db9e499e1ac491860f2 (diff) | |
Convert BitmapAccessMode to scoped enum
Change-Id: I0f2b86f0a34e257d00856ce4f1dbbb1869ec967a
Reviewed-on: https://gerrit.libreoffice.org/25208
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/gdi/bmpacc.cxx | 10 | ||||
| -rw-r--r-- | vcl/source/gdi/impbmp.cxx | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx index 45ea184ec589..e18f242030dc 100644 --- a/vcl/source/gdi/bmpacc.cxx +++ b/vcl/source/gdi/bmpacc.cxx @@ -36,7 +36,7 @@ BitmapInfoAccess::BitmapInfoAccess( Bitmap& rBitmap, BitmapAccessMode nMode ) : BitmapInfoAccess::BitmapInfoAccess( Bitmap& rBitmap ) : mpBuffer ( nullptr ), - mnAccessMode ( BITMAP_INFO_ACCESS ) + mnAccessMode ( BitmapAccessMode::Info ) { ImplCreate( rBitmap ); } @@ -54,14 +54,14 @@ void BitmapInfoAccess::ImplCreate( Bitmap& rBitmap ) if( xImpBmp ) { - if( mnAccessMode == BITMAP_WRITE_ACCESS && !maBitmap.ImplGetImpBitmap() ) + if( mnAccessMode == BitmapAccessMode::Write && !maBitmap.ImplGetImpBitmap() ) { rBitmap.ImplMakeUnique(); xImpBmp = rBitmap.ImplGetImpBitmap(); } else { - DBG_ASSERT( mnAccessMode != BITMAP_WRITE_ACCESS || + DBG_ASSERT( mnAccessMode != BitmapAccessMode::Write || xImpBmp.use_count() == 2, "Unpredictable results: bitmap is referenced more than once!" ); } @@ -109,7 +109,7 @@ BitmapReadAccess::BitmapReadAccess( Bitmap& rBitmap, BitmapAccessMode nMode ) : } BitmapReadAccess::BitmapReadAccess( Bitmap& rBitmap ) : - BitmapInfoAccess( rBitmap, BITMAP_READ_ACCESS ), + BitmapInfoAccess( rBitmap, BitmapAccessMode::Read ), mpScanBuf ( nullptr ), mFncGetPixel ( nullptr ), mFncSetPixel ( nullptr ) @@ -391,7 +391,7 @@ BitmapColor BitmapReadAccess::GetColorWithFallback( double fY, double fX, const } BitmapWriteAccess::BitmapWriteAccess(Bitmap& rBitmap) - : BitmapReadAccess(rBitmap, BITMAP_WRITE_ACCESS) + : BitmapReadAccess(rBitmap, BitmapAccessMode::Write) , mpLineColor() , mpFillColor() { diff --git a/vcl/source/gdi/impbmp.cxx b/vcl/source/gdi/impbmp.cxx index b25450d8772f..ab06a712d0e1 100644 --- a/vcl/source/gdi/impbmp.cxx +++ b/vcl/source/gdi/impbmp.cxx @@ -87,7 +87,7 @@ void ImpBitmap::ImplReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode { mpSalBitmap->ReleaseBuffer( pBuffer, nMode ); - if( nMode == BITMAP_WRITE_ACCESS ) + if( nMode == BitmapAccessMode::Write ) ImplInvalidateChecksum(); } |