vcl/qa/cppunit/BackendTest.cxx | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 184bd73ef0ed802489a90b4dc6d214db784e68bb
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Mar 5 14:37:54 2021 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Mar 5 20:13:14 2021 +0100
loplugin:unreffun (macOS)
...after f8891b7f87957cc3f66805adf9b1e35a2189946b "tdf#138122 Detect window
scaling for multi display configurations on macOS"
Change-Id: I2126d75a92c6e5f4a68adfc2d05542a5724c235c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112019
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/vcl/qa/cppunit/BackendTest.cxx b/vcl/qa/cppunit/BackendTest.cxx
index 88ef28fb40e4..5e792506b665 100644
--- a/vcl/qa/cppunit/BackendTest.cxx
+++ b/vcl/qa/cppunit/BackendTest.cxx
@@ -467,6 +467,8 @@ public:
void testDrawTransformedBitmapExAlpha()
{
+// TODO: This unit test is not executed for macOS unless bitmap scaling is
implemented
+#ifndef MACOSX
ScopedVclPtrInstance<VirtualDevice> device;
device->SetOutputSizePixel(Size(16, 16));
device->SetBackground(Wallpaper(COL_WHITE));
@@ -498,6 +500,7 @@ public:
result = device->GetBitmap(Point(0, 0), Size(16, 16));
CPPUNIT_ASSERT_EQUAL(COL_WHITE, result.GetPixelColor(0, 0));
CPPUNIT_ASSERT_EQUAL(Color(0x80, 0x80, 0x80), result.GetPixelColor(0,
15));
+#endif
}
void testClipRectangle()
@@ -856,6 +859,8 @@ public:
void testTdf136171()
{
+// TODO: Following unit tests are not executed for macOS unless bitmap scaling
is implemented
+#ifndef MACOSX
// Create virtual device with alpha.
ScopedVclPtr<VirtualDevice> device
= VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT,
DeviceFormat::DEFAULT);
@@ -877,6 +882,7 @@ public:
CPPUNIT_ASSERT_EQUAL(COL_BLUE, device->GetPixel(Point(0, 9)));
CPPUNIT_ASSERT_EQUAL(COL_BLUE, device->GetPixel(Point(9, 9)));
CPPUNIT_ASSERT_EQUAL(COL_BLUE, device->GetPixel(Point(4, 4)));
+#endif
}
CPPUNIT_TEST_SUITE(BackendTest);
@@ -922,10 +928,7 @@ public:
CPPUNIT_TEST(testDrawBlend);
CPPUNIT_TEST(testDrawXor);
-// TODO: Following unit test is not executed for macOS unless bitmap scaling
is implemented
-#ifndef MACOSX
CPPUNIT_TEST(testDrawTransformedBitmapExAlpha);
-#endif
CPPUNIT_TEST(testClipRectangle);
CPPUNIT_TEST(testClipPolygon);
@@ -950,11 +953,8 @@ public:
CPPUNIT_TEST(testDrawBlendExtended);
CPPUNIT_TEST(testDrawAlphaBitmapMirrored);
-// TODO: Following unit tests are not executed for macOS unless bitmap scaling
is implemented
-#ifndef MACOSX
CPPUNIT_TEST(testTdf124848);
CPPUNIT_TEST(testTdf136171);
-#endif
CPPUNIT_TEST_SUITE_END();
};
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
