summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-06-02 15:50:22 +0200
committerNoel Grandin <noel@peralex.com>2015-06-04 08:30:24 +0200
commitd4917e99709e16c3ad8178ba47c6e1c656071082 (patch)
treed7aa174b961847c488a2edcd5e848a0f3201c85f /include
parentab377324bb8fe081f1e01cd04f534bcf817fda28 (diff)
convert basebmp::Format to scoped enum
Change-Id: I6eb213d6dcf387936967271fba9e2de3879ef479
Diffstat (limited to 'include')
-rw-r--r--include/basebmp/scanlineformats.hxx42
1 files changed, 21 insertions, 21 deletions
diff --git a/include/basebmp/scanlineformats.hxx b/include/basebmp/scanlineformats.hxx
index b1a54b46b320..ec246d2d1409 100644
--- a/include/basebmp/scanlineformats.hxx
+++ b/include/basebmp/scanlineformats.hxx
@@ -26,33 +26,33 @@
namespace basebmp {
-enum Format
+enum class Format
{
- FORMAT_NONE,
- FORMAT_ONE_BIT_MSB_GREY,
- FORMAT_ONE_BIT_LSB_GREY,
- FORMAT_ONE_BIT_MSB_PAL,
- FORMAT_ONE_BIT_LSB_PAL,
- FORMAT_FOUR_BIT_MSB_GREY,
- FORMAT_FOUR_BIT_LSB_GREY,
- FORMAT_FOUR_BIT_MSB_PAL,
- FORMAT_FOUR_BIT_LSB_PAL,
- FORMAT_EIGHT_BIT_PAL,
- FORMAT_EIGHT_BIT_GREY,
- FORMAT_SIXTEEN_BIT_LSB_TC_MASK,
- FORMAT_SIXTEEN_BIT_MSB_TC_MASK,
- FORMAT_TWENTYFOUR_BIT_TC_MASK,
+ NONE,
+ OneBitMsbGrey,
+ OneBitLsbGrey,
+ OneBitMsbPal,
+ OneBitLsbPal,
+ FourBitMsbGrey,
+ FourBitLsbGrey,
+ FourBitMsbPal,
+ FourBitLsbPal,
+ EightBitPal,
+ EightBitGrey,
+ SixteenBitLsbTcMask,
+ SixteenBitMsbTcMask,
+ TwentyFourBitTcMask,
// CAIRO_FORMAT_RGB24, each pixel is a 32-bit quantity, with the upper 8
// bits unused. Red, Green, and Blue are stored in the remaining 24 bits in
// that order (below U is for unused)
- FORMAT_THIRTYTWO_BIT_TC_MASK_BGRX,
+ ThirtyTwoBitTcMaskBGRX,
// The order of the channels code letters indicates the order of the
// channel bytes in memory
- FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA,
- FORMAT_THIRTYTWO_BIT_TC_MASK_ARGB,
- FORMAT_THIRTYTWO_BIT_TC_MASK_ABGR,
- FORMAT_THIRTYTWO_BIT_TC_MASK_RGBA,
- FORMAT_MAX = FORMAT_THIRTYTWO_BIT_TC_MASK_RGBA
+ ThirtyTwoBitTcMaskBGRA,
+ ThirtyTwoBitTcMaskARGB,
+ ThirtyTwoBitTcMaskABGR,
+ ThirtyTwoBitTcMaskRGBA,
+ LAST = ThirtyTwoBitTcMaskRGBA
};
const char *formatName(Format nScanlineFormat);