Turn basebmp::Format into a proper enum

Change-Id: I4067c5039c7b5c74a1c144721dd7260de54dd2bf

2 files changed, 34 insertions, 29 deletions

diff --git a/include/basebmp/bitmapdevice.hxx b/include/basebmp/bitmapdevice.hxx
index 84c6d75f32bd..1a815144b03a 100644
--- a/include/basebmp/bitmapdevice.hxx
+++ b/include/basebmp/bitmapdevice.hxx
@@ -22,6 +22,7 @@
 
 #include <sal/types.h>
 #include <basebmp/drawmodes.hxx>
+#include <basebmp/scanlineformats.hxx>
 #include <basebmp/basebmpdllapi.h>
 
 #include <boost/scoped_ptr.hpp>
@@ -101,7 +102,7 @@ public:
 
     /** Query type of scanline memory format
      */
-    sal_Int32 getScanlineFormat() const;
+    Format getScanlineFormat() const;
 
     /** Query byte offset to get from scanline n to scanline n+1
 
@@ -556,7 +557,7 @@ public:
 protected:
     BASEBMP_DLLPRIVATE BitmapDevice( const basegfx::B2IBox&           rBounds,
                                      const basegfx::B2IVector&        rBufferSize,
-                                     sal_Int32                        nScanlineFormat,
+                                     Format                           nScanlineFormat,
                                      sal_Int32                        nScanlineStride,
                                      sal_uInt8*                       pFirstScanline,
                                      const RawMemorySharedArray&      rMem,
@@ -662,7 +663,7 @@ private:
  */
 BitmapDeviceSharedPtr BASEBMP_DLLPUBLIC createBitmapDevice( const basegfx::B2IVector& rSize,
                                                             bool                      bTopDown,
-                                                            sal_Int32                 nScanlineFormat );
+                                                            Format                    nScanlineFormat );
 
 /** Function to create a BitmapDevice for given scanline format
     with the given palette
@@ -673,7 +674,7 @@ BitmapDeviceSharedPtr BASEBMP_DLLPUBLIC createBitmapDevice( const basegfx::B2IVe
  */
 BitmapDeviceSharedPtr BASEBMP_DLLPUBLIC createBitmapDevice( const basegfx::B2IVector&        rSize,
                                                             bool                             bTopDown,
-                                                            sal_Int32                        nScanlineFormat,
+                                                            Format                           nScanlineFormat,
                                                             const PaletteMemorySharedVector& rPalette );
 
 /** Function to create a BitmapDevice for given scanline format
@@ -684,7 +685,7 @@ BitmapDeviceSharedPtr BASEBMP_DLLPUBLIC createBitmapDevice( const basegfx::B2IVe
  */
 BitmapDeviceSharedPtr BASEBMP_DLLPUBLIC createBitmapDevice( const basegfx::B2IVector&        rSize,
                                                             bool                             bTopDown,
-                                                            sal_Int32                        nScanlineFormat,
+                                                            Format                           nScanlineFormat,
                                                             const RawMemorySharedArray&      rMem,
                                                             const PaletteMemorySharedVector& rPalette );
 
diff --git a/include/basebmp/scanlineformats.hxx b/include/basebmp/scanlineformats.hxx
index daac381e810a..c4f7a6fa3e7f 100644
--- a/include/basebmp/scanlineformats.hxx
+++ b/include/basebmp/scanlineformats.hxx
@@ -20,36 +20,40 @@
 #ifndef INCLUDED_BASEBMP_SCANLINEFORMATS_HXX
 #define INCLUDED_BASEBMP_SCANLINEFORMATS_HXX
 
-#include <sal/types.h>
+#include "sal/config.h"
 
 /* Definition of Scanline formats */
 
-namespace basebmp { namespace Format
+namespace basebmp {
+
+enum Format
 {
-    static const sal_Int32 NONE                         = 0;
-    static const sal_Int32 ONE_BIT_MSB_GREY             = (sal_Int32)0x01;
-    static const sal_Int32 ONE_BIT_LSB_GREY             = (sal_Int32)0x02;
-    static const sal_Int32 ONE_BIT_MSB_PAL              = (sal_Int32)0x03;
-    static const sal_Int32 ONE_BIT_LSB_PAL              = (sal_Int32)0x04;
-    static const sal_Int32 FOUR_BIT_MSB_GREY            = (sal_Int32)0x05;
-    static const sal_Int32 FOUR_BIT_LSB_GREY            = (sal_Int32)0x06;
-    static const sal_Int32 FOUR_BIT_MSB_PAL             = (sal_Int32)0x07;
-    static const sal_Int32 FOUR_BIT_LSB_PAL             = (sal_Int32)0x08;
-    static const sal_Int32 EIGHT_BIT_PAL                = (sal_Int32)0x09;
-    static const sal_Int32 EIGHT_BIT_GREY               = (sal_Int32)0x0A;
-    static const sal_Int32 SIXTEEN_BIT_LSB_TC_MASK      = (sal_Int32)0x0B;
-    static const sal_Int32 SIXTEEN_BIT_MSB_TC_MASK      = (sal_Int32)0x0C;
-    static const sal_Int32 TWENTYFOUR_BIT_TC_MASK       = (sal_Int32)0x0D;
+    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,
     // The order of the channels code letters indicates the order of the
     // channel bytes in memory, I think
-    static const sal_Int32 THIRTYTWO_BIT_TC_MASK_BGRA   = (sal_Int32)0x0E;
-    static const sal_Int32 THIRTYTWO_BIT_TC_MASK_ARGB   = (sal_Int32)0x0F;
-    static const sal_Int32 THIRTYTWO_BIT_TC_MASK_ABGR   = (sal_Int32)0x10;
-    static const sal_Int32 THIRTYTWO_BIT_TC_MASK_RGBA   = (sal_Int32)0x11;
-    static const sal_Int32 MAX                          = (sal_Int32)0x11;
-
-    const char *formatName(sal_Int32 nScanlineFormat);
-} }
+    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
+};
+
+const char *formatName(Format nScanlineFormat);
+
+}
 
 #endif /* INCLUDED_BASEBMP_SCANLINEFORMATS_HXX */