diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-27 11:42:49 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-27 11:42:49 +0000 |
| commit | 63fa844e55d4c5b30d213e5f917dcb6834536bd8 (patch) | |
| tree | 4bde4871be5a4bc4544fe87d57e2be318952cd24 /basebmp/test/polytest.cxx | |
| parent | 359a09166ea9e6298a836334aff8d70ea23afd3b (diff) | |
INTEGRATION: CWS basebmp01 (1.1.20); FILE MERGED
2007/05/22 09:59:18 thb 1.1.20.1: #147378# Added support for foreign formats (via GenericColorImageAccessor); fixed typos in CompositeIterator and StridedArrayIterator; fixed comparisons for (Packed)PixelIterator and StridedArrayIterator (which got negative strides wrong); avoiding unnecessary copying in scale_image() now; cleaned up bitmapdevice.cxx from cruft/ad hoc debug code; made unit tests run again
Diffstat (limited to 'basebmp/test/polytest.cxx')
| -rw-r--r-- | basebmp/test/polytest.cxx | 44 |
1 files changed, 16 insertions, 28 deletions
diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx index 243cf68c70be..58680908a922 100644 --- a/basebmp/test/polytest.cxx +++ b/basebmp/test/polytest.cxx @@ -4,9 +4,9 @@ * * $RCSfile: polytest.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: thb $ $Date: 2006-07-27 11:35:32 $ + * last change: $Author: hr $ $Date: 2007-06-27 12:42:49 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -81,7 +81,7 @@ private: basegfx::tools::importFromSvgD( aPoly, rtl::OUString::createFromAscii( - "m2 2 l7 7 z" ) ); + "M2 2 l7 7 z" ) ); rDevice->fillPolyPolygon( aPoly, aCol, @@ -96,7 +96,7 @@ private: basegfx::tools::importFromSvgD( aPoly, rtl::OUString::createFromAscii( - "m7 2 l-6 6 z" ) ); + "M7 2 l-6 6 z" ) ); rDevice->fillPolyPolygon( aPoly, aCol, @@ -116,7 +116,7 @@ private: basegfx::tools::importFromSvgD( aPoly, rtl::OUString::createFromAscii( - "m2 2 h1 l7 7 h-1 z" ) ); + "M2 2 h1 l7 7 h-1 z" ) ); rDevice->fillPolyPolygon( aPoly, aCol, @@ -131,7 +131,7 @@ private: basegfx::tools::importFromSvgD( aPoly, rtl::OUString::createFromAscii( - "m7 2 h-1 l-6 6 h1 z" ) ); + "M7 2 h-1 l-6 6 h1 z" ) ); rDevice->fillPolyPolygon( aPoly, aCol, @@ -146,7 +146,7 @@ private: basegfx::tools::importFromSvgD( aPoly, rtl::OUString::createFromAscii( - "m0 0 l7 7 h-1 l-5-7 z" ) ); + "M0 0 l7 7 h-1 l-5-7 z" ) ); rDevice->fillPolyPolygon( aPoly, aCol, @@ -165,10 +165,8 @@ private: basegfx::tools::importFromSvgD( aPoly, ::rtl::OUString::createFromAscii( - "m0 0 h7 v7 h-7 z" ) ); - basegfx::tools::importFromSvgD( aPoly, - ::rtl::OUString::createFromAscii( - "m2 2 v3 h3 v-3 z" ) ); + "M0 0 h7 v7 h-7 z M2 2 v3 h3 v-3 z" ) ); + rDevice->fillPolyPolygon( aPoly, aCol, @@ -187,10 +185,7 @@ private: basegfx::tools::importFromSvgD( aPoly, ::rtl::OUString::createFromAscii( - "m0 0 h7 v7 h-7 z" ) ); - basegfx::tools::importFromSvgD( aPoly, - ::rtl::OUString::createFromAscii( - "m2 2 v3 h3 v-3 z" ) ); + "M0 0 h7 v7 h-7 z M2 2 v3 h3 v-3 z" ) ); basegfx::B2DHomMatrix aMat; aMat.translate(-3,-3); aMat.rotate( 1.7 ); @@ -201,6 +196,7 @@ private: aPoly, aCol, DrawMode_PAINT ); + CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 39", countPixel( rDevice, aCol ) == 39); @@ -227,19 +223,11 @@ private: basegfx::tools::importFromSvgD( aPoly, ::rtl::OUString::createFromAscii( - "m0 0 v2 l10 2 v-2 z" ) ); - basegfx::tools::importFromSvgD( aPoly, - ::rtl::OUString::createFromAscii( - "m10 6 v-2 l-10 2 v2 z" ) ); - basegfx::tools::importFromSvgD( aPoly, - ::rtl::OUString::createFromAscii( - "m1 0 h1 v10 h-1 z" ) ); - basegfx::tools::importFromSvgD( aPoly, - ::rtl::OUString::createFromAscii( - "m4 0 h1 v10 h-1 z" ) ); - basegfx::tools::importFromSvgD( aPoly, - ::rtl::OUString::createFromAscii( - "m8 0 h1 v10 h-1 z" ) ); + "M0 0 v2 l10 2 v-2 z" + "M10 6 v-2 l-10 2 v2 z" + "M1 0 h1 v10 h-1 z" + "M4 0 h1 v10 h-1 z" + "M8 0 h1 v10 h-1 z" ) ); rDevice->fillPolyPolygon( aPoly, aCol, |