diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-09-01 17:28:21 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2015-09-03 06:37:14 +0000 |
| commit | b10738a5595e4efb8cdca950396e3ae4b30e0b32 (patch) | |
| tree | 37a58cd24fbb47382ef6a8ce7722b4f35a5af56d | |
| parent | 426ec2deb0793d22b7a94af8386d1714900cc26a (diff) | |
Tweak VCL unit tests for OpenGL.
Change-Id: Ia36f8424226da4e66ae991abd4d6f24604db324c
Reviewed-on: https://gerrit.libreoffice.org/18284
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
| -rw-r--r-- | vcl/CppunitTest_vcl_bitmap_test.mk | 3 | ||||
| -rw-r--r-- | vcl/qa/cppunit/BitmapTest.cxx | 26 |
2 files changed, 22 insertions, 7 deletions
diff --git a/vcl/CppunitTest_vcl_bitmap_test.mk b/vcl/CppunitTest_vcl_bitmap_test.mk index 5927b6974b44..33a0772695be 100644 --- a/vcl/CppunitTest_vcl_bitmap_test.mk +++ b/vcl/CppunitTest_vcl_bitmap_test.mk @@ -16,6 +16,9 @@ $(eval $(call gb_CppunitTest_add_exception_objects,vcl_bitmap_test, \ $(eval $(call gb_CppunitTest_use_externals,vcl_bitmap_test,\ boost_headers \ + glew \ + glm_headers \ + mesa_headers \ )) $(eval $(call gb_CppunitTest_set_include,vcl_bitmap_test,\ diff --git a/vcl/qa/cppunit/BitmapTest.cxx b/vcl/qa/cppunit/BitmapTest.cxx index 2c94e0e6f228..a5437c179e3b 100644 --- a/vcl/qa/cppunit/BitmapTest.cxx +++ b/vcl/qa/cppunit/BitmapTest.cxx @@ -21,6 +21,7 @@ #include <rtl/strbuf.hxx> #include <tools/stream.hxx> #include <vcl/graphicfilter.hxx> +#include <vcl/opengl/OpenGLHelper.hxx> #include "BitmapSymmetryCheck.hxx" @@ -51,11 +52,16 @@ void BitmapTest::testConvert() Bitmap::ScopedReadAccess pReadAccess(aBitmap); CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt16>(8), pReadAccess->GetBitCount()); #if defined WNT - // Scanlines padded to DWORD multiples, it seems - CPPUNIT_ASSERT_EQUAL(static_cast<sal_uLong>(12), pReadAccess->GetScanlineSize()); -#else - CPPUNIT_ASSERT_EQUAL(static_cast<sal_uLong>(10), pReadAccess->GetScanlineSize()); + if (!OpenGLHelper::isVCLOpenGLEnabled()) + { + // GDI Scanlines padded to DWORD multiples, it seems + CPPUNIT_ASSERT_EQUAL(static_cast<sal_uLong>(12), pReadAccess->GetScanlineSize()); + } + else #endif + { + CPPUNIT_ASSERT_EQUAL(static_cast<sal_uLong>(10), pReadAccess->GetScanlineSize()); + } CPPUNIT_ASSERT(pReadAccess->HasPalette()); const BitmapColor& rColor = pReadAccess->GetPaletteColor(pReadAccess->GetPixelIndex(1, 1)); CPPUNIT_ASSERT_EQUAL(sal_Int32(204), sal_Int32(rColor.GetRed())); @@ -75,10 +81,16 @@ void BitmapTest::testConvert() #else CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt16>(24), pReadAccess->GetBitCount()); #if defined WNT - CPPUNIT_ASSERT_EQUAL(sal_uLong(32), pReadAccess->GetScanlineSize()); -#else - CPPUNIT_ASSERT_EQUAL(sal_uLong(30), pReadAccess->GetScanlineSize()); + if (!OpenGLHelper::isVCLOpenGLEnabled()) + { + // GDI Scanlines padded to DWORD multiples, it seems + CPPUNIT_ASSERT_EQUAL(sal_uLong(32), pReadAccess->GetScanlineSize()); + } + else #endif + { + CPPUNIT_ASSERT_EQUAL(sal_uLong(30), pReadAccess->GetScanlineSize()); + } #endif CPPUNIT_ASSERT(!pReadAccess->HasPalette()); Color aColor = pReadAccess->GetPixel(0, 0); |