summaryrefslogtreecommitdiff
path: root/basebmp
diff options
context:
space:
mode:
authorThorsten Behrens <thb@openoffice.org>2006-05-31 09:12:13 +0000
committerThorsten Behrens <thb@openoffice.org>2006-05-31 09:12:13 +0000
commit6a1e36d96fef4e673c45513ae9a6af94b3ac7936 (patch)
tree0536a62e6c9a0a64f1b3b794b85b9f885a231087 /basebmp
parentef0bbaaf42d5d1784ab158d1b6b0535459702823 (diff)
#i65904# Corrected license headers, added more tests
Diffstat (limited to 'basebmp')
-rw-r--r--basebmp/inc/basebmp/accessor.hxx4
-rw-r--r--basebmp/inc/basebmp/accessoradapters.hxx4
-rw-r--r--basebmp/inc/basebmp/bitmapdevice.hxx4
-rw-r--r--basebmp/inc/basebmp/clippedlinerenderer.hxx4
-rw-r--r--basebmp/inc/basebmp/color.hxx4
-rw-r--r--basebmp/inc/basebmp/debug.hxx4
-rw-r--r--basebmp/inc/basebmp/drawmodes.hxx4
-rw-r--r--basebmp/inc/basebmp/linerenderer.hxx4
-rw-r--r--basebmp/inc/basebmp/metafunctions.hxx4
-rw-r--r--basebmp/inc/basebmp/packedpixeliterator.hxx4
-rw-r--r--basebmp/inc/basebmp/paletteimageaccessor.hxx4
-rw-r--r--basebmp/inc/basebmp/pixeliterator.hxx4
-rw-r--r--basebmp/inc/basebmp/scanlineformats.hxx4
-rw-r--r--basebmp/inc/basebmp/stridedarrayiterator.hxx4
-rw-r--r--basebmp/source/bitmapdevice.cxx6
-rw-r--r--basebmp/source/debug.cxx4
-rw-r--r--basebmp/source/makefile.mk4
-rw-r--r--basebmp/test/basictest.cxx35
-rw-r--r--basebmp/test/bmpdemo.cxx4
-rw-r--r--basebmp/test/filltest.cxx167
-rw-r--r--basebmp/test/linetest.cxx35
-rw-r--r--basebmp/test/makefile.mk4
-rw-r--r--basebmp/util/makefile.mk4
23 files changed, 273 insertions, 46 deletions
diff --git a/basebmp/inc/basebmp/accessor.hxx b/basebmp/inc/basebmp/accessor.hxx
index 2718ad1bf5e9..c1cd068724f9 100644
--- a/basebmp/inc/basebmp/accessor.hxx
+++ b/basebmp/inc/basebmp/accessor.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: accessor.hxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: thb $ $Date: 2006-05-31 09:49:41 $
+ * last change: $Author: thb $ $Date: 2006-05-31 10:12:11 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
diff --git a/basebmp/inc/basebmp/accessoradapters.hxx b/basebmp/inc/basebmp/accessoradapters.hxx
index 63c7e2ad25bc..30d096005e8b 100644
--- a/basebmp/inc/basebmp/accessoradapters.hxx
+++ b/basebmp/inc/basebmp/accessoradapters.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: accessoradapters.hxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: thb $ $Date: 2006-05-31 09:49:41 $
+ * last change: $Author: thb $ $Date: 2006-05-31 10:12:11 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
diff --git a/basebmp/inc/basebmp/bitmapdevice.hxx b/basebmp/inc/basebmp/bitmapdevice.hxx
index 3fd6401a6be6..dac7588b642e 100644
--- a/basebmp/inc/basebmp/bitmapdevice.hxx
+++ b/basebmp/inc/basebmp/bitmapdevice.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: bitmapdevice.hxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: thb $ $Date: 2006-05-31 09:49:41 $
+ * last change: $Author: thb $ $Date: 2006-05-31 10:12:11 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
diff --git a/basebmp/inc/basebmp/clippedlinerenderer.hxx b/basebmp/inc/basebmp/clippedlinerenderer.hxx
index 92be0308a5c7..69b46e1ef80c 100644
--- a/basebmp/inc/basebmp/clippedlinerenderer.hxx
+++ b/basebmp/inc/basebmp/clippedlinerenderer.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: clippedlinerenderer.hxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: thb $ $Date: 2006-05-31 09:49:41 $
+ * last change: $Author: thb $ $Date: 2006-05-31 10:12:11 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
diff --git a/basebmp/inc/basebmp/color.hxx b/basebmp/inc/basebmp/color.hxx
index 21ae86e897dd..ff9e6c4469ff 100644
--- a/basebmp/inc/basebmp/color.hxx
+++ b/basebmp/inc/basebmp/color.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: color.hxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: thb $ $Date: 2006-05-31 09:49:41 $
+ * last change: $Author: thb $ $Date: 2006-05-31 10:12:11 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
diff --git a/basebmp/inc/basebmp/debug.hxx b/basebmp/inc/basebmp/debug.hxx
index 62cc8eaeb646..dae75f024187 100644
--- a/basebmp/inc/basebmp/debug.hxx
+++ b/basebmp/inc/basebmp/debug.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: debug.hxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: thb $ $Date: 2006-05-31 09:49:42 $
+ * last change: $Author: thb $ $Date: 2006-05-31 10:12:11 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
diff --git a/basebmp/inc/basebmp/drawmodes.hxx b/basebmp/inc/basebmp/drawmodes.hxx
index f09d5c221383..2eb1fa6ff9e5 100644
--- a/basebmp/inc/basebmp/drawmodes.hxx
+++ b/basebmp/inc/basebmp/drawmodes.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: drawmodes.hxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: thb $ $Date: 2006-05-31 09:49:42 $
+ * last change: $Author: thb $ $Date: 2006-05-31 10:12:11 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
diff --git a/basebmp/inc/basebmp/linerenderer.hxx b/basebmp/inc/basebmp/linerenderer.hxx
index 0493e9571b8a..87898e50142e 100644
--- a/basebmp/inc/basebmp/linerenderer.hxx
+++ b/basebmp/inc/basebmp/linerenderer.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: linerenderer.hxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: thb $ $Date: 2006-05-31 09:49:42 $
+ * last change: $Author: thb $ $Date: 2006-05-31 10:12:11 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
diff --git a/basebmp/inc/basebmp/metafunctions.hxx b/basebmp/inc/basebmp/metafunctions.hxx
index cdef37548e7b..06ac9da70a3b 100644
--- a/basebmp/inc/basebmp/metafunctions.hxx
+++ b/basebmp/inc/basebmp/metafunctions.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: metafunctions.hxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: thb $ $Date: 2006-05-31 09:49:42 $
+ * last change: $Author: thb $ $Date: 2006-05-31 10:12:12 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
diff --git a/basebmp/inc/basebmp/packedpixeliterator.hxx b/basebmp/inc/basebmp/packedpixeliterator.hxx
index 48330d5c27ad..bb758f90b27d 100644
--- a/basebmp/inc/basebmp/packedpixeliterator.hxx
+++ b/basebmp/inc/basebmp/packedpixeliterator.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: packedpixeliterator.hxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: thb $ $Date: 2006-05-31 09:49:42 $
+ * last change: $Author: thb $ $Date: 2006-05-31 10:12:12 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
diff --git a/basebmp/inc/basebmp/paletteimageaccessor.hxx b/basebmp/inc/basebmp/paletteimageaccessor.hxx
index 848ea59d7a50..c70dc5606cd0 100644
--- a/basebmp/inc/basebmp/paletteimageaccessor.hxx
+++ b/basebmp/inc/basebmp/paletteimageaccessor.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: paletteimageaccessor.hxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: thb $ $Date: 2006-05-31 09:49:42 $
+ * last change: $Author: thb $ $Date: 2006-05-31 10:12:12 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
diff --git a/basebmp/inc/basebmp/pixeliterator.hxx b/basebmp/inc/basebmp/pixeliterator.hxx
index 9f1f3c997ea2..b90dc05d4d03 100644
--- a/basebmp/inc/basebmp/pixeliterator.hxx
+++ b/basebmp/inc/basebmp/pixeliterator.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: pixeliterator.hxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: thb $ $Date: 2006-05-31 09:49:43 $
+ * last change: $Author: thb $ $Date: 2006-05-31 10:12:12 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
diff --git a/basebmp/inc/basebmp/scanlineformats.hxx b/basebmp/inc/basebmp/scanlineformats.hxx
index c0aef970c1a8..70c5f5007020 100644
--- a/basebmp/inc/basebmp/scanlineformats.hxx
+++ b/basebmp/inc/basebmp/scanlineformats.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: scanlineformats.hxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: thb $ $Date: 2006-05-31 09:49:43 $
+ * last change: $Author: thb $ $Date: 2006-05-31 10:12:12 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
diff --git a/basebmp/inc/basebmp/stridedarrayiterator.hxx b/basebmp/inc/basebmp/stridedarrayiterator.hxx
index bcff5a21c518..d5a96acd8b76 100644
--- a/basebmp/inc/basebmp/stridedarrayiterator.hxx
+++ b/basebmp/inc/basebmp/stridedarrayiterator.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: stridedarrayiterator.hxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: thb $ $Date: 2006-05-31 09:49:43 $
+ * last change: $Author: thb $ $Date: 2006-05-31 10:12:12 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx
index 3ee33010f2b2..78a772541e3d 100644
--- a/basebmp/source/bitmapdevice.cxx
+++ b/basebmp/source/bitmapdevice.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: bitmapdevice.cxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: thb $ $Date: 2006-05-31 09:49:44 $
+ * last change: $Author: thb $ $Date: 2006-05-31 10:12:12 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -121,7 +121,7 @@ namespace
std::min( bounds_.getMaxX()-1,
basegfx::fround( rfXLeft ))));
const sal_Int32 nEndX ( std::max( bounds_.getMinX(),
- std::min( bounds_.getMaxX()-1,
+ std::min( bounds_.getMaxX(),
basegfx::fround( rfXRight ))));
DestIterator currIter( begin_ + vigra::Diff2D(0,nY) );
diff --git a/basebmp/source/debug.cxx b/basebmp/source/debug.cxx
index cb168a82db9f..e4b331757202 100644
--- a/basebmp/source/debug.cxx
+++ b/basebmp/source/debug.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: debug.cxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: thb $ $Date: 2006-05-31 09:49:44 $
+ * last change: $Author: thb $ $Date: 2006-05-31 10:12:12 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
diff --git a/basebmp/source/makefile.mk b/basebmp/source/makefile.mk
index 827b53606b07..47c8f60c92ed 100644
--- a/basebmp/source/makefile.mk
+++ b/basebmp/source/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.1 $
+# $Revision: 1.2 $
#
-# last change: $Author: thb $ $Date: 2006-05-31 09:49:44 $
+# last change: $Author: thb $ $Date: 2006-05-31 10:12:12 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
diff --git a/basebmp/test/basictest.cxx b/basebmp/test/basictest.cxx
index ef819c81ab6e..0ad47180988f 100644
--- a/basebmp/test/basictest.cxx
+++ b/basebmp/test/basictest.cxx
@@ -1,3 +1,38 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: basictest.cxx,v $
+ *
+ * $Revision: 1.2 $
+ *
+ * last change: $Author: thb $ $Date: 2006-05-31 10:12:13 $
+ *
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2005 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ ************************************************************************/
+
// autogenerated file with codegen.pl
#include <cppunit/simpleheader.hxx>
diff --git a/basebmp/test/bmpdemo.cxx b/basebmp/test/bmpdemo.cxx
index 29d5c143b4af..82fadf8d0b18 100644
--- a/basebmp/test/bmpdemo.cxx
+++ b/basebmp/test/bmpdemo.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: bmpdemo.cxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: thb $ $Date: 2006-05-31 09:49:44 $
+ * last change: $Author: thb $ $Date: 2006-05-31 10:12:13 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
diff --git a/basebmp/test/filltest.cxx b/basebmp/test/filltest.cxx
index 8a458cac573f..f3025c55e7bb 100644
--- a/basebmp/test/filltest.cxx
+++ b/basebmp/test/filltest.cxx
@@ -1,3 +1,38 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: filltest.cxx,v $
+ *
+ * $Revision: 1.2 $
+ *
+ * last change: $Author: thb $ $Date: 2006-05-31 10:12:13 $
+ *
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2005 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ ************************************************************************/
+
// autogenerated file with codegen.pl
#include <cppunit/simpleheader.hxx>
@@ -49,13 +84,13 @@ private:
rDevice->clear(Color(0));
const basegfx::B2DRange aRect(1,1,10,10);
- const basegfx::B2DPolygon aRectPoly(
- basegfx::tools::createPolygonFromRect( aRect ));
const Color aCol(0xFFFFFFFF);
- rDevice->fillPolyPolygon( basegfx::B2DPolyPolygon(aRectPoly),
- aCol,
- DrawMode_PAINT );
+ rDevice->fillPolyPolygon(
+ basegfx::B2DPolyPolygon(
+ basegfx::tools::createPolygonFromRect( aRect )),
+ aCol,
+ DrawMode_PAINT );
const basegfx::B2IPoint aPt1(1,1);
CPPUNIT_ASSERT_MESSAGE("first pixel set",
rDevice->getPixel(aPt1) == aCol);
@@ -73,6 +108,121 @@ private:
countPixel( rDevice, aCol ) == 81);
}
+ void implTestCornerCases(const BitmapDeviceSharedPtr& rDevice)
+ {
+ rDevice->clear(Color(0));
+
+ const basegfx::B2DRange aEmpty(0,0,0,11);
+ const basegfx::B2DRange aVertLineLeft(0,0,1,11);
+ const basegfx::B2DRange aVertLineRight(10,0,11,11);
+ const basegfx::B2DRange aHorzLineTop(0,0,11,1);
+ const basegfx::B2DRange aHorzLineBottom(0,10,11,11);
+
+ const Color aCol(0xFFFFFFFF);
+ rDevice->fillPolyPolygon(
+ basegfx::B2DPolyPolygon(
+ basegfx::tools::createPolygonFromRect( aEmpty )),
+ aCol,
+ DrawMode_PAINT );
+ CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 0",
+ countPixel( rDevice, aCol ) == 0);
+
+ rDevice->fillPolyPolygon(
+ basegfx::B2DPolyPolygon(
+ basegfx::tools::createPolygonFromRect( aVertLineLeft )),
+ aCol,
+ DrawMode_PAINT );
+ CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 11",
+ countPixel( rDevice, aCol ) == 11);
+ const basegfx::B2IPoint aPt1(0,0);
+ CPPUNIT_ASSERT_MESSAGE("first pixel set",
+ rDevice->getPixel(aPt1) == aCol);
+
+ rDevice->fillPolyPolygon(
+ basegfx::B2DPolyPolygon(
+ basegfx::tools::createPolygonFromRect( aVertLineRight )),
+ aCol,
+ DrawMode_PAINT );
+ CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 22",
+ countPixel( rDevice, aCol ) == 22);
+ const basegfx::B2IPoint aPt2(10,10);
+ CPPUNIT_ASSERT_MESSAGE("last pixel set",
+ rDevice->getPixel(aPt2) == aCol);
+
+ rDevice->fillPolyPolygon(
+ basegfx::B2DPolyPolygon(
+ basegfx::tools::createPolygonFromRect( aHorzLineTop )),
+ aCol,
+ DrawMode_PAINT );
+ CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 31",
+ countPixel( rDevice, aCol ) == 31);
+ const basegfx::B2IPoint aPt3(5,0);
+ CPPUNIT_ASSERT_MESSAGE("top-middle pixel set",
+ rDevice->getPixel(aPt3) == aCol);
+
+ rDevice->fillPolyPolygon(
+ basegfx::B2DPolyPolygon(
+ basegfx::tools::createPolygonFromRect( aHorzLineBottom )),
+ aCol,
+ DrawMode_PAINT );
+ CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 40",
+ countPixel( rDevice, aCol ) == 40);
+ const basegfx::B2IPoint aPt4(5,10);
+ CPPUNIT_ASSERT_MESSAGE("bottom-middle pixel set",
+ rDevice->getPixel(aPt4) == aCol);
+
+ std::ofstream output("32bpp_test.dump");
+ debugDump( rDevice, output );
+ }
+
+ void implTestClipping(const BitmapDeviceSharedPtr& rDevice)
+ {
+ rDevice->clear(Color(0));
+
+ const basegfx::B2DRange aLeftTop(-10,-10,1,1);
+ const basegfx::B2DRange aRightTop(10,-10,20,1);
+ const basegfx::B2DRange aLeftBottom(-10,10,1,20);
+ const basegfx::B2DRange aRightBottom(10,10,20,20);
+ const basegfx::B2DRange aAllOver(-10,-10,20,20);
+
+ const Color aCol(0xFFFFFFFF);
+ rDevice->fillPolyPolygon( basegfx::B2DPolyPolygon(
+ basegfx::tools::createPolygonFromRect(aLeftTop)),
+ aCol,
+ DrawMode_PAINT );
+ CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 1",
+ countPixel( rDevice, aCol ) == 1);
+
+ rDevice->fillPolyPolygon( basegfx::B2DPolyPolygon(
+ basegfx::tools::createPolygonFromRect(aRightTop)),
+ aCol,
+ DrawMode_PAINT );
+ CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 2",
+ countPixel( rDevice, aCol ) == 2);
+
+ rDevice->fillPolyPolygon( basegfx::B2DPolyPolygon(
+ basegfx::tools::createPolygonFromRect(aLeftBottom)),
+ aCol,
+ DrawMode_PAINT );
+
+ CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 3",
+ countPixel( rDevice, aCol ) == 3);
+
+ rDevice->fillPolyPolygon( basegfx::B2DPolyPolygon(
+ basegfx::tools::createPolygonFromRect(aRightBottom)),
+ aCol,
+ DrawMode_PAINT );
+ CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 4",
+ countPixel( rDevice, aCol ) == 4);
+
+ rDevice->fillPolyPolygon( basegfx::B2DPolyPolygon(
+ basegfx::tools::createPolygonFromRect(aAllOver)),
+ aCol,
+ DrawMode_PAINT );
+ CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 121",
+ countPixel( rDevice, aCol ) == 121);
+ }
+
public:
void setUp()
{
@@ -91,12 +241,19 @@ public:
implTestRectFill( mpDevice32bpp );
}
+ void testClipping()
+ {
+ implTestClipping( mpDevice1bpp );
+ implTestClipping( mpDevice32bpp );
+ }
+
// Change the following lines only, if you add, remove or rename
// member functions of the current class,
// because these macros are need by auto register mechanism.
CPPUNIT_TEST_SUITE(FillTest);
CPPUNIT_TEST(testRectFill);
+ CPPUNIT_TEST(testClipping);
CPPUNIT_TEST_SUITE_END();
};
diff --git a/basebmp/test/linetest.cxx b/basebmp/test/linetest.cxx
index 12e82cd0de3a..2a0d4dfa7594 100644
--- a/basebmp/test/linetest.cxx
+++ b/basebmp/test/linetest.cxx
@@ -1,3 +1,38 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: linetest.cxx,v $
+ *
+ * $Revision: 1.2 $
+ *
+ * last change: $Author: thb $ $Date: 2006-05-31 10:12:13 $
+ *
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2005 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ ************************************************************************/
+
// autogenerated file with codegen.pl
#include <cppunit/simpleheader.hxx>
diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk
index e6fec62d9df1..31518e01ed3a 100644
--- a/basebmp/test/makefile.mk
+++ b/basebmp/test/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.1 $
+# $Revision: 1.2 $
#
-# last change: $Author: thb $ $Date: 2006-05-31 09:49:45 $
+# last change: $Author: thb $ $Date: 2006-05-31 10:12:13 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
diff --git a/basebmp/util/makefile.mk b/basebmp/util/makefile.mk
index 8f30bf61694b..5aa760bc87c6 100644
--- a/basebmp/util/makefile.mk
+++ b/basebmp/util/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.1 $
+# $Revision: 1.2 $
#
-# last change: $Author: thb $ $Date: 2006-05-31 09:49:45 $
+# last change: $Author: thb $ $Date: 2006-05-31 10:12:13 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.