diff options
Diffstat (limited to 'basebmp/test')
-rw-r--r-- | basebmp/test/basictest.cxx | 18 | ||||
-rw-r--r-- | basebmp/test/bmpdemo.cxx | 4 | ||||
-rw-r--r-- | basebmp/test/bmpmasktest.cxx | 10 | ||||
-rw-r--r-- | basebmp/test/bmptest.cxx | 8 | ||||
-rw-r--r-- | basebmp/test/cliptest.cxx | 8 | ||||
-rw-r--r-- | basebmp/test/filltest.cxx | 4 | ||||
-rw-r--r-- | basebmp/test/linetest.cxx | 8 | ||||
-rw-r--r-- | basebmp/test/masktest.cxx | 6 | ||||
-rw-r--r-- | basebmp/test/polytest.cxx | 4 |
9 files changed, 35 insertions, 35 deletions
diff --git a/basebmp/test/basictest.cxx b/basebmp/test/basictest.cxx index e9e2dbe67ed8..062e4f0a08e9 100644 --- a/basebmp/test/basictest.cxx +++ b/basebmp/test/basictest.cxx @@ -83,13 +83,13 @@ public: basegfx::B2ISize aSize2(aSize); BitmapDeviceSharedPtr pDevice( createBitmapDevice( aSize, true, - Format::ONE_BIT_MSB_PAL )); + FORMAT_ONE_BIT_MSB_PAL )); CPPUNIT_ASSERT_MESSAGE("right size", pDevice->getSize() == aSize2 ); CPPUNIT_ASSERT_MESSAGE("Top down format", pDevice->isTopDown() == true ); CPPUNIT_ASSERT_MESSAGE("Scanline format", - pDevice->getScanlineFormat() == Format::ONE_BIT_MSB_PAL ); + pDevice->getScanlineFormat() == FORMAT_ONE_BIT_MSB_PAL ); CPPUNIT_ASSERT_MESSAGE("Scanline len", pDevice->getScanlineStride() == (aSize2.getY() + 7)/8 ); CPPUNIT_ASSERT_MESSAGE("Palette existence", @@ -106,7 +106,7 @@ public: basegfx::B2ISize aSize2(3,3); BitmapDeviceSharedPtr pDevice( createBitmapDevice( aSize, true, - Format::ONE_BIT_MSB_PAL )); + FORMAT_ONE_BIT_MSB_PAL )); BitmapDeviceSharedPtr pClone( cloneBitmapDevice( aSize2, @@ -121,7 +121,7 @@ public: const basegfx::B2ISize aSize(64,64); BitmapDeviceSharedPtr pDevice( createBitmapDevice( aSize, true, - Format::ONE_BIT_MSB_PAL )); + FORMAT_ONE_BIT_MSB_PAL )); const basegfx::B2IPoint aPt(3,3); CPPUNIT_ASSERT_MESSAGE("getPixelData for virgin device", @@ -168,7 +168,7 @@ public: { pDevice = createBitmapDevice( aSize, true, - Format::ONE_BIT_LSB_PAL ); + FORMAT_ONE_BIT_LSB_PAL ); pDevice->setPixel( aPt2, aCol, DrawMode_PAINT ); CPPUNIT_ASSERT_MESSAGE("get/setPixel roundtrip #4", @@ -193,7 +193,7 @@ public: { pDevice = createBitmapDevice( aSize, true, - Format::EIGHT_BIT_GREY ); + FORMAT_EIGHT_BIT_GREY ); const Color aCol4(0x010101); pDevice->setPixel( aPt, aCol4, DrawMode_PAINT ); @@ -215,7 +215,7 @@ public: { pDevice = createBitmapDevice( aSize, true, - Format::SIXTEEN_BIT_LSB_TC_MASK ); + FORMAT_SIXTEEN_BIT_LSB_TC_MASK ); const Color aCol7(0); pDevice->clear( aCol7 ); @@ -239,7 +239,7 @@ public: { pDevice = createBitmapDevice( aSize, true, - Format::TWENTYFOUR_BIT_TC_MASK ); + FORMAT_TWENTYFOUR_BIT_TC_MASK ); const Color aCol4(0x01010101); pDevice->setPixel( aPt, aCol4, DrawMode_PAINT ); @@ -266,7 +266,7 @@ public: { pDevice = createBitmapDevice( aSize, true, - Format::THIRTYTWO_BIT_TC_MASK_BGRA ); + FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA ); const Color aCol4(0x01010101); pDevice->setPixel( aPt, aCol4, DrawMode_PAINT ); diff --git a/basebmp/test/bmpdemo.cxx b/basebmp/test/bmpdemo.cxx index 62d9b2262c8a..fc9e1ae26a2a 100644 --- a/basebmp/test/bmpdemo.cxx +++ b/basebmp/test/bmpdemo.cxx @@ -1055,7 +1055,7 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ ) basegfx::B2ISize aTestSize(1000,1000); basebmp::BitmapDeviceSharedPtr pDevice( basebmp::createBitmapDevice( aTestSize, false, - basebmp::Format::THIRTYTWO_BIT_TC_MASK_BGRA )); + basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA )); { OUString aSvg; @@ -1074,7 +1074,7 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ ) { basebmp::BitmapDeviceSharedPtr pMask( basebmp::createBitmapDevice( aTestSize, false, - basebmp::Format::ONE_BIT_MSB_GREY )); + basebmp::FORMAT_ONE_BIT_MSB_GREY )); const basegfx::B2IPoint aPt111(10,10); const basegfx::B2IPoint aPt222(0,10); diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx index 6f9a604a2503..d98fb6209606 100644 --- a/basebmp/test/bmpmasktest.cxx +++ b/basebmp/test/bmpmasktest.cxx @@ -93,21 +93,21 @@ public: const basegfx::B2ISize aSize(10,10); mpDevice1bpp = createBitmapDevice( aSize, true, - Format::ONE_BIT_MSB_PAL ); + FORMAT_ONE_BIT_MSB_PAL ); mpDevice32bpp = createBitmapDevice( aSize, true, - Format::THIRTYTWO_BIT_TC_MASK_BGRA ); + FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA ); mpMaskBmp1bpp = createBitmapDevice( aSize, true, - Format::ONE_BIT_MSB_GREY ); + FORMAT_ONE_BIT_MSB_GREY ); mpBmp1bpp = createBitmapDevice( aSize, true, - Format::ONE_BIT_MSB_PAL ); + FORMAT_ONE_BIT_MSB_PAL ); mpBmp32bpp = createBitmapDevice( aSize, true, - Format::THIRTYTWO_BIT_TC_MASK_BGRA ); + FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA ); OUString aSvg( "m 0 0h5v10h5v-5h-10z" ); diff --git a/basebmp/test/bmptest.cxx b/basebmp/test/bmptest.cxx index 37fd4b5155d9..59adac5feeae 100644 --- a/basebmp/test/bmptest.cxx +++ b/basebmp/test/bmptest.cxx @@ -150,17 +150,17 @@ public: const basegfx::B2ISize aSize(10,10); mpDevice1bpp = createBitmapDevice( aSize, true, - Format::ONE_BIT_MSB_PAL ); + FORMAT_ONE_BIT_MSB_PAL ); mpDevice32bpp = createBitmapDevice( aSize, true, - Format::THIRTYTWO_BIT_TC_MASK_BGRA ); + FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA ); mpBmp1bpp = createBitmapDevice( aSize, true, - Format::ONE_BIT_MSB_PAL ); + FORMAT_ONE_BIT_MSB_PAL ); mpBmp32bpp = createBitmapDevice( aSize, true, - Format::THIRTYTWO_BIT_TC_MASK_BGRA ); + FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA ); OUString aSvg( "m 0 0h5v10h5v-5h-10z" ); diff --git a/basebmp/test/cliptest.cxx b/basebmp/test/cliptest.cxx index aa0c15a01483..cc1dbb0ce384 100644 --- a/basebmp/test/cliptest.cxx +++ b/basebmp/test/cliptest.cxx @@ -156,7 +156,7 @@ private: { BitmapDeviceSharedPtr pBmp( createBitmapDevice( rDevice->getSize(), true, - Format::EIGHT_BIT_GREY )); + FORMAT_EIGHT_BIT_GREY )); OUString aSvg( "m 0 0h5v10h5v-5h-10z" ); @@ -190,13 +190,13 @@ public: const basegfx::B2ISize aSize(11,11); mpClipMask = createBitmapDevice( aSize, true, - Format::ONE_BIT_MSB_GREY ); + FORMAT_ONE_BIT_MSB_GREY ); mpDevice1bpp = createBitmapDevice( aSize, true, - Format::ONE_BIT_MSB_PAL ); + FORMAT_ONE_BIT_MSB_PAL ); mpDevice32bpp = createBitmapDevice( aSize, true, - Format::THIRTYTWO_BIT_TC_MASK_BGRA ); + FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA ); 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 a393144ab411..6c0079583cd5 100644 --- a/basebmp/test/filltest.cxx +++ b/basebmp/test/filltest.cxx @@ -211,10 +211,10 @@ public: const basegfx::B2ISize aSize(11,11); mpDevice1bpp = createBitmapDevice( aSize, true, - Format::ONE_BIT_MSB_PAL ); + FORMAT_ONE_BIT_MSB_PAL ); mpDevice32bpp = createBitmapDevice( aSize, true, - Format::THIRTYTWO_BIT_TC_MASK_BGRA ); + FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA ); } void testRectFill() diff --git a/basebmp/test/linetest.cxx b/basebmp/test/linetest.cxx index 9943a399a335..211dabf98b49 100644 --- a/basebmp/test/linetest.cxx +++ b/basebmp/test/linetest.cxx @@ -151,10 +151,10 @@ public: const basegfx::B2ISize aSize(11,11); mpDevice1bpp = createBitmapDevice( aSize, true, - Format::ONE_BIT_MSB_PAL ); + FORMAT_ONE_BIT_MSB_PAL ); mpDevice32bpp = createBitmapDevice( aSize, true, - Format::THIRTYTWO_BIT_TC_MASK_BGRA ); + FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA ); } void testCornerCases() @@ -163,7 +163,7 @@ public: BitmapDeviceSharedPtr pDevice = createBitmapDevice( aSize, true, - Format::ONE_BIT_MSB_PAL ); + FORMAT_ONE_BIT_MSB_PAL ); const basegfx::B2IPoint aPt1(0,0); const basegfx::B2IPoint aPt2(10,10); @@ -179,7 +179,7 @@ public: pDevice = createBitmapDevice( aSize2, true, - Format::ONE_BIT_MSB_PAL ); + FORMAT_ONE_BIT_MSB_PAL ); CPPUNIT_ASSERT_MESSAGE("only pixel cleared", pDevice->getPixelData(aPt1) == 0); diff --git a/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx index 4b2aebb70640..bdc870d28193 100644 --- a/basebmp/test/masktest.cxx +++ b/basebmp/test/masktest.cxx @@ -104,14 +104,14 @@ public: const basegfx::B2ISize aSize(10,10); mpDevice1bpp = createBitmapDevice( aSize, true, - Format::ONE_BIT_MSB_PAL ); + FORMAT_ONE_BIT_MSB_PAL ); mpDevice32bpp = createBitmapDevice( aSize, true, - Format::THIRTYTWO_BIT_TC_MASK_BGRA ); + FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA ); mpMask = createBitmapDevice( aSize, true, - Format::EIGHT_BIT_GREY ); + FORMAT_EIGHT_BIT_GREY ); OUString aSvg( "m 0 0h5v10h5v-5h-10z" ); diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx index e07508b16c90..a32d099c3834 100644 --- a/basebmp/test/polytest.cxx +++ b/basebmp/test/polytest.cxx @@ -292,10 +292,10 @@ public: const basegfx::B2ISize aSize(10,10); mpDevice1bpp = createBitmapDevice( aSize, true, - Format::ONE_BIT_MSB_PAL ); + FORMAT_ONE_BIT_MSB_PAL ); mpDevice32bpp = createBitmapDevice( aSize, true, - Format::THIRTYTWO_BIT_TC_MASK_BGRA ); + FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA ); } void testEmpty() |