ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

fix incorrect Skia scanline test in vcl_bitmap_test

Browse Source 
Change-Id: Ia485601a08e2c0093e802c175041b76f94cbbb63
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87848
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
This commit is contained in:
Luboš Luňák
2020-02-03 12:48:26 +01:00
parent 4a9ef85e65
commit 56a89f4755
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vcl/qa/cppunit/BitmapTest.cxx
+9 -7
View File
@@ -378,22 +378,24 @@ void BitmapTest::testConvert()
// 24 bit Bitmap on SVP backend can now use 24bit RGB everywhere.
CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt16>(24), pReadAccess->GetBitCount());
#if defined LINUX || defined FREEBSD
if (SkiaHelper::isVCLSkiaEnabled()) // aligned to 4 bytes
CPPUNIT_ASSERT_EQUAL(sal_uInt32(32), pReadAccess->GetScanlineSize());
else
#if HAVE_FEATURE_OPENGL
if (OpenGLHelper::isVCLOpenGLEnabled())
if (OpenGLHelper::isVCLOpenGLEnabled())
CPPUNIT_ASSERT_EQUAL(sal_uInt32(30), pReadAccess->GetScanlineSize());
else
#endif
#if defined LINUX || defined FREEBSD
{
CPPUNIT_ASSERT_EQUAL(sal_uInt32(32), pReadAccess->GetScanlineSize());
#else
#if defined(_WIN32)
if (!OpenGLHelper::isVCLOpenGLEnabled())
}
#elif defined(_WIN32)
{
// GDI Scanlines padded to DWORD multiples, it seems
CPPUNIT_ASSERT_EQUAL(sal_uInt32(32), pReadAccess->GetScanlineSize());
}
else
#endif
#else
{
CPPUNIT_ASSERT_EQUAL(sal_uInt32(30), pReadAccess->GetScanlineSize());
}