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

[Tomaž Vajngerl (via logerrit)]

 vcl/qa/cppunit/BitmapTest.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 938e6d7a59aa3272afdcf64c14e0647da7f2544f
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Wed Mar 27 19:31:34 2019 +0900
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Fri Mar 29 17:27:41 2019 +0100

    fix testConvert for OpenGL
    
    Change-Id: Id78ef9fd05bc158b52aa465c932869c0ef1c55d7
    Reviewed-on: https://gerrit.libreoffice.org/69921
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/vcl/qa/cppunit/BitmapTest.cxx b/vcl/qa/cppunit/BitmapTest.cxx
index 9c8c399028a3..986ce3532487 100644
--- a/vcl/qa/cppunit/BitmapTest.cxx
+++ b/vcl/qa/cppunit/BitmapTest.cxx
@@ -372,7 +372,12 @@ void BitmapTest::testConvert()
         CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt16>(24), pReadAccess->GetBitCount());
 
 #if defined LINUX || defined FREEBSD
-        CPPUNIT_ASSERT_EQUAL(sal_uInt32(32), pReadAccess->GetScanlineSize());
+#if HAVE_FEATURE_OPENGL
+        if (OpenGLHelper::isVCLOpenGLEnabled())
+            CPPUNIT_ASSERT_EQUAL(sal_uInt32(30), pReadAccess->GetScanlineSize());
+        else
+#endif
+            CPPUNIT_ASSERT_EQUAL(sal_uInt32(32), pReadAccess->GetScanlineSize());
 #else
 #if defined(_WIN32)
         if (!OpenGLHelper::isVCLOpenGLEnabled())