Kaydet (Commit) c7bc1284 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

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
üst 63fbe59d
...@@ -36,7 +36,7 @@ void VclOutdevTest::testVirtualDevice() ...@@ -36,7 +36,7 @@ void VclOutdevTest::testVirtualDevice()
aVDev.SetOutputSizePixel(Size(32,32)); aVDev.SetOutputSizePixel(Size(32,32));
aVDev.SetBackground(Wallpaper(COL_WHITE)); aVDev.SetBackground(Wallpaper(COL_WHITE));
aVDev.Erase(); aVDev.Erase();
aVDev.DrawPixel(Point(1,2),COL_GREEN); aVDev.DrawPixel(Point(1,2),COL_BLUE);
aVDev.DrawPixel(Point(31,30),COL_RED); aVDev.DrawPixel(Point(31,30),COL_RED);
Size aSize = aVDev.GetOutputSizePixel(); Size aSize = aVDev.GetOutputSizePixel();
...@@ -57,14 +57,14 @@ void VclOutdevTest::testVirtualDevice() ...@@ -57,14 +57,14 @@ void VclOutdevTest::testVirtualDevice()
#endif #endif
CPPUNIT_ASSERT_EQUAL(COL_WHITE, aVDev.GetPixel(Point(0,0)).GetColor()); 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_RED, aVDev.GetPixel(Point(31,30)).GetColor());
CPPUNIT_ASSERT_EQUAL(COL_WHITE, aVDev.GetPixel(Point(30,31)).GetColor()); CPPUNIT_ASSERT_EQUAL(COL_WHITE, aVDev.GetPixel(Point(30,31)).GetColor());
// Gotcha: y and x swap for BitmapReadAccess: deep joy. // Gotcha: y and x swap for BitmapReadAccess: deep joy.
Bitmap::ScopedReadAccess pAcc(aBmp); Bitmap::ScopedReadAccess pAcc(aBmp);
CPPUNIT_ASSERT_EQUAL(COL_WHITE, Color(pAcc->GetPixel(0,0)).GetColor()); 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_RED, Color(pAcc->GetPixel(30,31)).GetColor());
CPPUNIT_ASSERT_EQUAL(COL_WHITE, Color(pAcc->GetPixel(31,30)).GetColor()); CPPUNIT_ASSERT_EQUAL(COL_WHITE, Color(pAcc->GetPixel(31,30)).GetColor());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment