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 /svx | |
| 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 'svx')
| -rw-r--r-- | svx/source/dialog/_contdlg.cxx | 2 | ||||
| -rw-r--r-- | svx/source/gallery2/galobj.cxx | 8 | ||||
| -rw-r--r-- | svx/source/xoutdev/_xoutbmp.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index c3e6959041ec..2b0555820971 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -137,7 +137,7 @@ tools::PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic, aTransMap.SetOrigin( Point() ); pVDev->SetMapMode( aTransMap ); aBmp = pVDev->GetBitmap( Point(), rSizePix ); - aBmp.Convert( BMP_CONVERSION_1BIT_THRESHOLD ); + aBmp.Convert( BmpConversion::N1BitThreshold ); } } else if( rGraphic.IsTransparent() ) diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index 45af5e587330..7e1508958e8a 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -125,7 +125,7 @@ bool SgaObject::CreateThumb( const Graphic& rGraphic ) if( ( aBmpSize.Width() <= S_THUMB ) && ( aBmpSize.Height() <= S_THUMB ) ) { - aThumbBmp.Convert( BMP_CONVERSION_8BIT_COLORS ); + aThumbBmp.Convert( BmpConversion::N8BitColors ); bRet = true; } else @@ -138,7 +138,7 @@ bool SgaObject::CreateThumb( const Graphic& rGraphic ) (double) aNewSize.Height() / aBmpSize.Height(), BmpScaleFlag::BestQuality ) ) { - aThumbBmp.Convert( BMP_CONVERSION_8BIT_COLORS ); + aThumbBmp.Convert( BmpConversion::N8BitColors ); bRet = true; } } @@ -159,7 +159,7 @@ bool SgaObject::CreateThumb( const Graphic& rGraphic ) if( !aThumbBmp.IsEmpty() ) { - aThumbBmp.Convert( BMP_CONVERSION_8BIT_COLORS ); + aThumbBmp.Convert( BmpConversion::N8BitColors ); bRet = true; } } @@ -508,7 +508,7 @@ bool SgaObjectSvDraw::CreateThumb( const FmFormModel& rModel ) if(!!aThumbBmp) { aThumbBmp.Scale(Size(nTargetSizeX, nTargetSizeY), BmpScaleFlag::BestQuality); - aThumbBmp.Convert(BMP_CONVERSION_8BIT_COLORS); + aThumbBmp.Convert(BmpConversion::N8BitColors); bRet = true; } } diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx index 58addbc8e5e1..53a6691a2254 100644 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -442,7 +442,7 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const sal_uInt8 cThreshold ) { Bitmap aWorkBmp( rBmp ); - if( aWorkBmp.Convert( BMP_CONVERSION_8BIT_GREYS ) ) + if( aWorkBmp.Convert( BmpConversion::N8BitGreys ) ) { bool bRet = false; |