#i65904# Completed mask support; fixed color difference bug; added more tests

6 files changed, 522 insertions, 12 deletions

diff --git a/basebmp/test/basictest.cxx b/basebmp/test/basictest.cxx
index 0ad47180988f..d4c2c4d9b2b8 100644
--- a/basebmp/test/basictest.cxx
+++ b/basebmp/test/basictest.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: basictest.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: thb $ $Date: 2006-05-31 10:12:13 $
+ *  last change: $Author: thb $ $Date: 2006-06-02 13:57:25 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -104,7 +104,7 @@ public:
         {
             pDevice = createBitmapDevice( aSize,
                                           true,
-                                          Format::EIGHT_BIT_TC_MASK );
+                                          Format::EIGHT_BIT_GRAY );
 
             const Color aCol4(0x01);
             pDevice->setPixel( aPt, aCol4, DrawMode_PAINT );
diff --git a/basebmp/test/bmpdemo.cxx b/basebmp/test/bmpdemo.cxx
index b1312a597df1..99e9a5b14464 100644
--- a/basebmp/test/bmpdemo.cxx
+++ b/basebmp/test/bmpdemo.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: bmpdemo.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: thb $ $Date: 2006-06-02 08:36:14 $
+ *  last change: $Author: thb $ $Date: 2006-06-02 13:57:25 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -69,6 +69,7 @@
 #include <basebmp/color.hxx>
 #include <basebmp/scanlineformats.hxx>
 #include <basebmp/bitmapdevice.hxx>
+#include <basebmp/debug.hxx>
 
 #include <rtl/bootstrap.hxx>
 
@@ -79,6 +80,8 @@
 
 #include <boost/static_assert.hpp>
 #include <algorithm>
+#include <iostream>
+#include <fstream>
 
 using namespace ::com::sun::star;
 
@@ -998,10 +1001,10 @@ void TestWindow::Paint( const Rectangle& rRect )
         const basegfx::B2ISize aSize(10,10);
         basebmp::BitmapDeviceSharedPtr pBmp( basebmp::createBitmapDevice( aSize,
                                                                           true,
-                                                                          basebmp::Format::THIRTYTWO_BIT_TC_MASK ));
+                                                                          basebmp::Format::EIGHT_BIT_GRAY ));
         basebmp::BitmapDeviceSharedPtr pDevice( basebmp::createBitmapDevice( aSize,
                                                                              true,
-                                                                             basebmp::Format::THIRTYTWO_BIT_TC_MASK ));
+                                                                             basebmp::Format::ONE_BIT_MSB_PAL ));
         ::rtl::OUString aSvg = ::rtl::OUString::createFromAscii(
             "m 0 0h5v10h5v-5h-10z" );
 
@@ -1014,14 +1017,20 @@ void TestWindow::Paint( const Rectangle& rRect )
             aCol,
             basebmp::DrawMode_PAINT );
 
-        const basegfx::B2IRange aSourceRect(0,0,11,11);
-        const basegfx::B2IRange aDestLeftTop(0,0,5,5);
+        const basegfx::B2IRange aSourceRect(0,0,10,10);
+        const basegfx::B2IPoint aOutPos(5,5);
+        const basebmp::Color    aCol2(0xF0F0F0F0);
         pDevice->clear(basebmp::Color(0));
-        pDevice->drawBitmap(
+        pDevice->drawMaskedColor(
+            aCol2,
             pBmp,
             aSourceRect,
-            aDestLeftTop,
-            basebmp::DrawMode_PAINT );
+            aOutPos );
+
+        std::ofstream output("32bpp_test.dump");
+        debugDump( pDevice, output );
+        std::ofstream output2("32bpp_bmp.dump");
+        debugDump( pBmp, output2 );
     }
 
     enum{ srcBitDepth=1, dstBitDepth=4 };
diff --git a/basebmp/test/bmptest.cxx b/basebmp/test/bmptest.cxx
new file mode 100644
index 000000000000..3f180dd91e0e
--- /dev/null
+++ b/basebmp/test/bmptest.cxx
@@ -0,0 +1,224 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: bmptest.cxx,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: thb $ $Date: 2006-06-02 13:57:25 $
+ *
+ *  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>
+
+#include <basegfx/vector/b2isize.hxx>
+#include <basegfx/range/b2irange.hxx>
+#include <basegfx/point/b2ipoint.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
+
+#include <basebmp/color.hxx>
+#include <basebmp/scanlineformats.hxx>
+#include <basebmp/bitmapdevice.hxx>
+#include <basebmp/debug.hxx>
+#include "tools.hxx"
+
+#include <iostream>
+#include <fstream>
+
+using namespace ::basebmp;
+
+namespace
+{
+/*
+        std::ofstream output("32bpp_test.dump");
+        debugDump( rDevice, output );
+        std::ofstream output2("32bpp_bmp.dump");
+        debugDump( rBmp, output2 );
+*/
+
+class BmpTest : public CppUnit::TestFixture
+{
+private:
+    BitmapDeviceSharedPtr mpDevice1bpp;
+    BitmapDeviceSharedPtr mpBmp1bpp;
+    BitmapDeviceSharedPtr mpDevice32bpp;
+    BitmapDeviceSharedPtr mpBmp32bpp;
+
+    void implTestBmpBasics(const BitmapDeviceSharedPtr& rDevice,
+                           const BitmapDeviceSharedPtr& rBmp)
+    {
+        rDevice->clear(Color(0));
+        const Color aCol(0xFFFFFFFF);
+
+        const basegfx::B2IRange aSourceRect(0,0,10,10);
+        const basegfx::B2IRange aDestLeftTop(0,0,4,4);
+        const basegfx::B2IRange aDestRightTop(6,0,10,4);
+        const basegfx::B2IRange aDestLeftBottom(0,6,4,10);
+        const basegfx::B2IRange aDestRightBottom(6,6,10,10);
+
+        rDevice->drawBitmap(
+            rBmp,
+            aSourceRect,
+            aDestLeftTop,
+            DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 8",
+                               countPixel( rDevice, aCol ) == 8);
+
+        rDevice->drawBitmap(
+            rBmp,
+            aSourceRect,
+            aDestRightTop,
+            DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 16",
+                               countPixel( rDevice, aCol ) == 16);
+
+        rDevice->drawBitmap(
+            rBmp,
+            aSourceRect,
+            aDestLeftBottom,
+            DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 24",
+                               countPixel( rDevice, aCol ) == 24);
+
+        rDevice->drawBitmap(
+            rBmp,
+            aSourceRect,
+            aDestRightBottom,
+            DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 32",
+                               countPixel( rDevice, aCol ) == 32);
+    }
+
+    void implTestBmpClip(const BitmapDeviceSharedPtr& rDevice,
+                         const BitmapDeviceSharedPtr& rBmp)
+    {
+        rDevice->clear(Color(0));
+        const Color aCol(0xFFFFFFFF);
+
+        const basegfx::B2IRange aSourceRect(0,0,10,10);
+        const basegfx::B2IRange aDestLeftTop(-2,-2,2,2);
+        const basegfx::B2IRange aDestRightTop(8,-2,12,2);
+        const basegfx::B2IRange aDestLeftBottom(-2,8,2,12);
+        const basegfx::B2IRange aDestRightBottom(8,8,12,12);
+
+        rDevice->drawBitmap(
+            rBmp,
+            aSourceRect,
+            aDestLeftTop,
+            DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 4",
+                               countPixel( rDevice, aCol ) == 4);
+
+        rDevice->drawBitmap(
+            rBmp,
+            aSourceRect,
+            aDestLeftBottom,
+            DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 4(c)",
+                               countPixel( rDevice, aCol ) == 4);
+
+        rDevice->drawBitmap(
+            rBmp,
+            aSourceRect,
+            aDestRightBottom,
+            DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 8",
+                               countPixel( rDevice, aCol ) == 8);
+    }
+
+public:
+    void setUp()
+    {
+        const basegfx::B2ISize aSize(10,10);
+        mpDevice1bpp = createBitmapDevice( aSize,
+                                           true,
+                                           Format::ONE_BIT_MSB_PAL );
+        mpDevice32bpp = createBitmapDevice( aSize,
+                                            true,
+                                            Format::THIRTYTWO_BIT_TC_MASK );
+
+        mpBmp1bpp = createBitmapDevice( aSize,
+                                        true,
+                                        Format::ONE_BIT_MSB_PAL );
+        mpBmp32bpp = createBitmapDevice( aSize,
+                                         true,
+                                         Format::THIRTYTWO_BIT_TC_MASK );
+
+        ::rtl::OUString aSvg = ::rtl::OUString::createFromAscii(
+            "m 0 0h5v10h5v-5h-10z" );
+
+        basegfx::B2DPolyPolygon aPoly;
+        basegfx::tools::importFromSvgD( aPoly, aSvg );
+        const Color aCol(0xFFFFFFFF);
+        mpBmp1bpp->fillPolyPolygon(
+            aPoly,
+            aCol,
+            DrawMode_PAINT );
+        mpBmp32bpp->fillPolyPolygon(
+            aPoly,
+            aCol,
+            DrawMode_PAINT );
+    }
+
+    void testBmpBasics()
+    {
+        implTestBmpBasics( mpDevice1bpp, mpBmp1bpp );
+        implTestBmpBasics( mpDevice32bpp, mpBmp32bpp );
+    }
+
+    void testBmpClip()
+    {
+        implTestBmpClip( mpDevice1bpp, mpBmp1bpp );
+        implTestBmpClip( mpDevice32bpp, mpBmp32bpp );
+    }
+
+    // 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(BmpTest);
+    CPPUNIT_TEST(testBmpBasics);
+    CPPUNIT_TEST(testBmpClip);
+    CPPUNIT_TEST_SUITE_END();
+};
+
+// -----------------------------------------------------------------------------
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(BmpTest, "BmpTest");
+}
+
+
+// -----------------------------------------------------------------------------
+
+// this macro creates an empty function, which will called by the RegisterAllFunctions()
+// to let the user the possibility to also register some functions by hand.
+//NOADDITIONAL;
+
diff --git a/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx
new file mode 100644
index 000000000000..95fdfd16cebe
--- /dev/null
+++ b/basebmp/test/masktest.cxx
@@ -0,0 +1,181 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: masktest.cxx,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: thb $ $Date: 2006-06-02 13:57:25 $
+ *
+ *  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>
+
+#include <basegfx/vector/b2isize.hxx>
+#include <basegfx/range/b2irange.hxx>
+#include <basegfx/point/b2ipoint.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
+
+#include <basebmp/color.hxx>
+#include <basebmp/scanlineformats.hxx>
+#include <basebmp/bitmapdevice.hxx>
+#include <basebmp/debug.hxx>
+#include "tools.hxx"
+
+#include <iostream>
+#include <fstream>
+
+using namespace ::basebmp;
+
+namespace
+{
+/*
+        std::ofstream output("32bpp_test.dump");
+        debugDump( rDevice, output );
+        std::ofstream output2("32bpp_bmp.dump");
+        debugDump( rBmp, output2 );
+*/
+
+class MaskTest : public CppUnit::TestFixture
+{
+private:
+    BitmapDeviceSharedPtr mpDevice1bpp;
+    BitmapDeviceSharedPtr mpDevice32bpp;
+    BitmapDeviceSharedPtr mpMask;
+
+    void implTestMaskBasics(const BitmapDeviceSharedPtr& rDevice,
+                            const BitmapDeviceSharedPtr& rBmp)
+    {
+        const Color aCol(0);
+        const Color aCol2(0xF0F0F0F0);
+
+        const basegfx::B2IRange aSourceRect(0,0,10,10);
+        const basegfx::B2IPoint aDestLeftTop(0,0);
+        const basegfx::B2IPoint aDestRightTop(5,0);
+        const basegfx::B2IPoint aDestLeftBottom(0,5);
+        const basegfx::B2IPoint aDestRightBottom(5,5);
+
+        rDevice->clear(aCol);
+        rDevice->drawMaskedColor(
+            aCol2,
+            rBmp,
+            aSourceRect,
+            aDestLeftTop );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 50",
+                               countPixel( rDevice, aCol ) == 100-50);
+
+        rDevice->clear(aCol);
+        rDevice->drawMaskedColor(
+            aCol2,
+            rBmp,
+            aSourceRect,
+            aDestRightTop );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 25",
+                               countPixel( rDevice, aCol ) == 100-25);
+
+        rDevice->clear(aCol);
+        rDevice->drawMaskedColor(
+            aCol2,
+            rBmp,
+            aSourceRect,
+            aDestLeftBottom );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 25(b)",
+                               countPixel( rDevice, aCol ) == 100-25);
+
+        rDevice->clear(aCol);
+        rDevice->drawMaskedColor(
+            aCol2,
+            rBmp,
+            aSourceRect,
+            aDestRightBottom );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 25(c)",
+                               countPixel( rDevice, aCol ) == 100-25);
+    }
+
+public:
+    void setUp()
+    {
+        const basegfx::B2ISize aSize(10,10);
+        mpDevice1bpp = createBitmapDevice( aSize,
+                                           true,
+                                           Format::ONE_BIT_MSB_PAL );
+        mpDevice32bpp = createBitmapDevice( aSize,
+                                            true,
+                                            Format::THIRTYTWO_BIT_TC_MASK );
+
+        mpMask = createBitmapDevice( aSize,
+                                     true,
+                                     Format::EIGHT_BIT_GRAY );
+
+        ::rtl::OUString aSvg = ::rtl::OUString::createFromAscii(
+            "m 0 0h5v10h5v-5h-10z" );
+
+        basegfx::B2DPolyPolygon aPoly;
+        basegfx::tools::importFromSvgD( aPoly, aSvg );
+        const Color aCol(0xFF);
+        mpMask->fillPolyPolygon(
+            aPoly,
+            aCol,
+            DrawMode_PAINT );
+    }
+
+    void testMaskBasics()
+    {
+        implTestMaskBasics( mpDevice32bpp, mpMask );
+        implTestMaskBasics( mpDevice1bpp, mpMask );
+    }
+
+    void testMaskClip()
+    {
+    }
+
+    // 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(MaskTest);
+    CPPUNIT_TEST(testMaskBasics);
+    CPPUNIT_TEST(testMaskClip);
+    CPPUNIT_TEST_SUITE_END();
+};
+
+// -----------------------------------------------------------------------------
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(MaskTest, "MaskTest");
+}
+
+
+// -----------------------------------------------------------------------------
+
+// this macro creates an empty function, which will called by the RegisterAllFunctions()
+// to let the user the possibility to also register some functions by hand.
+//NOADDITIONAL;
+
diff --git a/basebmp/test/tools.cxx b/basebmp/test/tools.cxx
new file mode 100644
index 000000000000..bcaf832bcd60
--- /dev/null
+++ b/basebmp/test/tools.cxx
@@ -0,0 +1,57 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: tools.cxx,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: thb $ $Date: 2006-06-02 13:57:26 $
+ *
+ *  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 <basegfx/vector/b2isize.hxx>
+#include <basegfx/point/b2ipoint.hxx>
+
+#include <basebmp/color.hxx>
+#include <basebmp/bitmapdevice.hxx>
+
+using namespace ::basebmp;
+
+int countPixel( const BitmapDeviceSharedPtr& rDevice,
+                Color                        checkColor )
+{
+    int count(0);
+    const basegfx::B2ISize& rSize( rDevice->getSize() );
+    for( sal_Int32 y=0; y<rSize.getY(); ++y )
+        for( sal_Int32 x=0; x<rSize.getX(); ++x )
+            if( rDevice->getPixel( basegfx::B2IPoint(x,y) ) == checkColor )
+                ++count;
+
+    return count;
+}
diff --git a/basebmp/test/tools.hxx b/basebmp/test/tools.hxx
new file mode 100644
index 000000000000..2b93852d0002
--- /dev/null
+++ b/basebmp/test/tools.hxx
@@ -0,0 +1,39 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: tools.hxx,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: thb $ $Date: 2006-06-02 13:57:26 $
+ *
+ *  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
+ *
+ ************************************************************************/
+
+#include "basebmp/bitmapdevice.hxx"
+
+int countPixel( const basebmp::BitmapDeviceSharedPtr& rDevice,
+                basebmp::Color                        checkColor );