[Libreoffice-commits] core.git: vcl/qa

[Luboš Luňák (via logerrit)]

 vcl/qa/cppunit/BitmapTest.cxx |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 00083cfa840269ef5e569c7c4a6a09a34e6ce2db
Author:     Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Fri Aug 13 07:33:48 2021 +0200
Commit:     Luboš Luňák <l.lu...@collabora.com>
CommitDate: Mon Aug 23 14:58:48 2021 +0200

    fix skia scanline size in bitmap test
    
    Change-Id: I22a315ca56cae80d88898e2df1ed44894c9787b6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120804
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lu...@collabora.com>

diff --git a/vcl/qa/cppunit/BitmapTest.cxx b/vcl/qa/cppunit/BitmapTest.cxx
index edb9fe386de6..45e1bdfa1d73 100644
--- a/vcl/qa/cppunit/BitmapTest.cxx
+++ b/vcl/qa/cppunit/BitmapTest.cxx
@@ -289,11 +289,13 @@ void BitmapTest::testConvert()
         Bitmap::ScopedReadAccess pReadAccess(aBitmap);
         CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt16>(8), 
pReadAccess->GetBitCount());
 #if defined MACOSX || defined IOS
-        //it would be nice to find and change the stride for quartz to be the 
same as everyone else
-        CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt32>(10), 
pReadAccess->GetScanlineSize());
-#else
-        if (!SkiaHelper::isVCLSkiaEnabled())
+        if (SkiaHelper::isVCLSkiaEnabled())
             CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt32>(12), 
pReadAccess->GetScanlineSize());
+        else
+            //it would be nice to find and change the stride for quartz to be 
the same as everyone else
+            CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt32>(10), 
pReadAccess->GetScanlineSize());
+#else
+        CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt32>(12), 
pReadAccess->GetScanlineSize());
 #endif
         CPPUNIT_ASSERT(pReadAccess->HasPalette());
         const BitmapColor& rColor = 
pReadAccess->GetPaletteColor(pReadAccess->GetPixelIndex(1, 1));