File 0002-Adapt-code-for-SplashXPathScanner-state-ha... of Package cups-filters

Overview Repositories Revisions Requests Users Attributes Meta

File 0002-Adapt-code-for-SplashXPathScanner-state-handling-sin.patch of Package cups-filters (Revision 68891116c77d2ab26a4cf1a46e8d2088)

Currently displaying revision 68891116c77d2ab26a4cf1a46e8d2088 , Show latest

From 659bb523432b7c7095db235e8dddbf770266b6aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Fri, 28 Dec 2018 18:17:28 +0100
Subject: [PATCH 2/4] Adapt code for SplashXPathScanner state handling since
 poppler 0.70

The state for the scanline iteration is no longer part of the scanner,
but has been moved to a iterator helper class.
---
 filter/pdftoopvp/oprs/OPVPSplash.cxx     |  8 +++++++-
 filter/pdftoopvp/oprs/OPVPSplashClip.cxx | 21 +++++++++++++++++++--
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/filter/pdftoopvp/oprs/OPVPSplash.cxx b/filter/pdftoopvp/oprs/OPVPSplash.cxx
index 822f65fa..89b7d33a 100644
--- a/filter/pdftoopvp/oprs/OPVPSplash.cxx
+++ b/filter/pdftoopvp/oprs/OPVPSplash.cxx
@@ -966,7 +966,13 @@ SplashError OPVPSplash::fillByMyself(OPVPSplashPath *path, bool eo)
     setStrokePattern(state->fillPattern->copy());
 
     for (y = yMinI; y < yMaxI; ++y) {
-      while (scanner->getNextSpan(y, &x0, &x1)) {
+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 70
+      SplashXPathScanIterator iterator(*scanner, y);
+      while (iterator.getNextSpan(&x0, &x1))
+#else
+      while (scanner->getNextSpan(y, &x0, &x1))
+#endif
+      {
         if (x0 == x1) continue;
 	if (clipRes == splashClipAllInside) {
 	  drawSpan(x0, x1-1, y, true);
diff --git a/filter/pdftoopvp/oprs/OPVPSplashClip.cxx b/filter/pdftoopvp/oprs/OPVPSplashClip.cxx
index bb6150bc..d81fd3f6 100644
--- a/filter/pdftoopvp/oprs/OPVPSplashClip.cxx
+++ b/filter/pdftoopvp/oprs/OPVPSplashClip.cxx
@@ -1,4 +1,9 @@
 #include <config.h>
+
+#ifdef HAVE_CPP_POPPLER_VERSION_H
+#include "cpp/poppler-version.h"
+#endif
+
 #include "splash/SplashXPathScanner.h"
 #include "OPVPSplashClip.h"
 
@@ -42,7 +47,13 @@ OPVPSplashPath *OPVPSplashClip::makePath()
     for (i = 0;i < blen;i++) {
       cbuf[i] = 0;
     }
-    while (scanners[0]->getNextSpan(y,&x0,&x1)) {
+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 70
+    SplashXPathScanIterator iterator(*scanners[0], y);
+    while (iterator.getNextSpan(&x0, &x1))
+#else
+    while (scanners[0]->getNextSpan(y,&x0,&x1))
+#endif
+    {
       if (x0 < txMin) x0 = txMin;
       if (x1 > txMax) x1 = txMax;
       for (i = x0;i < x1;i++) {
@@ -54,7 +65,13 @@ OPVPSplashPath *OPVPSplashClip::makePath()
       for (i = 0;i < blen;i++) {
 	tbuf[i] = 0;
       }
-      while (scanners[j]->getNextSpan(y,&x0,&x1)) {
+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 70
+      SplashXPathScanIterator iterator2(*scanners[j], y);
+      while (iterator2.getNextSpan(&x0, &x1))
+#else
+      while (scanners[j]->getNextSpan(y,&x0,&x1))
+#endif
+      {
 	if (x0 < txMin) x0 = txMin;
 	if (x1 > txMax) x1 = txMax;
 	for (i = x0;i < x1;i++) {
-- 
2.20.1

Places

File 0002-Adapt-code-for-SplashXPathScanner-state-handling-sin.patch of Package cups-filters (Revision 68891116c77d2ab26a4cf1a46e8d2088)

Places