diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2019-03-27 19:31:34 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2019-03-29 17:27:41 +0100 |
| commit | 938e6d7a59aa3272afdcf64c14e0647da7f2544f (patch) | |
| tree | c8631ee953275b8190f581d147a448dfdc804e45 /vcl | |
| parent | bd77bd52929c313c27728c58edbb5b9e133dfc4f (diff) | |
fix testConvert for OpenGL
Change-Id: Id78ef9fd05bc158b52aa465c932869c0ef1c55d7
Reviewed-on: https://gerrit.libreoffice.org/69921
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/qa/cppunit/BitmapTest.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
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()) |