diff options
author | Noel Grandin <noel@peralex.com> | 2016-05-20 09:40:34 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-25 13:19:25 +0000 |
commit | d9ac7def8ba320853e8865535a7a14f9af77521e (patch) | |
tree | 4aef3ff57b2208fd01633f838c83afe727c26544 /vcl/source/gdi/bitmap3.cxx | |
parent | 102196f06400864ef49af961352b5c285ee1f3ab (diff) |
Convert BMP_FORMAT to scoped enum
Change-Id: I751ab762b6e6f961e9e73a8a2ca92a3f5a5eb1c8
Reviewed-on: https://gerrit.libreoffice.org/25189
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/source/gdi/bitmap3.cxx')
-rw-r--r-- | vcl/source/gdi/bitmap3.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx index 46826ad50362..9e5af0edb930 100644 --- a/vcl/source/gdi/bitmap3.cxx +++ b/vcl/source/gdi/bitmap3.cxx @@ -529,8 +529,8 @@ bool Bitmap::ImplMakeGreyscales( sal_uInt16 nGreys ) } } } - else if( pReadAcc->GetScanlineFormat() == BMP_FORMAT_24BIT_TC_BGR && - pWriteAcc->GetScanlineFormat() == BMP_FORMAT_8BIT_PAL ) + else if( pReadAcc->GetScanlineFormat() == ScanlineFormat::N24BitTcBgr && + pWriteAcc->GetScanlineFormat() == ScanlineFormat::N8BitPal ) { nShift += 8; @@ -549,8 +549,8 @@ bool Bitmap::ImplMakeGreyscales( sal_uInt16 nGreys ) } } } - else if( pReadAcc->GetScanlineFormat() == BMP_FORMAT_24BIT_TC_RGB && - pWriteAcc->GetScanlineFormat() == BMP_FORMAT_8BIT_PAL ) + else if( pReadAcc->GetScanlineFormat() == ScanlineFormat::N24BitTcRgb && + pWriteAcc->GetScanlineFormat() == ScanlineFormat::N8BitPal ) { nShift += 8; @@ -2208,7 +2208,7 @@ bool Bitmap::Adjust( short nLuminancePercent, short nContrastPercent, pAcc->SetPaletteColor( i, aNewCol ); } } - else if( pAcc->GetScanlineFormat() == BMP_FORMAT_24BIT_TC_BGR ) + else if( pAcc->GetScanlineFormat() == ScanlineFormat::N24BitTcBgr ) { for( long nY = 0L; nY < nH; nY++ ) { @@ -2222,7 +2222,7 @@ bool Bitmap::Adjust( short nLuminancePercent, short nContrastPercent, } } } - else if( pAcc->GetScanlineFormat() == BMP_FORMAT_24BIT_TC_RGB ) + else if( pAcc->GetScanlineFormat() == ScanlineFormat::N24BitTcRgb ) { for( long nY = 0L; nY < nH; nY++ ) { |