[Libreoffice-commits] core.git: Branch 'feature/skia' - 2 commits - vcl/qa

Sat Oct 12 18:17:38 UTC 2019

vcl/qa/cppunit/svm/svmtest.cxx |   19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

New commits:
commit 4ce9702cb8fdee22a71b4b6f231ae6600e51a1b3
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Sat Oct 12 20:15:29 2019 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Sat Oct 12 20:15:29 2019 +0200

    disable bitmap CRC checking in SvmTest::checkBitmap(Ex)s() for Skia
    
    The idea itself is broken, the CRC depends on the scaling algorithm
    and also on the exact internal layout (and if scanlines are rounded
    up, the CRC also depends on random bytes).
    
    Change-Id: I800be8553c7f2afce1a4c292cd61369cde0ba6c3

diff --git a/vcl/qa/cppunit/svm/svmtest.cxx b/vcl/qa/cppunit/svm/svmtest.cxx
index 5b2330a67805..e834f5b954f5 100644
--- a/vcl/qa/cppunit/svm/svmtest.cxx
+++ b/vcl/qa/cppunit/svm/svmtest.cxx
@@ -22,6 +22,7 @@
 #if HAVE_FEATURE_OPENGL
 #include <vcl/opengl/OpenGLHelper.hxx>
 #endif
+#include <vcl/skia/SkiaHelper.hxx>
 
 using namespace css;
 
@@ -914,6 +915,9 @@ void SvmTest::checkBitmaps(const GDIMetaFile& rMetaFile)
 {
     xmlDocPtr pDoc = dumpMeta(rMetaFile);
 
+    if (SkiaHelper::isVCLSkiaEnabled())
+        return; // TODO SKIA using CRCs is broken (the idea of it)
+
     OUString crc1 = "b8dee5da";
     OUString crc2 = "281fc589";
     OUString crc3 = "5e01ddcc";
@@ -979,6 +983,9 @@ void SvmTest::checkBitmapExs(const GDIMetaFile& rMetaFile)
 {
     xmlDocPtr pDoc = dumpMeta(rMetaFile);
 
+    if (SkiaHelper::isVCLSkiaEnabled())
+        return; // TODO SKIA using CRCs is broken (the idea of it)
+
     std::vector<OUString> aExpectedCRC;
 
 #if HAVE_FEATURE_OPENGL
commit 3bd2056d39bf3ab72dc485c3b83a6316040dcdcf
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Sat Oct 12 20:13:22 2019 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Sat Oct 12 20:13:22 2019 +0200

    also check rendering in SvmTest::testBitmaps()
    
    Just like it's done in SvmTest::testBitmapExs()
    
    Change-Id: If004853aa12987eae1857c69061bdca114384942

diff --git a/vcl/qa/cppunit/svm/svmtest.cxx b/vcl/qa/cppunit/svm/svmtest.cxx
index bdaaa06fdd8d..5b2330a67805 100644
--- a/vcl/qa/cppunit/svm/svmtest.cxx
+++ b/vcl/qa/cppunit/svm/svmtest.cxx
@@ -963,8 +963,16 @@ void SvmTest::testBitmaps()
     pVirtualDev->DrawBitmap(Point(1, 2), Size(3, 4), aBitmap2);
     pVirtualDev->DrawBitmap(Point(1, 2), Size(3, 4), Point(2, 1), Size(4, 3), aBitmap3);
 
-    checkBitmaps(writeAndReadStream(aGDIMetaFile));
-    checkBitmaps(readFile("bitmaps.svm"));
+    {
+        GDIMetaFile aReloadedGDIMetaFile = writeAndReadStream(aGDIMetaFile);
+        checkBitmaps(aReloadedGDIMetaFile);
+        checkRendering(pVirtualDev, aReloadedGDIMetaFile);
+    }
+    {
+        GDIMetaFile aFileGDIMetaFile = readFile("bitmaps.svm");
+        checkBitmaps(aFileGDIMetaFile);
+        checkRendering(pVirtualDev, aFileGDIMetaFile);
+    }
 }
 
 void SvmTest::checkBitmapExs(const GDIMetaFile& rMetaFile)
