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 /include/vcl/bitmap.hxx | |
| 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 'include/vcl/bitmap.hxx')
| -rw-r--r-- | include/vcl/bitmap.hxx | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index 217a6f4f20a4..aff55ce29632 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -70,19 +70,17 @@ namespace o3tl #define BMP_COL_TRANS Color( 252, 3, 251 ) -enum BmpConversion +enum class BmpConversion { - BMP_CONVERSION_NONE = 0, - BMP_CONVERSION_1BIT_THRESHOLD = 1, - BMP_CONVERSION_1BIT_MATRIX = 2, - BMP_CONVERSION_4BIT_GREYS = 3, - BMP_CONVERSION_4BIT_COLORS = 4, - BMP_CONVERSION_8BIT_GREYS = 5, - BMP_CONVERSION_8BIT_COLORS = 6, - BMP_CONVERSION_24BIT = 7, - BMP_CONVERSION_4BIT_TRANS = 8, - BMP_CONVERSION_8BIT_TRANS = 9, - BMP_CONVERSION_GHOSTED = 10 + NNONE, + N1BitThreshold, + N4BitGreys, + N4BitColors, + N8BitGreys, + N8BitColors, + N24Bit, + N8BitTrans, + Ghosted }; enum class BmpCombine |