vcl/qa/cppunit/BitmapTest.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
New commits: commit 975b14df8e9bd7fa701a6b028d4d85aada02a65b Author: Michael Meeks <[email protected]> Date: Wed Dec 9 17:43:23 2015 +0000 Calm unit test down for GL row-strides. Change-Id: Ie4123fc692f4fac33f082bb2d86b949d834f1858 diff --git a/vcl/qa/cppunit/BitmapTest.cxx b/vcl/qa/cppunit/BitmapTest.cxx index eb393bc..fe8c933 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)); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
