#i65904# Corrected license headers, added more tests

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.

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.

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

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.

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.

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.

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

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.

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.

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.

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.

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.

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

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.

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) );

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

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.

basebmp/test/basictest.cxx

+/*************************************************************************
+ *
+ *  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>

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.

basebmp/test/filltest.cxx

+/*************************************************************************
+ *
+ *  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();
 };
 

basebmp/test/linetest.cxx

+/*************************************************************************
+ *
+ *  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>

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.

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.