diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2019-09-20 14:45:36 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2019-11-27 09:55:05 +0100 |
| commit | 886e5d2701c8d1f08c612eb3f093027fc590c508 (patch) | |
| tree | e9d8d47e441e78ebedda2bbc45e648f69f2c6b56 /vcl/qa | |
| parent | 1e9fae677579b59ddbc4cd69e201b95f51b8c742 (diff) | |
basic functional implementation of Skia SalBmp
Not complete but can pass basic tests.
Change-Id: I8e81c44554663a99cd4b262e37f4841ba0687cf1
Diffstat (limited to 'vcl/qa')
| -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 4136dce65c01..45af13a2b79f 100644 --- a/vcl/qa/cppunit/BitmapTest.cxx +++ b/vcl/qa/cppunit/BitmapTest.cxx @@ -23,6 +23,7 @@ #if HAVE_FEATURE_OPENGL #include <vcl/opengl/OpenGLHelper.hxx> #endif +#include <vcl/skia/SkiaHelper.hxx> #include <vcl/BitmapMonochromeFilter.hxx> #include <bitmapwriteaccess.hxx> @@ -358,8 +359,9 @@ void BitmapTest::testConvert() #else #if HAVE_FEATURE_OPENGL if (!OpenGLHelper::isVCLOpenGLEnabled()) - CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt32>(12), pReadAccess->GetScanlineSize()); #endif + if (!SkiaHelper::isVCLSkiaEnabled()) + CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt32>(12), pReadAccess->GetScanlineSize()); #endif CPPUNIT_ASSERT(pReadAccess->HasPalette()); const BitmapColor& rColor = pReadAccess->GetPaletteColor(pReadAccess->GetPixelIndex(1, 1)); @@ -382,6 +384,9 @@ void BitmapTest::testConvert() CPPUNIT_ASSERT_EQUAL(sal_uInt32(30), pReadAccess->GetScanlineSize()); else #endif + if (SkiaHelper::isVCLSkiaEnabled()) + CPPUNIT_ASSERT_EQUAL(sal_uInt32(40), pReadAccess->GetScanlineSize()); + else CPPUNIT_ASSERT_EQUAL(sal_uInt32(32), pReadAccess->GetScanlineSize()); #else #if defined(_WIN32) |