summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-12-09 17:43:23 +0000
committerMichael Meeks <michael.meeks@collabora.com>2015-12-11 18:47:43 +0000
commit9820622b9ae2879b13a602ae3e1b47088bf0c0c4 (patch)
tree954fcf394e1e4871b7c55df565a40634cbbbd666
parent208c247edbef4449b8614dd3709e627edc546e46 (diff)
Calm unit test down for GL row-strides.
Change-Id: Ie4123fc692f4fac33f082bb2d86b949d834f1858
-rw-r--r--vcl/qa/cppunit/BitmapTest.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/qa/cppunit/BitmapTest.cxx b/vcl/qa/cppunit/BitmapTest.cxx
index eb393bc5c538..fe8c933668d1 100644
--- a/vcl/qa/cppunit/BitmapTest.cxx
+++ b/vcl/qa/cppunit/BitmapTest.cxx
@@ -55,7 +55,8 @@ void BitmapTest::testConvert()
//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_uLong>(10), pReadAccess->GetScanlineSize());
#else
- CPPUNIT_ASSERT_EQUAL(static_cast<sal_uLong>(12), pReadAccess->GetScanlineSize());
+ if (!OpenGLHelper::isVCLOpenGLEnabled())
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_uLong>(12), pReadAccess->GetScanlineSize());
#endif
CPPUNIT_ASSERT(pReadAccess->HasPalette());
const BitmapColor& rColor = pReadAccess->GetPaletteColor(pReadAccess->GetPixelIndex(1, 1));