summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--basebmp/source/bitmapdevice.cxx47
-rw-r--r--basebmp/source/debug.cxx38
-rw-r--r--basebmp/test/basictest.cxx34
-rw-r--r--basebmp/test/bmpmasktest.cxx20
-rw-r--r--basebmp/test/bmptest.cxx16
-rw-r--r--basebmp/test/cliptest.cxx16
-rw-r--r--basebmp/test/filltest.cxx8
-rw-r--r--basebmp/test/linetest.cxx16
-rw-r--r--basebmp/test/masktest.cxx12
-rw-r--r--basebmp/test/polytest.cxx8
-rw-r--r--include/basebmp/scanlineformats.hxx42
-rw-r--r--vcl/android/androidinst.cxx2
-rw-r--r--vcl/headless/svpbmp.cxx102
-rw-r--r--vcl/headless/svpinst.cxx18
-rw-r--r--vcl/headless/svptextrender.cxx53
-rw-r--r--vcl/headless/svpvd.cxx2
-rw-r--r--vcl/inc/generic/glyphcache.hxx7
-rw-r--r--vcl/inc/headless/svpbmp.hxx2
-rw-r--r--vcl/ios/iosinst.cxx2
-rw-r--r--vcl/unx/gtk/window/gtksalframe.cxx2
20 files changed, 224 insertions, 223 deletions
diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx
index 5c98c5d85710..1fa27edae0fa 100644
--- a/basebmp/source/bitmapdevice.cxx
+++ b/basebmp/source/bitmapdevice.cxx
@@ -54,6 +54,7 @@
#include <rtl/alloc.h>
#include <sal/log.hxx>
#include <osl/diagnose.h>
+#include <o3tl/enumarray.hxx>
#include <basegfx/tools/tools.hxx>
#include <basegfx/tools/canvastools.hxx>
@@ -92,7 +93,7 @@ operator^( RGBValue<Value, RedIndex, GreenIndex, BlueIndex> const& lhs,
namespace basebmp
{
-static const sal_uInt8 bitsPerPixel[] =
+static const o3tl::enumarray<Format,sal_uInt8> bitsPerPixel =
{
0, // NONE
1, // ONE_BIT_MSB_GREY
@@ -1944,8 +1945,8 @@ BitmapDeviceSharedPtr createBitmapDeviceImplInner( const basegfx::B2IVector&
{
OSL_ASSERT(rSize.getX() > 0 && rSize.getY() > 0);
- if( nScanlineFormat <= FORMAT_NONE ||
- nScanlineFormat > FORMAT_MAX )
+ if( nScanlineFormat <= Format::NONE ||
+ nScanlineFormat > Format::LAST )
return BitmapDeviceSharedPtr();
sal_uInt8 nBitsPerPixel = bitsPerPixel[nScanlineFormat];
@@ -1996,23 +1997,23 @@ BitmapDeviceSharedPtr createBitmapDeviceImplInner( const basegfx::B2IVector&
// one bit formats
- case FORMAT_ONE_BIT_MSB_GREY:
+ case Format::OneBitMsbGrey:
return createRenderer<PixelFormatTraits_GREY1_MSB,StdMasks>(
aBounds, rSize, nScanlineFormat, nScanlineStride,
pFirstScanline, pMem, pPal, rDamage );
- case FORMAT_ONE_BIT_LSB_GREY:
+ case Format::OneBitLsbGrey:
return createRenderer<PixelFormatTraits_GREY1_LSB,StdMasks>(
aBounds, rSize, nScanlineFormat, nScanlineStride,
pFirstScanline, pMem, pPal, rDamage );
- case FORMAT_ONE_BIT_MSB_PAL:
+ case Format::OneBitMsbPal:
return createRenderer<PixelFormatTraits_PAL1_MSB,StdMasks>(
aBounds, rSize, nScanlineFormat, nScanlineStride,
pFirstScanline, pMem, pPal,
bitsPerPixel[nScanlineFormat], rDamage );
- case FORMAT_ONE_BIT_LSB_PAL:
+ case Format::OneBitLsbPal:
return createRenderer<PixelFormatTraits_PAL1_LSB,StdMasks>(
aBounds, rSize, nScanlineFormat, nScanlineStride,
pFirstScanline, pMem, pPal,
@@ -2022,23 +2023,23 @@ BitmapDeviceSharedPtr createBitmapDeviceImplInner( const basegfx::B2IVector&
// four bit formats
- case FORMAT_FOUR_BIT_MSB_GREY:
+ case Format::FourBitMsbGrey:
return createRenderer<PixelFormatTraits_GREY4_MSB,StdMasks>(
aBounds, rSize, nScanlineFormat, nScanlineStride,
pFirstScanline, pMem, pPal, rDamage );
- case FORMAT_FOUR_BIT_LSB_GREY:
+ case Format::FourBitLsbGrey:
return createRenderer<PixelFormatTraits_GREY4_LSB,StdMasks>(
aBounds, rSize, nScanlineFormat, nScanlineStride,
pFirstScanline, pMem, pPal, rDamage );
- case FORMAT_FOUR_BIT_MSB_PAL:
+ case Format::FourBitMsbPal:
return createRenderer<PixelFormatTraits_PAL4_MSB,StdMasks>(
aBounds, rSize, nScanlineFormat, nScanlineStride,
pFirstScanline, pMem, pPal,
bitsPerPixel[nScanlineFormat], rDamage );
- case FORMAT_FOUR_BIT_LSB_PAL:
+ case Format::FourBitLsbPal:
return createRenderer<PixelFormatTraits_PAL4_LSB,StdMasks>(
aBounds, rSize, nScanlineFormat, nScanlineStride,
pFirstScanline, pMem, pPal,
@@ -2048,12 +2049,12 @@ BitmapDeviceSharedPtr createBitmapDeviceImplInner( const basegfx::B2IVector&
// eight bit formats
- case FORMAT_EIGHT_BIT_GREY:
+ case Format::EightBitGrey:
return createRenderer<PixelFormatTraits_GREY8,StdMasks>(
aBounds, rSize, nScanlineFormat, nScanlineStride,
pFirstScanline, pMem, pPal, rDamage );
- case FORMAT_EIGHT_BIT_PAL:
+ case Format::EightBitPal:
return createRenderer<PixelFormatTraits_PAL8,StdMasks>(
aBounds, rSize, nScanlineFormat, nScanlineStride,
pFirstScanline, pMem, pPal,
@@ -2063,18 +2064,18 @@ BitmapDeviceSharedPtr createBitmapDeviceImplInner( const basegfx::B2IVector&
// sixteen bit formats
- case FORMAT_SIXTEEN_BIT_LSB_TC_MASK:
+ case Format::SixteenBitLsbTcMask:
return createRenderer<PixelFormatTraits_RGB16_565_LSB,StdMasks>(
aBounds, rSize, nScanlineFormat, nScanlineStride,
pFirstScanline, pMem, pPal, rDamage );
- case FORMAT_SIXTEEN_BIT_MSB_TC_MASK:
+ case Format::SixteenBitMsbTcMask:
return createRenderer<PixelFormatTraits_RGB16_565_MSB,StdMasks>(
aBounds, rSize, nScanlineFormat, nScanlineStride,
pFirstScanline, pMem, pPal, rDamage );
// twentyfour bit formats
- case FORMAT_TWENTYFOUR_BIT_TC_MASK:
+ case Format::TwentyFourBitTcMask:
return createRenderer<PixelFormatTraits_BGR24,StdMasks>(
aBounds, rSize, nScanlineFormat, nScanlineStride,
pFirstScanline, pMem, pPal, rDamage );
@@ -2082,27 +2083,27 @@ BitmapDeviceSharedPtr createBitmapDeviceImplInner( const basegfx::B2IVector&
// thirtytwo bit formats
// 8 red bits, 8 green bits, 8 blue bits, and 8 ignored bits like CAIRO_FORMAT_RGB24
- case FORMAT_THIRTYTWO_BIT_TC_MASK_BGRX:
+ case Format::ThirtyTwoBitTcMaskBGRX:
return createRenderer<PixelFormatTraits_BGRX32_8888,StdMasks>(
aBounds, rSize, nScanlineFormat, nScanlineStride,
pFirstScanline, pMem, pPal, rDamage );
- case FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA:
+ case Format::ThirtyTwoBitTcMaskBGRA:
return createRenderer<PixelFormatTraits_BGRA32_8888,StdMasks>(
aBounds, rSize, nScanlineFormat, nScanlineStride,
pFirstScanline, pMem, pPal, rDamage );
- case FORMAT_THIRTYTWO_BIT_TC_MASK_ARGB:
+ case Format::ThirtyTwoBitTcMaskARGB:
return createRenderer<PixelFormatTraits_ARGB32_8888,StdMasks>(
aBounds, rSize, nScanlineFormat, nScanlineStride,
pFirstScanline, pMem, pPal, rDamage );
- case FORMAT_THIRTYTWO_BIT_TC_MASK_ABGR:
+ case Format::ThirtyTwoBitTcMaskABGR:
return createRenderer<PixelFormatTraits_ABGR32_8888,StdMasks>(
aBounds, rSize, nScanlineFormat, nScanlineStride,
pFirstScanline, pMem, pPal, rDamage );
- case FORMAT_THIRTYTWO_BIT_TC_MASK_RGBA:
+ case Format::ThirtyTwoBitTcMaskRGBA:
return createRenderer<PixelFormatTraits_RGBA32_8888,StdMasks>(
aBounds, rSize, nScanlineFormat, nScanlineStride,
pFirstScanline, pMem, pPal, rDamage );
@@ -2213,8 +2214,8 @@ BitmapDeviceSharedPtr createClipDevice( const basegfx::B2IVector& rSize )
BitmapDeviceSharedPtr xClip(
createBitmapDeviceImpl( rSize,
false, /* bTopDown */
- basebmp::FORMAT_ONE_BIT_MSB_GREY,
- getBitmapDeviceStrideForWidth(basebmp::FORMAT_ONE_BIT_MSB_GREY, rSize.getX()),
+ basebmp::Format::OneBitMsbGrey,
+ getBitmapDeviceStrideForWidth(basebmp::Format::OneBitMsbGrey, rSize.getX()),
boost::shared_array< sal_uInt8 >(),
PaletteMemorySharedVector(),
NULL,
diff --git a/basebmp/source/debug.cxx b/basebmp/source/debug.cxx
index 3d68a43c2447..3b9de684e86b 100644
--- a/basebmp/source/debug.cxx
+++ b/basebmp/source/debug.cxx
@@ -35,43 +35,43 @@ namespace basebmp
{
switch( nScanlineFormat )
{
- case FORMAT_NONE:
+ case Format::NONE:
return "NONE";
- case FORMAT_ONE_BIT_MSB_GREY:
+ case Format::OneBitMsbGrey:
return "ONE_BIT_MSB_GREY";
- case FORMAT_ONE_BIT_LSB_GREY:
+ case Format::OneBitLsbGrey:
return "ONE_BIT_LSB_GREY";
- case FORMAT_ONE_BIT_MSB_PAL:
+ case Format::OneBitMsbPal:
return "ONE_BIT_MSB_PAL";
- case FORMAT_ONE_BIT_LSB_PAL:
+ case Format::OneBitLsbPal:
return "ONE_BIT_LSB_PAL";
- case FORMAT_FOUR_BIT_MSB_GREY:
+ case Format::FourBitMsbGrey:
return "FOUR_BIT_MSB_GREY";
- case FORMAT_FOUR_BIT_LSB_GREY:
+ case Format::FourBitLsbGrey:
return "FOUR_BIT_LSB_GREY";
- case FORMAT_FOUR_BIT_MSB_PAL:
+ case Format::FourBitMsbPal:
return "FOUR_BIT_MSB_PAL";
- case FORMAT_FOUR_BIT_LSB_PAL:
+ case Format::FourBitLsbPal:
return "FOUR_BIT_LSB_PAL";
- case FORMAT_EIGHT_BIT_PAL:
+ case Format::EightBitPal:
return "EIGHT_BIT_PAL";
- case FORMAT_EIGHT_BIT_GREY:
+ case Format::EightBitGrey:
return "EIGHT_BIT_GREY";
- case FORMAT_SIXTEEN_BIT_LSB_TC_MASK:
+ case Format::SixteenBitLsbTcMask:
return "SIXTEEN_BIT_LSB_TC_MASK";
- case FORMAT_SIXTEEN_BIT_MSB_TC_MASK:
+ case Format::SixteenBitMsbTcMask:
return "SIXTEEN_BIT_MSB_TC_MASK";
- case FORMAT_TWENTYFOUR_BIT_TC_MASK:
+ case Format::TwentyFourBitTcMask:
return "TWENTYFOUR_BIT_TC_MASK";
- case FORMAT_THIRTYTWO_BIT_TC_MASK_BGRX:
+ case Format::ThirtyTwoBitTcMaskBGRX:
return "THIRTYTWO_BIT_TC_MASK_BGRX";
- case FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA:
+ case Format::ThirtyTwoBitTcMaskBGRA:
return "THIRTYTWO_BIT_TC_MASK_BGRA";
- case FORMAT_THIRTYTWO_BIT_TC_MASK_ARGB:
+ case Format::ThirtyTwoBitTcMaskARGB:
return "THIRTYTWO_BIT_TC_MASK_ARGB";
- case FORMAT_THIRTYTWO_BIT_TC_MASK_ABGR:
+ case Format::ThirtyTwoBitTcMaskABGR:
return "THIRTYTWO_BIT_TC_MASK_ABGR";
- case FORMAT_THIRTYTWO_BIT_TC_MASK_RGBA:
+ case Format::ThirtyTwoBitTcMaskRGBA:
return "THIRTYTWO_BIT_TC_MASK_RGBA";
default:
return "<unknown>";
diff --git a/basebmp/test/basictest.cxx b/basebmp/test/basictest.cxx
index c74d632ba5cc..3531b6a42715 100644
--- a/basebmp/test/basictest.cxx
+++ b/basebmp/test/basictest.cxx
@@ -83,14 +83,14 @@ public:
basegfx::B2ISize aSize2(aSize);
BitmapDeviceSharedPtr pDevice( createBitmapDevice( aSize,
true,
- FORMAT_ONE_BIT_MSB_PAL,
- basebmp::getBitmapDeviceStrideForWidth(FORMAT_ONE_BIT_MSB_PAL, aSize.getX())));
+ Format::OneBitMsbPal,
+ basebmp::getBitmapDeviceStrideForWidth(Format::OneBitMsbPal, aSize.getX())));
CPPUNIT_ASSERT_MESSAGE("right size",
pDevice->getSize() == aSize2 );
CPPUNIT_ASSERT_MESSAGE("Top down format",
pDevice->isTopDown() );
CPPUNIT_ASSERT_MESSAGE("Scanline format",
- pDevice->getScanlineFormat() == FORMAT_ONE_BIT_MSB_PAL );
+ pDevice->getScanlineFormat() == Format::OneBitMsbPal );
CPPUNIT_ASSERT_MESSAGE("Scanline len",
pDevice->getScanlineStride() == (aSize2.getY() + 7)/8 );
CPPUNIT_ASSERT_MESSAGE("Palette existence",
@@ -107,8 +107,8 @@ public:
basegfx::B2ISize aSize2(3,3);
BitmapDeviceSharedPtr pDevice( createBitmapDevice( aSize,
true,
- FORMAT_ONE_BIT_MSB_PAL,
- basebmp::getBitmapDeviceStrideForWidth(FORMAT_ONE_BIT_MSB_PAL, aSize.getX())));
+ Format::OneBitMsbPal,
+ basebmp::getBitmapDeviceStrideForWidth(Format::OneBitMsbPal, aSize.getX())));
BitmapDeviceSharedPtr pClone( cloneBitmapDevice(
aSize2,
@@ -123,8 +123,8 @@ public:
const basegfx::B2ISize aSize(64,64);
BitmapDeviceSharedPtr pDevice( createBitmapDevice( aSize,
true,
- FORMAT_ONE_BIT_MSB_PAL,
- basebmp::getBitmapDeviceStrideForWidth(FORMAT_ONE_BIT_MSB_PAL, aSize.getX())));
+ Format::OneBitMsbPal,
+ basebmp::getBitmapDeviceStrideForWidth(Format::OneBitMsbPal, aSize.getX())));
const basegfx::B2IPoint aPt(3,3);
CPPUNIT_ASSERT_MESSAGE("getPixelData for virgin device",
@@ -171,8 +171,8 @@ public:
{
pDevice = createBitmapDevice( aSize,
true,
- FORMAT_ONE_BIT_LSB_PAL,
- basebmp::getBitmapDeviceStrideForWidth(FORMAT_ONE_BIT_LSB_PAL, aSize.getX()));
+ Format::OneBitLsbPal,
+ basebmp::getBitmapDeviceStrideForWidth(Format::OneBitLsbPal, aSize.getX()));
pDevice->setPixel( aPt2, aCol, DrawMode::Paint );
CPPUNIT_ASSERT_MESSAGE("get/setPixel roundtrip #4",
@@ -197,8 +197,8 @@ public:
{
pDevice = createBitmapDevice( aSize,
true,
- FORMAT_EIGHT_BIT_GREY,
- basebmp::getBitmapDeviceStrideForWidth(FORMAT_EIGHT_BIT_GREY, aSize.getX()));
+ Format::EightBitGrey,
+ basebmp::getBitmapDeviceStrideForWidth(Format::EightBitGrey, aSize.getX()));
const Color aCol4(0x010101);
pDevice->setPixel( aPt, aCol4, DrawMode::Paint );
@@ -220,8 +220,8 @@ public:
{
pDevice = createBitmapDevice( aSize,
true,
- FORMAT_SIXTEEN_BIT_LSB_TC_MASK,
- basebmp::getBitmapDeviceStrideForWidth(FORMAT_SIXTEEN_BIT_LSB_TC_MASK, aSize.getX()));
+ Format::SixteenBitLsbTcMask,
+ basebmp::getBitmapDeviceStrideForWidth(Format::SixteenBitLsbTcMask, aSize.getX()));
const Color aCol7(0);
pDevice->clear( aCol7 );
@@ -245,8 +245,8 @@ public:
{
pDevice = createBitmapDevice( aSize,
true,
- FORMAT_TWENTYFOUR_BIT_TC_MASK,
- basebmp::getBitmapDeviceStrideForWidth(FORMAT_TWENTYFOUR_BIT_TC_MASK, aSize.getX()));
+ Format::TwentyFourBitTcMask,
+ basebmp::getBitmapDeviceStrideForWidth(Format::TwentyFourBitTcMask, aSize.getX()));
const Color aCol4(0x01010101);
pDevice->setPixel( aPt, aCol4, DrawMode::Paint );
@@ -273,8 +273,8 @@ public:
{
pDevice = createBitmapDevice( aSize,
true,
- FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA,
- basebmp::getBitmapDeviceStrideForWidth(FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA, aSize.getX()));
+ Format::ThirtyTwoBitTcMaskBGRA,
+ basebmp::getBitmapDeviceStrideForWidth(Format::ThirtyTwoBitTcMaskBGRA, aSize.getX()));
const Color aCol4(0x01010101);
pDevice->setPixel( aPt, aCol4, DrawMode::Paint );
diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx
index b3e4b68bcef9..f123823cd78a 100644
--- a/basebmp/test/bmpmasktest.cxx
+++ b/basebmp/test/bmpmasktest.cxx
@@ -93,26 +93,26 @@ public:
const basegfx::B2ISize aSize(10,10);
mpDevice1bpp = createBitmapDevice( aSize,
true,
- FORMAT_ONE_BIT_MSB_PAL,
- basebmp::getBitmapDeviceStrideForWidth(FORMAT_ONE_BIT_MSB_PAL, aSize.getX()));
+ Format::OneBitMsbPal,
+ basebmp::getBitmapDeviceStrideForWidth(Format::OneBitMsbPal, aSize.getX()));
mpDevice32bpp = createBitmapDevice( aSize,
true,
- FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA,
- basebmp::getBitmapDeviceStrideForWidth(FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA, aSize.getX()));
+ Format::ThirtyTwoBitTcMaskBGRA,
+ basebmp::getBitmapDeviceStrideForWidth(Format::ThirtyTwoBitTcMaskBGRA, aSize.getX()));
mpMaskBmp1bpp = createBitmapDevice( aSize,
true,
- FORMAT_ONE_BIT_MSB_GREY,
- basebmp::getBitmapDeviceStrideForWidth(FORMAT_ONE_BIT_MSB_GREY, aSize.getX()));
+ Format::OneBitMsbGrey,
+ basebmp::getBitmapDeviceStrideForWidth(Format::OneBitMsbGrey, aSize.getX()));
mpBmp1bpp = createBitmapDevice( aSize,
true,
- FORMAT_ONE_BIT_MSB_PAL,
- basebmp::getBitmapDeviceStrideForWidth(FORMAT_ONE_BIT_MSB_PAL, aSize.getX()));
+ Format::OneBitMsbPal,
+ basebmp::getBitmapDeviceStrideForWidth(Format::OneBitMsbPal, aSize.getX()));
mpBmp32bpp = createBitmapDevice( aSize,
true,
- FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA,
- basebmp::getBitmapDeviceStrideForWidth(FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA, aSize.getX()));
+ Format::ThirtyTwoBitTcMaskBGRA,
+ basebmp::getBitmapDeviceStrideForWidth(Format::ThirtyTwoBitTcMaskBGRA, aSize.getX()));
OUString aSvg( "m 0 0h5v10h5v-5h-10z" );
diff --git a/basebmp/test/bmptest.cxx b/basebmp/test/bmptest.cxx
index 19a73730288c..fd60eb462802 100644
--- a/basebmp/test/bmptest.cxx
+++ b/basebmp/test/bmptest.cxx
@@ -148,23 +148,23 @@ public:
void setUp() SAL_OVERRIDE
{
const basegfx::B2ISize aSize(10,10);
- sal_Int32 nStride = basebmp::getBitmapDeviceStrideForWidth(FORMAT_ONE_BIT_MSB_PAL, aSize.getX());
+ sal_Int32 nStride = basebmp::getBitmapDeviceStrideForWidth(Format::OneBitMsbPal, aSize.getX());
mpDevice1bpp = createBitmapDevice( aSize,
true,
- FORMAT_ONE_BIT_MSB_PAL, nStride );
- nStride = basebmp::getBitmapDeviceStrideForWidth(FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA, aSize.getX());
+ Format::OneBitMsbPal, nStride );
+ nStride = basebmp::getBitmapDeviceStrideForWidth(Format::ThirtyTwoBitTcMaskBGRA, aSize.getX());
mpDevice32bpp = createBitmapDevice( aSize,
true,
- FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA, nStride );
+ Format::ThirtyTwoBitTcMaskBGRA, nStride );
- nStride = basebmp::getBitmapDeviceStrideForWidth(FORMAT_ONE_BIT_MSB_PAL, aSize.getX());
+ nStride = basebmp::getBitmapDeviceStrideForWidth(Format::OneBitMsbPal, aSize.getX());
mpBmp1bpp = createBitmapDevice( aSize,
true,
- FORMAT_ONE_BIT_MSB_PAL, nStride );
- nStride = basebmp::getBitmapDeviceStrideForWidth(FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA, aSize.getX());
+ Format::OneBitMsbPal, nStride );
+ nStride = basebmp::getBitmapDeviceStrideForWidth(Format::ThirtyTwoBitTcMaskBGRA, aSize.getX());
mpBmp32bpp = createBitmapDevice( aSize,
true,
- FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA, nStride );
+ Format::ThirtyTwoBitTcMaskBGRA, nStride );
OUString aSvg( "m 0 0h5v10h5v-5h-10z" );
diff --git a/basebmp/test/cliptest.cxx b/basebmp/test/cliptest.cxx
index ad64b1e43be4..060e2b3d2578 100644
--- a/basebmp/test/cliptest.cxx
+++ b/basebmp/test/cliptest.cxx
@@ -154,10 +154,10 @@ private:
void implTestMaskColorClip(const BitmapDeviceSharedPtr& rDevice)
{
- sal_Int32 nStride = basebmp::getBitmapDeviceStrideForWidth(FORMAT_EIGHT_BIT_GREY, rDevice->getSize().getX());
+ sal_Int32 nStride = basebmp::getBitmapDeviceStrideForWidth(Format::EightBitGrey, rDevice->getSize().getX());
BitmapDeviceSharedPtr pBmp( createBitmapDevice( rDevice->getSize(),
true,
- FORMAT_EIGHT_BIT_GREY, nStride ));
+ Format::EightBitGrey, nStride ));
OUString aSvg( "m 0 0h5v10h5v-5h-10z" );
@@ -189,18 +189,18 @@ public:
void setUp() SAL_OVERRIDE
{
const basegfx::B2ISize aSize(11,11);
- sal_Int32 nStride = basebmp::getBitmapDeviceStrideForWidth(FORMAT_ONE_BIT_MSB_GREY, aSize.getX());
+ sal_Int32 nStride = basebmp::getBitmapDeviceStrideForWidth(Format::OneBitMsbGrey, aSize.getX());
mpClipMask = createBitmapDevice( aSize,
true,
- FORMAT_ONE_BIT_MSB_GREY, nStride );
- nStride = basebmp::getBitmapDeviceStrideForWidth(FORMAT_ONE_BIT_MSB_PAL, aSize.getX());
+ Format::OneBitMsbGrey, nStride );
+ nStride = basebmp::getBitmapDeviceStrideForWidth(Format::OneBitMsbPal, aSize.getX());
mpDevice1bpp = createBitmapDevice( aSize,
true,
- FORMAT_ONE_BIT_MSB_PAL, nStride );
- nStride = basebmp::getBitmapDeviceStrideForWidth(FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA, aSize.getX());
+ Format::OneBitMsbPal, nStride );
+ nStride = basebmp::getBitmapDeviceStrideForWidth(Format::ThirtyTwoBitTcMaskBGRA, aSize.getX());
mpDevice32bpp = createBitmapDevice( aSize,
true,
- FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA, nStride );
+ Format::ThirtyTwoBitTcMaskBGRA, nStride );
OUString aSvg( "m 0 0 h5 l5 5 v5 h-5 l-5-5 z" );
basegfx::B2DPolyPolygon aPoly;
diff --git a/basebmp/test/filltest.cxx b/basebmp/test/filltest.cxx
index f476710c148a..64c5bdc51273 100644
--- a/basebmp/test/filltest.cxx
+++ b/basebmp/test/filltest.cxx
@@ -211,12 +211,12 @@ public:
const basegfx::B2ISize aSize(11,11);
mpDevice1bpp = createBitmapDevice( aSize,
true,
- FORMAT_ONE_BIT_MSB_PAL,
- basebmp::getBitmapDeviceStrideForWidth(FORMAT_ONE_BIT_MSB_PAL, aSize.getX()));
+ Format::OneBitMsbPal,
+ basebmp::getBitmapDeviceStrideForWidth(Format::OneBitMsbPal, aSize.getX()));
mpDevice32bpp = createBitmapDevice( aSize,
true,
- FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA,
- basebmp::getBitmapDeviceStrideForWidth(FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA, aSize.getX()));
+ Format::ThirtyTwoBitTcMaskBGRA,
+ basebmp::getBitmapDeviceStrideForWidth(Format::ThirtyTwoBitTcMaskBGRA, aSize.getX()));
}
void testRectFill()
diff --git a/basebmp/test/linetest.cxx b/basebmp/test/linetest.cxx
index 552ae4d0e90c..b803e73503a1 100644
--- a/basebmp/test/linetest.cxx
+++ b/basebmp/test/linetest.cxx
@@ -151,12 +151,12 @@ public:
const basegfx::B2ISize aSize(11,11);
mpDevice1bpp = createBitmapDevice( aSize,
true,
- FORMAT_ONE_BIT_MSB_PAL,
- basebmp::getBitmapDeviceStrideForWidth(FORMAT_ONE_BIT_MSB_PAL, aSize.getX()) );
+ Format::OneBitMsbPal,
+ basebmp::getBitmapDeviceStrideForWidth(Format::OneBitMsbPal, aSize.getX()) );
mpDevice32bpp = createBitmapDevice( aSize,
true,
- FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA,
- basebmp::getBitmapDeviceStrideForWidth(FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA, aSize.getX()) );
+ Format::ThirtyTwoBitTcMaskBGRA,
+ basebmp::getBitmapDeviceStrideForWidth(Format::ThirtyTwoBitTcMaskBGRA, aSize.getX()) );
}
void testCornerCases()
@@ -165,8 +165,8 @@ public:
BitmapDeviceSharedPtr pDevice = createBitmapDevice(
aSize,
true,
- FORMAT_ONE_BIT_MSB_PAL,
- basebmp::getBitmapDeviceStrideForWidth(FORMAT_ONE_BIT_MSB_PAL, aSize.getX()) );
+ Format::OneBitMsbPal,
+ basebmp::getBitmapDeviceStrideForWidth(Format::OneBitMsbPal, aSize.getX()) );
const basegfx::B2IPoint aPt1(0,0);
const basegfx::B2IPoint aPt2(10,10);
@@ -182,8 +182,8 @@ public:
pDevice = createBitmapDevice(
aSize2,
true,
- FORMAT_ONE_BIT_MSB_PAL,
- basebmp::getBitmapDeviceStrideForWidth(FORMAT_ONE_BIT_MSB_PAL, aSize.getX()));
+ Format::OneBitMsbPal,
+ basebmp::getBitmapDeviceStrideForWidth(Format::OneBitMsbPal, aSize.getX()));
CPPUNIT_ASSERT_MESSAGE("only pixel cleared",
pDevice->getPixelData(aPt1) == 0);
diff --git a/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx
index 5b7780259acc..981736773fb9 100644
--- a/basebmp/test/masktest.cxx
+++ b/basebmp/test/masktest.cxx
@@ -104,17 +104,17 @@ public:
const basegfx::B2ISize aSize(10,10);
mpDevice1bpp = createBitmapDevice( aSize,
true,
- FORMAT_ONE_BIT_MSB_PAL,
- basebmp::getBitmapDeviceStrideForWidth(FORMAT_ONE_BIT_MSB_PAL, aSize.getX()) );
+ Format::OneBitMsbPal,
+ basebmp::getBitmapDeviceStrideForWidth(Format::OneBitMsbPal, aSize.getX()) );
mpDevice32bpp = createBitmapDevice( aSize,
true,
- FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA,
- basebmp::getBitmapDeviceStrideForWidth(FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA, aSize.getX()) );
+ Format::ThirtyTwoBitTcMaskBGRA,
+ basebmp::getBitmapDeviceStrideForWidth(Format::ThirtyTwoBitTcMaskBGRA, aSize.getX()) );
mpMask = createBitmapDevice( aSize,
true,
- FORMAT_EIGHT_BIT_GREY,
- basebmp::getBitmapDeviceStrideForWidth(FORMAT_EIGHT_BIT_GREY, aSize.getX()) );
+ Format::EightBitGrey,
+ basebmp::getBitmapDeviceStrideForWidth(Format::EightBitGrey, aSize.getX()) );
OUString aSvg( "m 0 0h5v10h5v-5h-10z" );
diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx
index 24b51fa26555..48814e6a2e8a 100644
--- a/basebmp/test/polytest.cxx
+++ b/basebmp/test/polytest.cxx
@@ -296,12 +296,12 @@ public:
const basegfx::B2ISize aSize(10,10);
mpDevice1bpp = createBitmapDevice( aSize,
true,
- FORMAT_ONE_BIT_MSB_PAL,
- basebmp::getBitmapDeviceStrideForWidth(FORMAT_ONE_BIT_MSB_PAL, aSize.getX()));
+ Format::OneBitMsbPal,
+ basebmp::getBitmapDeviceStrideForWidth(Format::OneBitMsbPal, aSize.getX()));
mpDevice32bpp = createBitmapDevice( aSize,
true,
- FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA,
- basebmp::getBitmapDeviceStrideForWidth(FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA, aSize.getX()));
+ Format::ThirtyTwoBitTcMaskBGRA,
+ basebmp::getBitmapDeviceStrideForWidth(Format::ThirtyTwoBitTcMaskBGRA, aSize.getX()));
}
void testEmpty()
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);
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index ea91e7a76da6..ce46fee6504f 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -121,7 +121,7 @@ public:
sal_uLong nSalFrameStyle,
SystemParentData *pSysParent )
: SvpSalFrame( pInstance, pParent, nSalFrameStyle,
- true, basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_RGBA,
+ true, basebmp::Format::ThirtyTwoBitTcMaskRGBA,
pSysParent )
{
enableDamageTracker();
diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx
index 20ae87083b32..7e54bc083dbb 100644
--- a/vcl/headless/svpbmp.cxx
+++ b/vcl/headless/svpbmp.cxx
@@ -143,49 +143,49 @@ BitmapBuffer* SvpSalBitmap::AcquireBuffer( BitmapAccessMode )
sal_uInt16 nBitCount = 1;
switch( m_aBitmap->getScanlineFormat() )
{
- case FORMAT_ONE_BIT_MSB_GREY:
- case FORMAT_ONE_BIT_MSB_PAL:
+ case Format::OneBitMsbGrey:
+ case Format::OneBitMsbPal:
nBitCount = 1;
pBuf->mnFormat = BMP_FORMAT_1BIT_MSB_PAL;
break;
- case FORMAT_ONE_BIT_LSB_GREY:
- case FORMAT_ONE_BIT_LSB_PAL:
+ case Format::OneBitLsbGrey:
+ case Format::OneBitLsbPal:
nBitCount = 1;
pBuf->mnFormat = BMP_FORMAT_1BIT_LSB_PAL;
break;
- case FORMAT_FOUR_BIT_MSB_GREY:
- case FORMAT_FOUR_BIT_MSB_PAL:
+ case Format::FourBitMsbGrey:
+ case Format::FourBitMsbPal:
nBitCount = 4;
pBuf->mnFormat = BMP_FORMAT_4BIT_MSN_PAL;
break;
- case FORMAT_FOUR_BIT_LSB_GREY:
- case FORMAT_FOUR_BIT_LSB_PAL:
+ case Format::FourBitLsbGrey:
+ case Format::FourBitLsbPal:
nBitCount = 4;
pBuf->mnFormat = BMP_FORMAT_4BIT_LSN_PAL;
break;
- case FORMAT_EIGHT_BIT_PAL:
+ case Format::EightBitPal:
nBitCount = 8;
pBuf->mnFormat = BMP_FORMAT_8BIT_PAL;
break;
- case FORMAT_EIGHT_BIT_GREY:
+ case Format::EightBitGrey:
nBitCount = 8;
pBuf->mnFormat = BMP_FORMAT_8BIT_PAL;
break;
- case FORMAT_SIXTEEN_BIT_LSB_TC_MASK:
+ case Format::SixteenBitLsbTcMask:
nBitCount = 16;
pBuf->mnFormat = BMP_FORMAT_16BIT_TC_LSB_MASK;
pBuf->maColorMask = ColorMask( 0xf800, 0x07e0, 0x001f );
break;
- case FORMAT_SIXTEEN_BIT_MSB_TC_MASK:
+ case Format::SixteenBitMsbTcMask:
nBitCount = 16;
pBuf->mnFormat = BMP_FORMAT_16BIT_TC_MSB_MASK;
pBuf->maColorMask = ColorMask( 0xf800, 0x07e0, 0x001f );
break;
- case FORMAT_TWENTYFOUR_BIT_TC_MASK:
+ case Format::TwentyFourBitTcMask:
nBitCount = 24;
pBuf->mnFormat = BMP_FORMAT_24BIT_TC_BGR;
break;
- case FORMAT_THIRTYTWO_BIT_TC_MASK_BGRX:
+ case Format::ThirtyTwoBitTcMaskBGRX:
nBitCount = 32;
pBuf->mnFormat = BMP_FORMAT_32BIT_TC_MASK;
#ifdef OSL_BIGENDIAN
@@ -194,7 +194,7 @@ BitmapBuffer* SvpSalBitmap::AcquireBuffer( BitmapAccessMode )
pBuf->maColorMask = ColorMask( 0x00ff0000, 0x0000ff00, 0x000000ff );
#endif
break;
- case FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA:
+ case Format::ThirtyTwoBitTcMaskBGRA:
nBitCount = 32;
pBuf->mnFormat = BMP_FORMAT_32BIT_TC_MASK;
#ifdef OSL_BIGENDIAN
@@ -203,7 +203,7 @@ BitmapBuffer* SvpSalBitmap::AcquireBuffer( BitmapAccessMode )
pBuf->maColorMask = ColorMask( 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000 );
#endif
break;
- case FORMAT_THIRTYTWO_BIT_TC_MASK_ARGB:
+ case Format::ThirtyTwoBitTcMaskARGB:
nBitCount = 32;
pBuf->mnFormat = BMP_FORMAT_32BIT_TC_MASK;
#ifdef OSL_BIGENDIAN
@@ -212,7 +212,7 @@ BitmapBuffer* SvpSalBitmap::AcquireBuffer( BitmapAccessMode )
pBuf->maColorMask = ColorMask( 0x0000ff00, 0x00ff0000, 0xff000000, 0x000000ff );
#endif
break;
- case FORMAT_THIRTYTWO_BIT_TC_MASK_ABGR:
+ case Format::ThirtyTwoBitTcMaskABGR:
nBitCount = 32;
pBuf->mnFormat = BMP_FORMAT_32BIT_TC_MASK;
#ifdef OSL_BIGENDIAN
@@ -221,7 +221,7 @@ BitmapBuffer* SvpSalBitmap::AcquireBuffer( BitmapAccessMode )
pBuf->maColorMask = ColorMask( 0xff000000, 0x00ff0000, 0x0000ff00, 0x000000ff );
#endif
break;
- case FORMAT_THIRTYTWO_BIT_TC_MASK_RGBA:
+ case Format::ThirtyTwoBitTcMaskRGBA:
nBitCount = 32;
pBuf->mnFormat = BMP_FORMAT_32BIT_TC_MASK;
#ifdef OSL_BIGENDIAN
@@ -248,11 +248,11 @@ BitmapBuffer* SvpSalBitmap::AcquireBuffer( BitmapAccessMode )
pBuf->mpBits = m_aBitmap->getBuffer().get();
if( nBitCount <= 8 )
{
- if( m_aBitmap->getScanlineFormat() == FORMAT_EIGHT_BIT_GREY ||
- m_aBitmap->getScanlineFormat() == FORMAT_FOUR_BIT_LSB_GREY ||
- m_aBitmap->getScanlineFormat() == FORMAT_FOUR_BIT_MSB_GREY ||
- m_aBitmap->getScanlineFormat() == FORMAT_ONE_BIT_LSB_GREY ||
- m_aBitmap->getScanlineFormat() == FORMAT_ONE_BIT_MSB_GREY
+ if( m_aBitmap->getScanlineFormat() == Format::EightBitGrey ||
+ m_aBitmap->getScanlineFormat() == Format::FourBitLsbGrey ||
+ m_aBitmap->getScanlineFormat() == Format::FourBitMsbGrey ||
+ m_aBitmap->getScanlineFormat() == Format::OneBitLsbGrey ||
+ m_aBitmap->getScanlineFormat() == Format::OneBitMsbGrey
)
pBuf->maPalette = Bitmap::GetGreyPalette( 1U << nBitCount );
else
@@ -287,29 +287,29 @@ void SvpSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode
sal_uInt16 nBitCount = 0;
switch( m_aBitmap->getScanlineFormat() )
{
- case FORMAT_ONE_BIT_MSB_GREY:
+ case Format::OneBitMsbGrey:
// FALLTHROUGH intended
- case FORMAT_ONE_BIT_MSB_PAL:
+ case Format::OneBitMsbPal:
// FALLTHROUGH intended
- case FORMAT_ONE_BIT_LSB_GREY:
+ case Format::OneBitLsbGrey:
// FALLTHROUGH intended
- case FORMAT_ONE_BIT_LSB_PAL:
+ case Format::OneBitLsbPal:
nBitCount = 1;
break;
- case FORMAT_FOUR_BIT_MSB_GREY:
+ case Format::FourBitMsbGrey:
// FALLTHROUGH intended
- case FORMAT_FOUR_BIT_MSB_PAL:
+ case Format::FourBitMsbPal:
// FALLTHROUGH intended
- case FORMAT_FOUR_BIT_LSB_GREY:
+ case Format::FourBitLsbGrey:
// FALLTHROUGH intended
- case FORMAT_FOUR_BIT_LSB_PAL:
+ case Format::FourBitLsbPal:
nBitCount = 4;
break;
- case FORMAT_EIGHT_BIT_PAL:
+ case Format::EightBitPal:
// FALLTHROUGH intended
- case FORMAT_EIGHT_BIT_GREY:
+ case Format::EightBitGrey:
nBitCount = 8;
break;
@@ -375,34 +375,34 @@ sal_uInt32 SvpSalBitmap::getBitCountFromScanlineFormat( basebmp::Format nFormat
sal_uInt32 nBitCount = 1;
switch( nFormat )
{
- case FORMAT_ONE_BIT_MSB_GREY:
- case FORMAT_ONE_BIT_LSB_GREY:
- case FORMAT_ONE_BIT_MSB_PAL:
- case FORMAT_ONE_BIT_LSB_PAL:
+ case Format::OneBitMsbGrey:
+ case Format::OneBitLsbGrey:
+ case Format::OneBitMsbPal:
+ case Format::OneBitLsbPal:
nBitCount = 1;
break;
- case FORMAT_FOUR_BIT_MSB_GREY:
- case FORMAT_FOUR_BIT_LSB_GREY:
- case FORMAT_FOUR_BIT_MSB_PAL:
- case FORMAT_FOUR_BIT_LSB_PAL:
+ case Format::FourBitMsbGrey:
+ case Format::FourBitLsbGrey:
+ case Format::FourBitMsbPal:
+ case Format::FourBitLsbPal:
nBitCount = 4;
break;
- case FORMAT_EIGHT_BIT_PAL:
- case FORMAT_EIGHT_BIT_GREY:
+ case Format::EightBitPal:
+ case Format::EightBitGrey:
nBitCount = 8;
break;
- case FORMAT_SIXTEEN_BIT_LSB_TC_MASK:
- case FORMAT_SIXTEEN_BIT_MSB_TC_MASK:
+ case Format::SixteenBitLsbTcMask:
+ case Format::SixteenBitMsbTcMask:
nBitCount = 16;
break;
- case FORMAT_TWENTYFOUR_BIT_TC_MASK:
+ case Format::TwentyFourBitTcMask:
nBitCount = 24;
break;
- case FORMAT_THIRTYTWO_BIT_TC_MASK_BGRX:
- case FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA:
- case FORMAT_THIRTYTWO_BIT_TC_MASK_ARGB:
- case FORMAT_THIRTYTWO_BIT_TC_MASK_ABGR:
- case FORMAT_THIRTYTWO_BIT_TC_MASK_RGBA:
+ case Format::ThirtyTwoBitTcMaskBGRX:
+ case Format::ThirtyTwoBitTcMaskBGRA:
+ case Format::ThirtyTwoBitTcMaskARGB:
+ case Format::ThirtyTwoBitTcMaskABGR:
+ case Format::ThirtyTwoBitTcMaskRGBA:
nBitCount = 32;
break;
default:
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 7c94f66f0495..ddb48b8a26d3 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -427,26 +427,26 @@ Format SvpSalInstance::getFormatForBitCount( sal_uInt16 nBitCount )
switch( nBitCount )
{
case 1:
- return FORMAT_ONE_BIT_MSB_PAL;
+ return Format::OneBitMsbPal;
case 4:
- return FORMAT_FOUR_BIT_MSB_PAL;
+ return Format::FourBitMsbPal;
case 8:
- return FORMAT_EIGHT_BIT_PAL;
+ return Format::EightBitPal;
case 16:
#ifdef OSL_BIGENDIAN
- return FORMAT_SIXTEEN_BIT_MSB_TC_MASK;
+ return Format::SixteenBitMsbTcMask;
#else
- return FORMAT_SIXTEEN_BIT_LSB_TC_MASK;
+ return Format::SixteenBitLsbTcMask;
#endif
case 24:
- return FORMAT_THIRTYTWO_BIT_TC_MASK_BGRX;
+ return Format::ThirtyTwoBitTcMaskBGRX;
case 32:
- return FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA;
+ return Format::ThirtyTwoBitTcMaskBGRA;
case 0:
#ifdef ANDROID
- return FORMAT_THIRTYTWO_BIT_TC_MASK_RGBA;
+ return Format::ThirtyTwoBitTcMaskRGBA;
#else
- return FORMAT_THIRTYTWO_BIT_TC_MASK_BGRX;
+ return Format::ThirtyTwoBitTcMaskBGRX;
#endif
default:
return SVP_DEFAULT_BITMAP_FORMAT;
diff --git a/vcl/headless/svptextrender.cxx b/vcl/headless/svptextrender.cxx
index 2ed928fa796c..af28eb302357 100644
--- a/vcl/headless/svptextrender.cxx
+++ b/vcl/headless/svptextrender.cxx
@@ -56,12 +56,13 @@ protected:
virtual void RemovingFont( ServerFont& ) SAL_OVERRIDE;
virtual void RemovingGlyph( GlyphData& ) SAL_OVERRIDE;
- class SvpGcpHelper
- {
- public:
- RawBitmap maRawBitmap;
- BitmapDeviceSharedPtr maBitmapDev;
- };
+};
+
+class SvpGcpHelper
+{
+public:
+ RawBitmap maRawBitmap;
+ BitmapDeviceSharedPtr maBitmapDev;
};
class SvpGlyphCache : public GlyphCache
@@ -113,8 +114,7 @@ BitmapDeviceSharedPtr SvpGlyphPeer::GetGlyphBmp( ServerFont& rServerFont,
if( rGlyphData.ExtDataRef().meInfo != nBmpFormat )
{
- SvpGcpHelper* pGcpHelper = static_cast<SvpGcpHelper*>(
- rGlyphData.ExtDataRef().mpData);
+ SvpGcpHelper* pGcpHelper = rGlyphData.ExtDataRef().mpData;
bool bNew = pGcpHelper == 0;
if( bNew )
pGcpHelper = new SvpGcpHelper;
@@ -123,16 +123,16 @@ BitmapDeviceSharedPtr SvpGlyphPeer::GetGlyphBmp( ServerFont& rServerFont,
bool bFound = false;
switch( nBmpFormat )
{
- case FORMAT_ONE_BIT_LSB_GREY:
+ case Format::OneBitLsbGrey:
bFound = rServerFont.GetGlyphBitmap1( aGlyphId, pGcpHelper->maRawBitmap );
break;
- case FORMAT_EIGHT_BIT_GREY:
+ case Format::EightBitGrey:
bFound = rServerFont.GetGlyphBitmap8( aGlyphId, pGcpHelper->maRawBitmap );
break;
default:
OSL_FAIL( "SVP GCP::GetGlyphBmp(): illegal scanline format");
// fall back to black&white mask
- nBmpFormat = FORMAT_ONE_BIT_LSB_GREY;
+ nBmpFormat = Format::OneBitLsbGrey;
bFound = false;
break;
}
@@ -173,9 +173,8 @@ void SvpGlyphPeer::RemovingFont( ServerFont& )
void SvpGlyphPeer::RemovingGlyph( GlyphData& rGlyphData )
{
- SvpGcpHelper* pGcpHelper = static_cast<SvpGcpHelper*>(
- rGlyphData.ExtDataRef().mpData);
- rGlyphData.ExtDataRef().meInfo = basebmp::FORMAT_NONE;
+ SvpGcpHelper* pGcpHelper = rGlyphData.ExtDataRef().mpData;
+ rGlyphData.ExtDataRef().meInfo = basebmp::Format::NONE;
rGlyphData.ExtDataRef().mpData = 0;
delete pGcpHelper;
}
@@ -183,7 +182,7 @@ void SvpGlyphPeer::RemovingGlyph( GlyphData& rGlyphData )
SvpTextRender::SvpTextRender(SvpSalGraphics& rParent)
: m_rParent(rParent)
, m_aTextColor(COL_BLACK)
- , m_eTextFmt(basebmp::FORMAT_EIGHT_BIT_GREY)
+ , m_eTextFmt(basebmp::Format::EightBitGrey)
{
for( int i = 0; i < MAX_FALLBACK; ++i )
m_pServerFont[i] = NULL;
@@ -472,22 +471,22 @@ SystemFontData SvpTextRender::GetSysFontData( int nFallbackLevel ) const
void SvpTextRender::setDevice( basebmp::BitmapDeviceSharedPtr& rDevice )
{
// determine matching bitmap format for masks
- basebmp::Format nDeviceFmt = rDevice ? rDevice->getScanlineFormat() : basebmp::FORMAT_EIGHT_BIT_GREY;
+ basebmp::Format nDeviceFmt = rDevice ? rDevice->getScanlineFormat() : basebmp::Format::EightBitGrey;
switch( nDeviceFmt )
{
- case basebmp::FORMAT_EIGHT_BIT_GREY:
- case basebmp::FORMAT_SIXTEEN_BIT_LSB_TC_MASK:
- case basebmp::FORMAT_SIXTEEN_BIT_MSB_TC_MASK:
- case basebmp::FORMAT_TWENTYFOUR_BIT_TC_MASK:
- case basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_BGRX:
- case basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA:
- case basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_ARGB:
- case basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_ABGR:
- case basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_RGBA:
- m_eTextFmt = basebmp::FORMAT_EIGHT_BIT_GREY;
+ case basebmp::Format::EightBitGrey:
+ case basebmp::Format::SixteenBitLsbTcMask:
+ case basebmp::Format::SixteenBitMsbTcMask:
+ case basebmp::Format::TwentyFourBitTcMask:
+ case basebmp::Format::ThirtyTwoBitTcMaskBGRX:
+ case basebmp::Format::ThirtyTwoBitTcMaskBGRA:
+ case basebmp::Format::ThirtyTwoBitTcMaskARGB:
+ case basebmp::Format::ThirtyTwoBitTcMaskABGR:
+ case basebmp::Format::ThirtyTwoBitTcMaskRGBA:
+ m_eTextFmt = basebmp::Format::EightBitGrey;
break;
default:
- m_eTextFmt = basebmp::FORMAT_ONE_BIT_LSB_GREY;
+ m_eTextFmt = basebmp::Format::OneBitLsbGrey;
break;
}
}
diff --git a/vcl/headless/svpvd.cxx b/vcl/headless/svpvd.cxx
index 1dfa8c0cb848..ddd265772280 100644
--- a/vcl/headless/svpvd.cxx
+++ b/vcl/headless/svpvd.cxx
@@ -99,7 +99,7 @@ void InitSvpForLibreOfficeKit()
{
ImplSVData* pSVData = ImplGetSVData();
SvpSalInstance* pSalInstance = static_cast< SvpSalInstance* >(pSVData->mpDefInst);
- pSalInstance->setBitCountFormatMapping( 32, ::basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_RGBA );
+ pSalInstance->setBitCountFormatMapping( 32, ::basebmp::Format::ThirtyTwoBitTcMaskRGBA );
}
#endif
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index c7c21233646b..0a352a16adfa 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -47,6 +47,7 @@ class RawBitmap;
class ServerFont;
class ServerFontLayout;
class ServerFontLayoutEngine;
+class SvpGcpHelper;
namespace basegfx { class B2DPolyPolygon; }
namespace vcl { struct FontCapabilities; }
@@ -131,10 +132,10 @@ private:
// basebmp::Format and mpData is SvpGcpHelper*
struct ExtGlyphData
{
- int meInfo;
- void* mpData;
+ basebmp::Format meInfo;
+ SvpGcpHelper* mpData;
- ExtGlyphData() : meInfo(0), mpData(NULL) {}
+ ExtGlyphData() : meInfo(basebmp::Format::NONE), mpData(NULL) {}
};
class GlyphData
diff --git a/vcl/inc/headless/svpbmp.hxx b/vcl/inc/headless/svpbmp.hxx
index 168852e3caf2..1a331f24522d 100644
--- a/vcl/inc/headless/svpbmp.hxx
+++ b/vcl/inc/headless/svpbmp.hxx
@@ -27,7 +27,7 @@
#include <salbmp.hxx>
-#define SVP_DEFAULT_BITMAP_FORMAT basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_BGRX
+#define SVP_DEFAULT_BITMAP_FORMAT basebmp::Format::ThirtyTwoBitTcMaskBGRX
class VCL_DLLPUBLIC SvpSalBitmap : public SalBitmap
{
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index f2dabd53bf29..313926819d7f 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -125,7 +125,7 @@ public:
sal_uLong nSalFrameStyle,
SystemParentData *pSysParent )
: SvpSalFrame( pInstance, pParent, nSalFrameStyle,
- true, basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_RGBA,
+ true, basebmp::Format::ThirtyTwoBitTcMaskRGBA,
pSysParent )
{
if (pParent == NULL && viewWidth > 1 && viewHeight > 1)
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index e981e053bd0c..874f250b0b16 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -2001,7 +2001,7 @@ void GtkSalFrame::AllocateFrame()
aFrameSize.setY( 1 );
int cairo_stride = cairo_format_stride_for_width(CAIRO_FORMAT_RGB24, aFrameSize.getX());
m_aFrame = basebmp::createBitmapDevice(aFrameSize, true,
- basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_BGRX, cairo_stride);
+ basebmp::Format::ThirtyTwoBitTcMaskBGRX, cairo_stride);
m_aFrame->setDamageTracker(
basebmp::IBitmapDeviceDamageTrackerSharedPtr(new DamageTracker(*this)) );
SAL_INFO("vcl.gtk3", "allocated m_aFrame size of " << maGeometry.nWidth << " x " << maGeometry.nHeight);
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-07 06:55:31 +0000