summaryrefslogtreecommitdiff
path: root/basebmp/test
diff options
context:
space:
mode:
Diffstat (limited to 'basebmp/test')
-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
8 files changed, 65 insertions, 65 deletions
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()
generated by cgit (git 2.34.1) at 2025-02-25 22:25:44 +0000