summaryrefslogtreecommitdiff
path: root/vcl/qa/cppunit/png
diff options
context:
space:
mode:
authorofftkp <parisoplop@gmail.com>2022-07-19 18:39:58 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2022-07-19 18:29:13 +0200
commit65b29c5d38012f7c95ee0ee2070d11f679cbf3d3 (patch)
tree62c0b1aa9a494f19f5e3aaaec3b0dab50b2620e2 /vcl/qa/cppunit/png
parent85a044abdf08bafa93e1caddf38f86e35d7e17f2 (diff)
Don't compare using long in PngFilterTest
Change-Id: Ia6f0f7339e3e42acb2fe14eda914b21fc51b7d5f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137236 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'vcl/qa/cppunit/png')
-rw-r--r--vcl/qa/cppunit/png/PngFilterTest.cxx15
1 files changed, 5 insertions, 10 deletions
diff --git a/vcl/qa/cppunit/png/PngFilterTest.cxx b/vcl/qa/cppunit/png/PngFilterTest.cxx
index 33af620eb08a..8635165ad705 100644
--- a/vcl/qa/cppunit/png/PngFilterTest.cxx
+++ b/vcl/qa/cppunit/png/PngFilterTest.cxx
@@ -1796,8 +1796,7 @@ void PngFilterTest::testPngRoundtrip8BitGrey()
BitmapEx aBitmapEx;
CPPUNIT_ASSERT_EQUAL(true, aPngReader.read(aBitmapEx));
- CPPUNIT_ASSERT_EQUAL(16L, aBitmapEx.GetSizePixel().Width());
- CPPUNIT_ASSERT_EQUAL(16L, aBitmapEx.GetSizePixel().Height());
+ CPPUNIT_ASSERT_EQUAL(Size(16, 16), aBitmapEx.GetSizePixel());
CPPUNIT_ASSERT_EQUAL(COL_GRAY, aBitmapEx.GetPixelColor(0, 0));
CPPUNIT_ASSERT_EQUAL(COL_LIGHTGRAY, aBitmapEx.GetPixelColor(15, 15));
@@ -1845,8 +1844,7 @@ void PngFilterTest::testPngRoundtrip24()
BitmapEx aBitmapEx;
CPPUNIT_ASSERT_EQUAL(true, aPngReader.read(aBitmapEx));
- CPPUNIT_ASSERT_EQUAL(16L, aBitmapEx.GetSizePixel().Width());
- CPPUNIT_ASSERT_EQUAL(16L, aBitmapEx.GetSizePixel().Height());
+ CPPUNIT_ASSERT_EQUAL(Size(16, 16), aBitmapEx.GetSizePixel());
CPPUNIT_ASSERT_EQUAL(COL_LIGHTRED, aBitmapEx.GetPixelColor(0, 0));
CPPUNIT_ASSERT_EQUAL(COL_LIGHTBLUE, aBitmapEx.GetPixelColor(15, 15));
@@ -1900,8 +1898,7 @@ void PngFilterTest::testPngRoundtrip24_8()
BitmapEx aBitmapEx;
CPPUNIT_ASSERT_EQUAL(true, aPngReader.read(aBitmapEx));
- CPPUNIT_ASSERT_EQUAL(16L, aBitmapEx.GetSizePixel().Width());
- CPPUNIT_ASSERT_EQUAL(16L, aBitmapEx.GetSizePixel().Height());
+ CPPUNIT_ASSERT_EQUAL(Size(16, 16), aBitmapEx.GetSizePixel());
CPPUNIT_ASSERT_EQUAL(Color(ColorTransparency, 0xBB, 0xFF, 0x00, 0x00),
aBitmapEx.GetPixelColor(0, 0));
@@ -1970,8 +1967,7 @@ void PngFilterTest::testPngWrite1BitRGBPalette()
BitmapEx aBitmapEx;
CPPUNIT_ASSERT_EQUAL(true, aPngReader.read(aBitmapEx));
- CPPUNIT_ASSERT_EQUAL(16L, aBitmapEx.GetSizePixel().Width());
- CPPUNIT_ASSERT_EQUAL(16L, aBitmapEx.GetSizePixel().Height());
+ CPPUNIT_ASSERT_EQUAL(Size(16, 16), aBitmapEx.GetSizePixel());
CPPUNIT_ASSERT_EQUAL(COL_RED, aBitmapEx.GetPixelColor(0, 0));
CPPUNIT_ASSERT_EQUAL(COL_RED, aBitmapEx.GetPixelColor(15, 15));
@@ -2013,8 +2009,7 @@ void PngFilterTest::testPngWrite8BitRGBPalette()
BitmapEx aBitmapEx;
CPPUNIT_ASSERT_EQUAL(true, aPngReader.read(aBitmapEx));
- CPPUNIT_ASSERT_EQUAL(16L, aBitmapEx.GetSizePixel().Width());
- CPPUNIT_ASSERT_EQUAL(16L, aBitmapEx.GetSizePixel().Height());
+ CPPUNIT_ASSERT_EQUAL(Size(16, 16), aBitmapEx.GetSizePixel());
for (int i = 0; i < 16; i++)
{