[Libreoffice-commits] core.git: vcl/qa
Stephan Bergmann
sbergman at redhat.com
Tue Dec 2 05:00:20 PST 2014
vcl/qa/cppunit/outdev.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit c7bc12848a63f917a2f783f346284bd376ab4479
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Dec 2 13:58:16 2014 +0100
Blue works better on Mac than green
...for whatever reason, the CPPUNIT_ASSERT_EQUALs failed with 0x057F00 !=
0x008000 for COL_GREEN, but appear to work fine for COL_BLUE.
Change-Id: I1a5817fc89feff66ceb352d0cf44f9ce2be7908a
diff --git a/vcl/qa/cppunit/outdev.cxx b/vcl/qa/cppunit/outdev.cxx
index 992ceea..a22f8dc 100644
--- a/vcl/qa/cppunit/outdev.cxx
+++ b/vcl/qa/cppunit/outdev.cxx
@@ -36,7 +36,7 @@ void VclOutdevTest::testVirtualDevice()
aVDev.SetOutputSizePixel(Size(32,32));
aVDev.SetBackground(Wallpaper(COL_WHITE));
aVDev.Erase();
- aVDev.DrawPixel(Point(1,2),COL_GREEN);
+ aVDev.DrawPixel(Point(1,2),COL_BLUE);
aVDev.DrawPixel(Point(31,30),COL_RED);
Size aSize = aVDev.GetOutputSizePixel();
@@ -57,14 +57,14 @@ void VclOutdevTest::testVirtualDevice()
#endif
CPPUNIT_ASSERT_EQUAL(COL_WHITE, aVDev.GetPixel(Point(0,0)).GetColor());
- CPPUNIT_ASSERT_EQUAL(COL_GREEN, aVDev.GetPixel(Point(1,2)).GetColor());
+ CPPUNIT_ASSERT_EQUAL(COL_BLUE, aVDev.GetPixel(Point(1,2)).GetColor());
CPPUNIT_ASSERT_EQUAL(COL_RED, aVDev.GetPixel(Point(31,30)).GetColor());
CPPUNIT_ASSERT_EQUAL(COL_WHITE, aVDev.GetPixel(Point(30,31)).GetColor());
// Gotcha: y and x swap for BitmapReadAccess: deep joy.
Bitmap::ScopedReadAccess pAcc(aBmp);
CPPUNIT_ASSERT_EQUAL(COL_WHITE, Color(pAcc->GetPixel(0,0)).GetColor());
- CPPUNIT_ASSERT_EQUAL(COL_GREEN, Color(pAcc->GetPixel(2,1)).GetColor());
+ CPPUNIT_ASSERT_EQUAL(COL_BLUE, Color(pAcc->GetPixel(2,1)).GetColor());
CPPUNIT_ASSERT_EQUAL(COL_RED, Color(pAcc->GetPixel(30,31)).GetColor());
CPPUNIT_ASSERT_EQUAL(COL_WHITE, Color(pAcc->GetPixel(31,30)).GetColor());
More information about the Libreoffice-commits
mailing list