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 /svtools | |
| 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 'svtools')
| -rw-r--r-- | svtools/source/graphic/grfmgr2.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index 408bee56e2a0..c59fdf0cc9a6 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -1406,11 +1406,11 @@ void GraphicManager::ImplAdjust( BitmapEx& rBmpEx, const GraphicAttr& rAttr, Gra switch( aAttr.GetDrawMode() ) { case GRAPHICDRAWMODE_MONO: - rBmpEx.Convert( BMP_CONVERSION_1BIT_THRESHOLD ); + rBmpEx.Convert( BmpConversion::N1BitThreshold ); break; case GRAPHICDRAWMODE_GREYS: - rBmpEx.Convert( BMP_CONVERSION_8BIT_GREYS ); + rBmpEx.Convert( BmpConversion::N8BitGreys ); break; case GRAPHICDRAWMODE_WATERMARK: @@ -1560,11 +1560,11 @@ void GraphicManager::ImplAdjust( Animation& rAnimation, const GraphicAttr& rAttr switch( aAttr.GetDrawMode() ) { case GRAPHICDRAWMODE_MONO: - rAnimation.Convert( BMP_CONVERSION_1BIT_THRESHOLD ); + rAnimation.Convert( BmpConversion::N1BitThreshold ); break; case GRAPHICDRAWMODE_GREYS: - rAnimation.Convert( BMP_CONVERSION_8BIT_GREYS ); + rAnimation.Convert( BmpConversion::N8BitGreys ); break; case GRAPHICDRAWMODE_WATERMARK: |