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 /vcl/source/filter/wmf | |
| parent | f1c844fed0fdf898fd6d027529cb2570eb52bec5 (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
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 'vcl/source/filter/wmf')
| -rw-r--r-- | vcl/source/filter/wmf/winmtf.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx index b824a1a2edde..d51db44b11ae 100644 --- a/vcl/source/filter/wmf/winmtf.cxx +++ b/vcl/source/filter/wmf/winmtf.cxx @@ -1800,7 +1800,7 @@ void WinMtfOutput::ResolveBitmapActions( std::vector<std::unique_ptr<BSaveStruct Bitmap aMask( aBitmap ); if ( ( nUsed & 1 ) && ( nRasterOperation & 0xb0 ) == 0xb0 ) // pattern used { - aBitmap.Convert( BMP_CONVERSION_24BIT ); + aBitmap.Convert( BmpConversion::N24Bit ); aBitmap.Erase( maFillStyle.aFillColor ); } BitmapEx aBmpEx( aBitmap, aMask ); |