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/gdi/alpha.cxx | |
| 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/gdi/alpha.cxx')
| -rw-r--r-- | vcl/source/gdi/alpha.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/gdi/alpha.cxx b/vcl/source/gdi/alpha.cxx index dc4b50797030..0ece422f591d 100644 --- a/vcl/source/gdi/alpha.cxx +++ b/vcl/source/gdi/alpha.cxx @@ -30,7 +30,7 @@ AlphaMask::AlphaMask( const Bitmap& rBitmap ) : Bitmap( rBitmap ) { if( !!rBitmap ) - Convert( BMP_CONVERSION_8BIT_GREYS ); + Convert( BmpConversion::N8BitGreys ); } AlphaMask::AlphaMask( const AlphaMask& rAlphaMask ) : @@ -59,7 +59,7 @@ AlphaMask& AlphaMask::operator=( const Bitmap& rBitmap ) *static_cast<Bitmap*>(this) = rBitmap; if( !!rBitmap ) - Convert( BMP_CONVERSION_8BIT_GREYS ); + Convert( BmpConversion::N8BitGreys ); return *this; } @@ -154,7 +154,7 @@ void AlphaMask::ReleaseAccess( BitmapReadAccess* pAccess ) if( pAccess ) { Bitmap::ReleaseAccess( pAccess ); - Convert( BMP_CONVERSION_8BIT_GREYS ); + Convert( BmpConversion::N8BitGreys ); } } |