diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-07-12 12:25:39 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-07-12 14:41:35 +0200 |
| commit | d8dbf1b5dbfa0db2d765063a1d848d031835398a (patch) | |
| tree | 0afe6c5fed33be4f42d61c36e92afc697a2e3eba /basebmp/source/debug.cxx | |
| parent | THIRTYTWO_BIT_TC_MASK is the same as THIRTYTWO_BIT_TC_MASK_BGRA (diff) | |
| download | core-d8dbf1b5dbfa0db2d765063a1d848d031835398a.tar.gz core-d8dbf1b5dbfa0db2d765063a1d848d031835398a.zip | |
Turn basebmp::Format into a proper enum
Change-Id: I4067c5039c7b5c74a1c144721dd7260de54dd2bf
Diffstat (limited to 'basebmp/source/debug.cxx')
| -rw-r--r-- | basebmp/source/debug.cxx | 85 |
1 files changed, 41 insertions, 44 deletions
diff --git a/basebmp/source/debug.cxx b/basebmp/source/debug.cxx index 765005811b48..d8348ffd379b 100644 --- a/basebmp/source/debug.cxx +++ b/basebmp/source/debug.cxx @@ -31,51 +31,48 @@ namespace basebmp { - namespace Format + const char* formatName( Format nScanlineFormat ) { - const char* formatName( sal_Int32 nScanlineFormat ) + switch( nScanlineFormat ) { - switch( nScanlineFormat ) - { - case Format::NONE: - return "NONE"; - case Format::ONE_BIT_MSB_GREY: - return "ONE_BIT_MSB_GREY"; - case Format::ONE_BIT_LSB_GREY: - return "ONE_BIT_LSB_GREY"; - case Format::ONE_BIT_MSB_PAL: - return "ONE_BIT_MSB_PAL"; - case Format::ONE_BIT_LSB_PAL: - return "ONE_BIT_LSB_PAL"; - case Format::FOUR_BIT_MSB_GREY: - return "FOUR_BIT_MSB_GREY"; - case Format::FOUR_BIT_LSB_GREY: - return "FOUR_BIT_LSB_GREY"; - case Format::FOUR_BIT_MSB_PAL: - return "FOUR_BIT_MSB_PAL"; - case Format::FOUR_BIT_LSB_PAL: - return "FOUR_BIT_LSB_PAL"; - case Format::EIGHT_BIT_PAL: - return "EIGHT_BIT_PAL"; - case Format::EIGHT_BIT_GREY: - return "EIGHT_BIT_GREY"; - case Format::SIXTEEN_BIT_LSB_TC_MASK: - return "SIXTEEN_BIT_LSB_TC_MASK"; - case Format::SIXTEEN_BIT_MSB_TC_MASK: - return "SIXTEEN_BIT_MSB_TC_MASK"; - case Format::TWENTYFOUR_BIT_TC_MASK: - return "TWENTYFOUR_BIT_TC_MASK"; - case Format::THIRTYTWO_BIT_TC_MASK_BGRA: - return "THIRTYTWO_BIT_TC_MASK_BGRA"; - case Format::THIRTYTWO_BIT_TC_MASK_ARGB: - return "THIRTYTWO_BIT_TC_MASK_ARGB"; - case Format::THIRTYTWO_BIT_TC_MASK_ABGR: - return "THIRTYTWO_BIT_TC_MASK_ABGR"; - case Format::THIRTYTWO_BIT_TC_MASK_RGBA: - return "THIRTYTWO_BIT_TC_MASK_RGBA"; - default: - return "<unknown>"; - } + case FORMAT_NONE: + return "NONE"; + case FORMAT_ONE_BIT_MSB_GREY: + return "ONE_BIT_MSB_GREY"; + case FORMAT_ONE_BIT_LSB_GREY: + return "ONE_BIT_LSB_GREY"; + case FORMAT_ONE_BIT_MSB_PAL: + return "ONE_BIT_MSB_PAL"; + case FORMAT_ONE_BIT_LSB_PAL: + return "ONE_BIT_LSB_PAL"; + case FORMAT_FOUR_BIT_MSB_GREY: + return "FOUR_BIT_MSB_GREY"; + case FORMAT_FOUR_BIT_LSB_GREY: + return "FOUR_BIT_LSB_GREY"; + case FORMAT_FOUR_BIT_MSB_PAL: + return "FOUR_BIT_MSB_PAL"; + case FORMAT_FOUR_BIT_LSB_PAL: + return "FOUR_BIT_LSB_PAL"; + case FORMAT_EIGHT_BIT_PAL: + return "EIGHT_BIT_PAL"; + case FORMAT_EIGHT_BIT_GREY: + return "EIGHT_BIT_GREY"; + case FORMAT_SIXTEEN_BIT_LSB_TC_MASK: + return "SIXTEEN_BIT_LSB_TC_MASK"; + case FORMAT_SIXTEEN_BIT_MSB_TC_MASK: + return "SIXTEEN_BIT_MSB_TC_MASK"; + case FORMAT_TWENTYFOUR_BIT_TC_MASK: + return "TWENTYFOUR_BIT_TC_MASK"; + case FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA: + return "THIRTYTWO_BIT_TC_MASK_BGRA"; + case FORMAT_THIRTYTWO_BIT_TC_MASK_ARGB: + return "THIRTYTWO_BIT_TC_MASK_ARGB"; + case FORMAT_THIRTYTWO_BIT_TC_MASK_ABGR: + return "THIRTYTWO_BIT_TC_MASK_ABGR"; + case FORMAT_THIRTYTWO_BIT_TC_MASK_RGBA: + return "THIRTYTWO_BIT_TC_MASK_RGBA"; + default: + return "<unknown>"; } } @@ -86,7 +83,7 @@ namespace basebmp { const basegfx::B2IVector aSize( rDevice->getSize() ); const bool bTopDown( rDevice->isTopDown() ); - const sal_Int32 nScanlineFormat( rDevice->getScanlineFormat() ); + const Format nScanlineFormat( rDevice->getScanlineFormat() ); rOutputStream << "/* basebmp::BitmapDevice content dump */" << std::endl |