diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-08 16:18:32 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-09 08:42:06 +0000 |
| commit | b5699cd01b6a52906880c107bac6f3802ea7353d (patch) | |
| tree | 131315b3755ddf31d56a5359b24a387d9e1ec2e0 /svtools | |
| parent | Explorer File View option in Settings working now (diff) | |
| download | core-b5699cd01b6a52906880c107bac6f3802ea7353d.tar.gz core-b5699cd01b6a52906880c107bac6f3802ea7353d.zip | |
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
Change-Id: I903c6866750e46ee752e10a17c05fcaaf6b11242
Reviewed-on: https://gerrit.libreoffice.org/34062
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
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 7ef820eabbeb..fda6832a7db9 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -1404,11 +1404,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: @@ -1558,11 +1558,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: |