diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-08 16:18:32 +0200 |
---|---|---|
committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-12-05 08:17:14 -0500 |
commit | f2c17cd76e7e941dbd5cdf20d0a6514bc65083a8 (patch) | |
tree | 2513e9a1175d02f2f192986385b01ddc0c0caceb /filter | |
parent | f519c90e60b1e9fc63f5d16b5c53cd243a5d151c (diff) |
convert BmpConversion to scoped enum
and drop unused 4BIT_TRANS and 1BIT_MATRIX enumerators
Also fix a bug in x11::convertBitmapDepth where we were incorrectly
passing BmpConversion enumeratirs to ReduceColors
Reviewed-on: https://gerrit.libreoffice.org/34062
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit b5699cd01b6a52906880c107bac6f3802ea7353d)
Change-Id: I903c6866750e46ee752e10a17c05fcaaf6b11242
(cherry picked from commit 2d171734f349c0f9868106f57f5644a70fbeb945)
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/graphicfilter/egif/egif.cxx | 8 | ||||
-rw-r--r-- | filter/source/graphicfilter/eps/eps.cxx | 16 | ||||
-rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 4 |
3 files changed, 14 insertions, 14 deletions
diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx index 29a75abf43d8..4b1315fc44ff 100644 --- a/filter/source/graphicfilter/egif/egif.cxx +++ b/filter/source/graphicfilter/egif/egif.cxx @@ -253,17 +253,17 @@ bool GIFWriter::CreateAccess( const BitmapEx& rBmpEx ) if( !!aMask ) { - if( aAccBmp.Convert( BMP_CONVERSION_8BIT_TRANS ) ) + if( aAccBmp.Convert( BmpConversion::N8BitTrans ) ) { - aMask.Convert( BMP_CONVERSION_1BIT_THRESHOLD ); + aMask.Convert( BmpConversion::N1BitThreshold ); aAccBmp.Replace( aMask, BMP_COL_TRANS ); bTransparent = true; } else - aAccBmp.Convert( BMP_CONVERSION_8BIT_COLORS ); + aAccBmp.Convert( BmpConversion::N8BitColors ); } else - aAccBmp.Convert( BMP_CONVERSION_8BIT_COLORS ); + aAccBmp.Convert( BmpConversion::N8BitColors ); m_pAcc = aAccBmp.AcquireReadAccess(); diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index 4f299eb02018..3bef3cf94f4e 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -359,7 +359,7 @@ bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Filter if ( mbGrayScale ) { BitmapEx aTempBitmapEx( rGraphic.GetBitmapEx() ); - aTempBitmapEx.Convert( BMP_CONVERSION_8BIT_GREYS ); + aTempBitmapEx.Convert( BmpConversion::N8BitGreys ); nErrCode = GraphicConverter::Export( rTargetStream, aTempBitmapEx, ConvertDataFormat::TIF ) ; } else @@ -490,7 +490,7 @@ void PSWriter::ImplWriteProlog( const Graphic* pPreview ) Size aSizeBitmap( ( aSizePoint.Width() + 7 ) & ~7, aSizePoint.Height() ); Bitmap aTmpBitmap( pPreview->GetBitmap() ); aTmpBitmap.Scale( aSizeBitmap, BmpScaleFlag::BestQuality ); - aTmpBitmap.Convert( BMP_CONVERSION_1BIT_THRESHOLD ); + aTmpBitmap.Convert( BmpConversion::N1BitThreshold ); BitmapReadAccess* pAcc = aTmpBitmap.AcquireReadAccess(); if ( pAcc ) { @@ -798,7 +798,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) { Bitmap aBitmap = static_cast<const MetaBmpAction*>(pMA)->GetBitmap(); if ( mbGrayScale ) - aBitmap.Convert( BMP_CONVERSION_8BIT_GREYS ); + aBitmap.Convert( BmpConversion::N8BitGreys ); Point aPoint = static_cast<const MetaBmpAction*>(pMA)->GetPoint(); Size aSize( rVDev.PixelToLogic( aBitmap.GetSizePixel() ) ); ImplBmp( &aBitmap, nullptr, aPoint, aSize.Width(), aSize.Height() ); @@ -809,7 +809,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) { Bitmap aBitmap = static_cast<const MetaBmpScaleAction*>(pMA)->GetBitmap(); if ( mbGrayScale ) - aBitmap.Convert( BMP_CONVERSION_8BIT_GREYS ); + aBitmap.Convert( BmpConversion::N8BitGreys ); Point aPoint = static_cast<const MetaBmpScaleAction*>(pMA)->GetPoint(); Size aSize = static_cast<const MetaBmpScaleAction*>(pMA)->GetSize(); ImplBmp( &aBitmap, nullptr, aPoint, aSize.Width(), aSize.Height() ); @@ -822,7 +822,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) aBitmap.Crop( Rectangle( static_cast<const MetaBmpScalePartAction*>(pMA)->GetSrcPoint(), static_cast<const MetaBmpScalePartAction*>(pMA)->GetSrcSize() ) ); if ( mbGrayScale ) - aBitmap.Convert( BMP_CONVERSION_8BIT_GREYS ); + aBitmap.Convert( BmpConversion::N8BitGreys ); Point aPoint = static_cast<const MetaBmpScalePartAction*>(pMA)->GetDestPoint(); Size aSize = static_cast<const MetaBmpScalePartAction*>(pMA)->GetDestSize(); ImplBmp( &aBitmap, nullptr, aPoint, aSize.Width(), aSize.Height() ); @@ -834,7 +834,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) BitmapEx aBitmapEx( static_cast<MetaBmpExAction*>(pMA)->GetBitmapEx() ); Bitmap aBitmap( aBitmapEx.GetBitmap() ); if ( mbGrayScale ) - aBitmap.Convert( BMP_CONVERSION_8BIT_GREYS ); + aBitmap.Convert( BmpConversion::N8BitGreys ); Bitmap aMask( aBitmapEx.GetMask() ); Point aPoint( static_cast<const MetaBmpExAction*>(pMA)->GetPoint() ); Size aSize( rVDev.PixelToLogic( aBitmap.GetSizePixel() ) ); @@ -847,7 +847,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) BitmapEx aBitmapEx( static_cast<MetaBmpExScaleAction*>(pMA)->GetBitmapEx() ); Bitmap aBitmap( aBitmapEx.GetBitmap() ); if ( mbGrayScale ) - aBitmap.Convert( BMP_CONVERSION_8BIT_GREYS ); + aBitmap.Convert( BmpConversion::N8BitGreys ); Bitmap aMask( aBitmapEx.GetMask() ); Point aPoint = static_cast<const MetaBmpExScaleAction*>(pMA)->GetPoint(); Size aSize( static_cast<const MetaBmpExScaleAction*>(pMA)->GetSize() ); @@ -862,7 +862,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) static_cast<const MetaBmpExScalePartAction*>(pMA)->GetSrcSize() ) ); Bitmap aBitmap( aBitmapEx.GetBitmap() ); if ( mbGrayScale ) - aBitmap.Convert( BMP_CONVERSION_8BIT_GREYS ); + aBitmap.Convert( BmpConversion::N8BitGreys ); Bitmap aMask( aBitmapEx.GetMask() ); Point aPoint = static_cast<const MetaBmpExScalePartAction*>(pMA)->GetDestPoint(); Size aSize = static_cast<const MetaBmpExScalePartAction*>(pMA)->GetDestSize(); diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 8bbfbca3f724..98427c6ebab6 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -3917,9 +3917,9 @@ SdrObject* SvxMSDffManager::ImportGraphic( SvStream& rSt, SfxItemSet& rSet, cons if ( nBrightness || nContrast || ( nGamma != 0x10000 ) ) aBitmapEx.Adjust( nBrightness, (sal_Int16)nContrast, 0, 0, 0, (double)nGamma / 0x10000, false, true ); if ( eDrawMode == GRAPHICDRAWMODE_GREYS ) - aBitmapEx.Convert( BMP_CONVERSION_8BIT_GREYS ); + aBitmapEx.Convert( BmpConversion::N8BitGreys ); else if ( eDrawMode == GRAPHICDRAWMODE_MONO ) - aBitmapEx.Convert( BMP_CONVERSION_1BIT_THRESHOLD ); + aBitmapEx.Convert( BmpConversion::N1BitThreshold ); aGraf = aBitmapEx; } |