File 0001-Raise-minimum-poppler-version-from-0.18-to... of Package cups-filters

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Raise-minimum-poppler-version-from-0.18-to-0.19.patch of Package cups-filters (Revision 68891116c77d2ab26a4cf1a46e8d2088)

Currently displaying revision 68891116c77d2ab26a4cf1a46e8d2088 , Show latest

From 81f2dd8ddd0f8a87504a4eb74716ce5f36527e09 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:47:56 +0100
Subject: [PATCH 1/4] Raise minimum poppler version from 0.18 to 0.19

The releases where 2011-09-27 respectively 2012-03-01, i.e. a timeframe of
5 months. Differences between the two versions are responsible for the
majority of version dependent code.

The code in oprs/OPVPSplashClip.cxx was a no-op starting with 0.19, so
it can be removed as well.
---
 configure.ac                              |   2 +-
 filter/PDFError.h                         |   4 -
 filter/pdftoijs.cxx                       |  22 --
 filter/pdftoopvp/OPVPError.h              |   4 -
 filter/pdftoopvp/OPVPOutputDev.cxx        |  55 ----
 filter/pdftoopvp/oprs/OPVPSplash.cxx      |  40 ---
 filter/pdftoopvp/oprs/OPVPSplashClip.cxx  |   5 -
 filter/pdftoopvp/oprs/OPVPSplashState.cxx |   2 -
 filter/pdftoopvp/oprs/OPVPSplashState.h   |   2 -
 filter/pdftoopvp/oprs/OPVPSplashXPath.cxx | 338 ----------------------
 filter/pdftoopvp/oprs/OPVPSplashXPath.h   |   7 -
 filter/pdftoopvp/pdftoopvp.cxx            |  18 --
 filter/pdftoraster.cxx                    |  22 --
 13 files changed, 1 insertion(+), 520 deletions(-)

diff --git a/configure.ac b/configure.ac
index bd9816cd..3fffecf9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -495,7 +495,7 @@ AC_ARG_ENABLE(poppler, AS_HELP_STRING([--enable-poppler],[enable Poppler-based f
 	      enable_poppler=$enableval,enable_poppler=yes)
 AM_CONDITIONAL(ENABLE_POPPLER, test x$enable_poppler = xyes)
 if test x$enable_poppler = xyes; then
-	PKG_CHECK_MODULES([POPPLER], [poppler >= 0.18])
+	PKG_CHECK_MODULES([POPPLER], [poppler >= 0.19])
 	AC_CHECK_HEADER([poppler/cpp/poppler-version.h], [AC_DEFINE([HAVE_CPP_POPPLER_VERSION_H],,[Define if you have Poppler's "cpp/poppler-version.h" header file.])], [])
 fi
 
diff --git a/filter/PDFError.h b/filter/PDFError.h
index 9fb58bcd..6167b5ab 100644
--- a/filter/PDFError.h
+++ b/filter/PDFError.h
@@ -35,10 +35,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "cpp/poppler-version.h"
 #endif
 
-#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
 #define pdfError(pos,...) error(errInternal,pos,__VA_ARGS__)
-#else
-#define pdfError(pos,...) error(pos,__VA_ARGS__)
-#endif
 
 #endif
diff --git a/filter/pdftoijs.cxx b/filter/pdftoijs.cxx
index 777a131f..4a93ef77 100644
--- a/filter/pdftoijs.cxx
+++ b/filter/pdftoijs.cxx
@@ -69,7 +69,6 @@ namespace {
   ppd_file_t *ppd = 0; // holds the memory for the strings
 }
 
-#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
 #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
 void CDECL myErrorFun(void *data, ErrorCategory category,
 #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 70
@@ -94,19 +93,6 @@ void CDECL myErrorFun(void *data, ErrorCategory category,
   fprintf(stderr, "%s\n",msg);
   fflush(stderr);
 }
-#else
-void CDECL myErrorFun(int pos, char *msg, va_list args)
-{
-  if (pos >= 0) {
-    fprintf(stderr, "ERROR (%d): ", pos);
-  } else {
-    fprintf(stderr, "ERROR: ");
-  }
-  vfprintf(stderr, msg, args);
-  fprintf(stderr, "\n");
-  fflush(stderr);
-}
-#endif
 
 /* parse  "300 400" */
 void parse_resolution(const char *str)
@@ -299,11 +285,7 @@ int main(int argc, char *argv[]) {
   int rowpad;
   bool reverseVideo;
 
-#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
   setErrorCallback(::myErrorFun,NULL);
-#else
-  setErrorFunction(::myErrorFun);
-#endif
   globalParams = new GlobalParams();
   parseOpts(argc, argv);
 
@@ -445,11 +427,7 @@ int main(int argc, char *argv[]) {
     ,false
 #endif
     );
-#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
   out->startDoc(doc);
-#else
-  out->startDoc(doc->getXRef());
-#endif
 
   snprintf(tmp,99,"%d",numChan);
   ijs_client_set_param(ctx,job_id,"NumChan",tmp,strlen(tmp));
diff --git a/filter/pdftoopvp/OPVPError.h b/filter/pdftoopvp/OPVPError.h
index 5f1b9a31..45509490 100644
--- a/filter/pdftoopvp/OPVPError.h
+++ b/filter/pdftoopvp/OPVPError.h
@@ -35,10 +35,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "cpp/poppler-version.h"
 #endif
 
-#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
 #define opvpError(pos,...) error(errInternal,pos,__VA_ARGS__)
-#else
-#define opvpError(pos,...) error(pos,__VA_ARGS__)
-#endif
 
 #endif
diff --git a/filter/pdftoopvp/OPVPOutputDev.cxx b/filter/pdftoopvp/OPVPOutputDev.cxx
index d9869796..e9a4dde5 100644
--- a/filter/pdftoopvp/OPVPOutputDev.cxx
+++ b/filter/pdftoopvp/OPVPOutputDev.cxx
@@ -505,11 +505,7 @@ void OPVPOutputDev::doUpdateFont(GfxState *state) {
   GooString *fileName;
   char *tmpBuf;
   int tmpBufLen;
-#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
   int *codeToGID;
-#else
-  Gushort *codeToGID;
-#endif
   double m11, m12, m21, m22;
   int n;
   int faceIndex = 0;
@@ -541,7 +537,6 @@ void OPVPOutputDev::doUpdateFont(GfxState *state) {
       if (! tmpBuf)
 	goto err2;
 
-#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
     } else {
       SysFontType sftype;
       fileName = globalParams->findSystemFontFile(gfxFont,&sftype,
@@ -563,34 +558,6 @@ void OPVPOutputDev::doUpdateFont(GfxState *state) {
 	break;
       }
     }
-#else
-    // if there is an external font file, use it
-    } else if (!(fileName = gfxFont->getExtFontFile())) {
-      DisplayFontParam *dfp;
-      // look for a display font mapping or a substitute font
-      dfp = NULL;
-      if (gfxFont->getName()) {
-        dfp = globalParams->getDisplayFont(gfxFont);
-      }
-      if (!dfp) {
-	opvpError(-1, "Couldn't find a font for '%s'",
-	      gfxFont->getName() ? gfxFont->getName()->getCString()
-	                         : "(unnamed)");
-	goto err2;
-      }
-      switch (dfp->kind) {
-      case displayFontT1:
-	fileName = dfp->t1.fileName;
-	fontType = gfxFont->isCIDFont() ? fontCIDType0 : fontType1;
-	break;
-      case displayFontTT:
-	fileName = dfp->tt.fileName;
-	fontType = gfxFont->isCIDFont() ? fontCIDType2 : fontTrueType;
-	faceIndex = dfp->tt.faceIndex;
-	break;
-      }
-    }
-#endif
 
     fontsrc = new SplashFontSrc;
     if (fileName)
@@ -604,9 +571,7 @@ void OPVPOutputDev::doUpdateFont(GfxState *state) {
       if (!(fontFile = fontEngine->loadType1Font(
 			   id,
 			   fontsrc,
-#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
                            (const char **)
-#endif
 			   ((Gfx8BitFont *)gfxFont)->getEncoding()))) {
 	opvpError(-1, "Couldn't create a font for '%s'",
 	      gfxFont->getName() ? gfxFont->getName()->getCString()
@@ -618,9 +583,7 @@ void OPVPOutputDev::doUpdateFont(GfxState *state) {
       if (!(fontFile = fontEngine->loadType1CFont(
 			   id,
 			   fontsrc,
-#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
                            (const char **)
-#endif
 			   ((Gfx8BitFont *)gfxFont)->getEncoding()))) {
 	opvpError(-1, "Couldn't create a font for '%s'",
 	      gfxFont->getName() ? gfxFont->getName()->getCString()
@@ -632,9 +595,7 @@ void OPVPOutputDev::doUpdateFont(GfxState *state) {
       if (!(fontFile = fontEngine->loadOpenTypeT1CFont(
 			   id,
 			   fontsrc,
-#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
                            (const char **)
-#endif
 			   ((Gfx8BitFont *)gfxFont)->getEncoding()))) {
 	opvpError(-1, "Couldn't create a font for '%s'",
 	      gfxFont->getName() ? gfxFont->getName()->getCString()
@@ -678,7 +639,6 @@ void OPVPOutputDev::doUpdateFont(GfxState *state) {
       }
       break;
     case fontCIDType0COT:
-#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
       n = ((GfxCIDFont *)gfxFont)->getCIDToGIDLen();
       if (n) {
         codeToGID = (int *)gmallocn(n, sizeof(int));
@@ -690,11 +650,6 @@ void OPVPOutputDev::doUpdateFont(GfxState *state) {
       if (!(fontFile = fontEngine->loadOpenTypeCFFFont(
 			   id,
 			   fontsrc,codeToGID,n))) {
-#else
-      if (!(fontFile = fontEngine->loadOpenTypeCFFFont(
-			   id,
-			   fontsrc))) {
-#endif
 	opvpError(-1, "Couldn't create a font for '%s'",
 	      gfxFont->getName() ? gfxFont->getName()->getCString()
 	                         : "(unnamed)");
@@ -708,15 +663,9 @@ void OPVPOutputDev::doUpdateFont(GfxState *state) {
       if (((GfxCIDFont *)gfxFont)->getCIDToGID()) {
 	n = ((GfxCIDFont *)gfxFont)->getCIDToGIDLen();
 	if (n) {
-#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
 	  codeToGID = (int *)gmallocn(n, sizeof(int));
 	  memcpy(codeToGID, ((GfxCIDFont *)gfxFont)->getCIDToGID(),
 		  n * sizeof(int));
-#else
-	  codeToGID = (Gushort *)gmallocn(n, sizeof(Gushort));
-	  memcpy(codeToGID, ((GfxCIDFont *)gfxFont)->getCIDToGID(),
-		  n * sizeof(Gushort));
-#endif
 	}
       } else {
 	if (fileName)
@@ -929,11 +878,7 @@ void OPVPOutputDev::clipToStrokePath(GfxState *state) {
   tsplash->setLineWidth(state->getTransformedLineWidth());
 
   path = convertPath(state, state->getPath());
-#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
   spath = tsplash->makeStrokePath(path,0);
-#else
-  spath = tsplash->makeStrokePath(path);
-#endif
   path2 = new OPVPSplashPath(spath);
   delete spath;
   delete path;
diff --git a/filter/pdftoopvp/oprs/OPVPSplash.cxx b/filter/pdftoopvp/oprs/OPVPSplash.cxx
index 396a7735..822f65fa 100644
--- a/filter/pdftoopvp/oprs/OPVPSplash.cxx
+++ b/filter/pdftoopvp/oprs/OPVPSplash.cxx
@@ -636,12 +636,8 @@ SplashError OPVPSplash::clipToPath(OPVPSplashPath *path, bool eo) {
                                      state->flatness, false);
 
       xpath->sort();
-#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
       SplashXPathScanner *scanner = new SplashXPathScanner(xpath,eo,
         INT_MIN,INT_MAX);
-#else
-      SplashXPathScanner *scanner = new SplashXPathScanner(xpath,eo);
-#endif
       scanner->getBBox(&xMin,&yMin,&xMax,&yMax);
       delete scanner;
       delete xpath;
@@ -864,7 +860,6 @@ void OPVPSplash::arcToCurve(SplashCoord x0, SplashCoord y0,
 
 SplashError OPVPSplash::strokeByMyself(OPVPSplashPath *path)
 {
-#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
   SplashPath *dPath;
   OPVPSplashPath *oPath;
   Splash *osplash;
@@ -898,37 +893,6 @@ SplashError OPVPSplash::strokeByMyself(OPVPSplashPath *path)
   }
   delete osplash;
   return splashOk;
-#else
-  OPVPSplashXPath *xPath, *xPath2;
-  SplashPattern *savedPattern;
-
-  /* draw dashed line by myself */
-  if (path->getLength() == 0) {
-    return splashOk;
-  }
-  xPath = new OPVPSplashXPath(path, state->matrix, state->flatness, false);
-  if (state->lineDash != NULL && state->lineDashLength > 0) {
-    xPath2 = xPath->makeDashedPath(state);
-    delete xPath;
-    xPath = xPath2;
-  }
-
-  if (state->lineWidth <= 1) {
-    xPath->strokeNarrow(this,state);
-  } else {
-    /* change fill pattern temprarily */
-    savedPattern = state->fillPattern->copy();
-    setFillPattern(state->strokePattern->copy());
-
-    xPath->strokeWide(this,state);
-
-    /* restore fill pattern */
-    setFillPattern(savedPattern);
-  }
-
-  delete xPath;
-  return splashOk;
-#endif
 }
 
 SplashError OPVPSplash::stroke(OPVPSplashPath *path) {
@@ -987,11 +951,7 @@ SplashError OPVPSplash::fillByMyself(OPVPSplashPath *path, bool eo)
   }
   xPath = new OPVPSplashXPath(path, state->matrix, state->flatness, true);
   xPath->sort();
-#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
   scanner = new SplashXPathScanner(xPath, eo, INT_MIN, INT_MAX);
-#else
-  scanner = new SplashXPathScanner(xPath, eo);
-#endif
 
   // get the min and max x and y values
   scanner->getBBox(&xMinI, &yMinI, &xMaxI, &yMaxI);
diff --git a/filter/pdftoopvp/oprs/OPVPSplashClip.cxx b/filter/pdftoopvp/oprs/OPVPSplashClip.cxx
index c9d2e834..bb6150bc 100644
--- a/filter/pdftoopvp/oprs/OPVPSplashClip.cxx
+++ b/filter/pdftoopvp/oprs/OPVPSplashClip.cxx
@@ -27,7 +27,6 @@ OPVPSplashPath *OPVPSplashClip::makePath()
   int i,j;
   int y, x0, x1;
   int txMin, tyMin, txMax, tyMax;
-  int tsxMin, tsyMin, tsxMax, tsyMax;
   Guchar *cbuf,*tbuf;
   int blen;
   OPVPSplashPath *p = new OPVPSplashPath();
@@ -37,10 +36,6 @@ OPVPSplashPath *OPVPSplashClip::makePath()
   blen = txMax-txMin+1;
   cbuf = new Guchar[blen];
   tbuf = new Guchar[blen];
-  
-  /* dummy call to clear state */
-  scanners[0]->getBBox(&tsxMin,&tsyMin,&tsxMax,&tsyMax);
-  scanners[0]->getNextSpan(tsyMin-2,&x0,&x1);
 
   for (y = tyMin;y <= tyMax;y++) {
     /* clear buffer */
diff --git a/filter/pdftoopvp/oprs/OPVPSplashState.cxx b/filter/pdftoopvp/oprs/OPVPSplashState.cxx
index 62351fa7..f5ba7059 100644
--- a/filter/pdftoopvp/oprs/OPVPSplashState.cxx
+++ b/filter/pdftoopvp/oprs/OPVPSplashState.cxx
@@ -129,7 +129,6 @@ OPVPSplashState::~OPVPSplashState() {
   }
 }
 
-#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
 void OPVPSplashState::setState(Splash *osplash) {
   osplash->setMatrix(matrix);
   osplash->setFlatness(flatness);
@@ -139,7 +138,6 @@ void OPVPSplashState::setState(Splash *osplash) {
   osplash->setMiterLimit(miterLimit);
   osplash->setLineJoin(lineJoin);
 }
-#endif
 
 void OPVPSplashState::setStrokePattern(SplashPattern *strokePatternA) {
   delete strokePattern;
diff --git a/filter/pdftoopvp/oprs/OPVPSplashState.h b/filter/pdftoopvp/oprs/OPVPSplashState.h
index b40aaf46..dc91e51b 100644
--- a/filter/pdftoopvp/oprs/OPVPSplashState.h
+++ b/filter/pdftoopvp/oprs/OPVPSplashState.h
@@ -41,9 +41,7 @@ public:
 
   ~OPVPSplashState();
 
-#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
   void setState(Splash *osplash);
-#endif
 
   // Set the stroke pattern.  This does not copy <strokePatternA>.
   void setStrokePattern(SplashPattern *strokePatternA);
diff --git a/filter/pdftoopvp/oprs/OPVPSplashXPath.cxx b/filter/pdftoopvp/oprs/OPVPSplashXPath.cxx
index 924fe9fa..53ca21d0 100644
--- a/filter/pdftoopvp/oprs/OPVPSplashXPath.cxx
+++ b/filter/pdftoopvp/oprs/OPVPSplashXPath.cxx
@@ -10,344 +10,6 @@
 #include "OPVPWrapper.h"
 #include "OPVPSplash.h"
 
-#if POPPLER_VERSION_MAJOR <= 0 && POPPLER_VERSION_MINOR < 19
-OPVPSplashXPath *OPVPSplashXPath::makeDashedPath(OPVPSplashState *state)
-{
-  OPVPSplashXPath *dPath;
-  bool lineDashStartOn, lineDashOn;
-  bool atSegStart, atSegEnd, atDashStart, atDashEnd;
-  int lineDashStartIdx, lineDashIdx, subpathStart;
-  SplashCoord lineDashTotal, lineDashStartPhase, lineDashDist;
-  int segIdx;
-  SplashXPathSeg *seg;
-  SplashCoord sx0, sy0, sx1, sy1, ax0, ay0, ax1, ay1, dist;
-  int i;
-
-  dPath = new OPVPSplashXPath();
-
-  lineDashTotal = 0;
-  for (i = 0; i < state->lineDashLength; ++i) {
-    lineDashTotal += state->lineDash[i];
-  }
-  lineDashStartPhase = state->lineDashPhase;
-  i = splashFloor(lineDashStartPhase / lineDashTotal);
-  lineDashStartPhase -= i * lineDashTotal;
-  lineDashStartOn = true;
-  lineDashStartIdx = 0;
-  while (lineDashStartPhase >= state->lineDash[lineDashStartIdx]) {
-    lineDashStartOn = !lineDashStartOn;
-    lineDashStartPhase -= state->lineDash[lineDashStartIdx];
-    ++lineDashStartIdx;
-  }
-
-  segIdx = 0;
-  seg = segs;
-  sx0 = seg->x0;
-  sy0 = seg->y0;
-  sx1 = seg->x1;
-  sy1 = seg->y1;
-  dist = splashDist(sx0, sy0, sx1, sy1);
-  lineDashOn = lineDashStartOn;
-  lineDashIdx = lineDashStartIdx;
-  lineDashDist = state->lineDash[lineDashIdx] - lineDashStartPhase;
-  atSegStart = true;
-  atDashStart = true;
-  subpathStart = dPath->length;
-
-  while (segIdx < length) {
-
-    ax0 = sx0;
-    ay0 = sy0;
-    if (dist <= lineDashDist) {
-      ax1 = sx1;
-      ay1 = sy1;
-      lineDashDist -= dist;
-      dist = 0;
-      atSegEnd = true;
-      atDashEnd = lineDashDist == 0 || (seg->flags & splashXPathLast);
-    } else {
-      ax1 = sx0 + (lineDashDist / dist) * (sx1 - sx0);
-      ay1 = sy0 + (lineDashDist / dist) * (sy1 - sy0);
-      sx0 = ax1;
-      sy0 = ay1;
-      dist -= lineDashDist;
-      lineDashDist = 0;
-      atSegEnd = false;
-      atDashEnd = true;
-    }
-
-    if (lineDashOn) {
-      dPath->addSegment(ax0, ay0, ax1, ay1,
-			atDashStart, atDashEnd,
-			atDashStart, atDashEnd);
-      // end of closed subpath
-      if (atSegEnd &&
-	  (seg->flags & splashXPathLast) &&
-	  !(seg->flags & splashXPathEnd1)) {
-	dPath->segs[subpathStart].flags &= ~splashXPathEnd0;
-	dPath->segs[dPath->length - 1].flags &= ~splashXPathEnd1;
-      }
-    }
-
-    if (atDashEnd) {
-      lineDashOn = !lineDashOn;
-      if (++lineDashIdx == state->lineDashLength) {
-	lineDashIdx = 0;
-      }
-      lineDashDist = state->lineDash[lineDashIdx];
-      atDashStart = true;
-    } else {
-      atDashStart = false;
-    }
-    if (atSegEnd) {
-      if (++segIdx < length) {
-	++seg;
-	sx0 = seg->x0;
-	sy0 = seg->y0;
-	sx1 = seg->x1;
-	sy1 = seg->y1;
-	dist = splashDist(sx0, sy0, sx1, sy1);
-	if (seg->flags & splashXPathFirst) {
-	  lineDashOn = lineDashStartOn;
-	  lineDashIdx = lineDashStartIdx;
-	  lineDashDist = state->lineDash[lineDashIdx] - lineDashStartPhase;
-	  atDashStart = true;
-	  subpathStart = dPath->length;
-	}
-      }
-      atSegStart = true;
-    } else {
-      atSegStart = false;
-    }
-  }
-
-  return dPath;
-}
-
-void OPVPSplashXPath::strokeWide(OPVPSplash *splash, OPVPSplashState *state)
-{
-  SplashXPathSeg *seg, *seg2;
-  OPVPSplashPath *widePath;
-  SplashCoord d, dx, dy, wdx, wdy, dxPrev, dyPrev, wdxPrev, wdyPrev;
-  SplashCoord dotprod, miter;
-  SplashCoord x0,y0,x1,y1,x2,y2,x3,y3;
-  int i, j;
-
-  dx = dy = wdx = wdy = 0; // make gcc happy
-  dxPrev = dyPrev = wdxPrev = wdyPrev = 0; // make gcc happy
-
-  for (i = 0, seg = segs; i < length; ++i, ++seg) {
-
-    // save the deltas for the previous segment; if this is the first
-    // segment on a subpath, compute the deltas for the last segment
-    // on the subpath (which may be used to draw a line join)
-    if (seg->flags & splashXPathFirst) {
-      for (j = i + 1, seg2 = &segs[j];
-          j < length; ++j, ++seg2) {
-	if (seg2->flags & splashXPathLast) {
-	  d = splashDist(seg2->x0, seg2->y0, seg2->x1, seg2->y1);
-	  if (d == 0) {
-	    //~ not clear what the behavior should be for joins with d==0
-	    dxPrev = 0;
-	    dyPrev = 1;
-	  } else {
-	    d = 1 / d;
-	    dxPrev = d * (seg2->x1 - seg2->x0);
-	    dyPrev = d * (seg2->y1 - seg2->y0);
-	  }
-	  wdxPrev = 0.5 * state->lineWidth * dxPrev;
-	  wdyPrev = 0.5 * state->lineWidth * dyPrev;
-	  break;
-	}
-      }
-    } else {
-      dxPrev = dx;
-      dyPrev = dy;
-      wdxPrev = wdx;
-      wdyPrev = wdy;
-    }
-
-    // compute deltas for this line segment
-    d = splashDist(seg->x0, seg->y0, seg->x1, seg->y1);
-    if (d == 0) {
-      // we need to draw end caps on zero-length lines
-      //~ not clear what the behavior should be for splashLineCapButt with d==0
-      dx = 0;
-      dy = 1;
-    } else {
-      d = 1 / d;
-      dx = d * (seg->x1 - seg->x0);
-      dy = d * (seg->y1 - seg->y0);
-    }
-    wdx = 0.5 * state->lineWidth * dx;
-    wdy = 0.5 * state->lineWidth * dy;
-
-    // initialize the path (which will be filled)
-    widePath = new OPVPSplashPath();
-    widePath->moveTo(seg->x0 - wdy, seg->y0 + wdx);
-
-    // draw the start cap
-    if (seg->flags & splashXPathEnd0) {
-      switch (state->lineCap) {
-      case splashLineCapButt:
-	widePath->lineTo(seg->x0 + wdy, seg->y0 - wdx);
-	break;
-      case splashLineCapRound:
-	x0 = seg->x0 - wdy;
-	y0 = seg->y0 + wdx;
-	x3 = seg->x0 - wdx;
-	y3 = seg->y0 - wdy;
-	splash->arcToCurve(x0, y0, x3, y3,
-	  seg->x0, seg->y0, &x1,&y1,&x2,&y2);
-	widePath->curveTo(x2,y2,x1,y1,x3,y3);
-	x0 = x3;
-	y0 = y3;
-	x3 = seg->x0 + wdy;
-	y3 = seg->y0 - wdx;
-	splash->arcToCurve(x0,y0,x3,y3,
-	  seg->x0, seg->y0, &x1,&y1,&x2,&y2);
-	widePath->curveTo(x2,y2,x1,y1,x3,y3);
-	break;
-      case splashLineCapProjecting:
-	widePath->lineTo(seg->x0 - wdx - wdy, seg->y0 + wdx - wdy);
-	widePath->lineTo(seg->x0 - wdx + wdy, seg->y0 - wdx - wdy);
-	widePath->lineTo(seg->x0 + wdy, seg->y0 - wdx);
-	break;
-      }
-    } else {
-      widePath->lineTo(seg->x0 + wdy, seg->y0 - wdx);
-    }
-
-    // draw the left side of the segment
-    widePath->lineTo(seg->x1 + wdy, seg->y1 - wdx);
-
-    // draw the end cap
-    if (seg->flags & splashXPathEnd1) {
-      switch (state->lineCap) {
-      case splashLineCapButt:
-	widePath->lineTo(seg->x1 - wdy, seg->y1 + wdx);
-	break;
-      case splashLineCapRound:
-	x0 = seg->x1 + wdy;
-	y0 = seg->y1 - wdx;
-	x3 = seg->x1 + wdx;
-	y3 = seg->y1 + wdy;
-	splash->arcToCurve(x0, y0, x3, y3,
-	  seg->x1, seg->y1, &x1,&y1,&x2,&y2);
-	widePath->curveTo(x2,y2,x1,y1,x3,y3);
-	x0 = x3;
-	y0 = y3;
-	x3 = seg->x1 - wdy;
-	y3 = seg->y1 + wdx;
-	splash->arcToCurve(x0,y0,x3,y3,
-	  seg->x1, seg->y1, &x1,&y1,&x2,&y2);
-	widePath->curveTo(x2,y2,x1,y1,x3,y3);
-	break;
-      case splashLineCapProjecting:
-	widePath->lineTo(seg->x1 + wdx + wdy, seg->y1 - wdx + wdy);
-	widePath->lineTo(seg->x1 + wdx - wdy, seg->y1 + wdx + wdy);
-	widePath->lineTo(seg->x1 - wdy, seg->y1 + wdx);
-	break;
-      }
-    } else {
-      widePath->lineTo(seg->x1 - wdy, seg->y1 + wdx);
-    }
-
-    // draw the right side of the segment
-    widePath->lineTo(seg->x0 - wdy, seg->y0 + wdx);
-
-    // fill the segment
-    splash->fill(widePath, true);
-    delete widePath;
-
-    // draw the line join
-    if (!(seg->flags & splashXPathEnd0)) {
-      widePath = NULL;
-      switch (state->lineJoin) {
-      case splashLineJoinMiter:
-	dotprod = -(dx * dxPrev + dy * dyPrev);
-	if (dotprod != 1) {
-	  widePath = new OPVPSplashPath();
-	  widePath->moveTo(seg->x0, seg->y0);
-	  miter = 2 / (1 - dotprod);
-	  if (splashSqrt(miter) <= state->miterLimit) {
-	    miter = splashSqrt(miter - 1);
-	    if (dy * dxPrev > dx * dyPrev) {
-	      widePath->lineTo(seg->x0 + wdyPrev, seg->y0 - wdxPrev);
-	      widePath->lineTo(seg->x0 + wdy - miter * wdx,
-			       seg->y0 - wdx - miter * wdy);
-	      widePath->lineTo(seg->x0 + wdy, seg->y0 - wdx);
-	    } else {
-	      widePath->lineTo(seg->x0 - wdyPrev, seg->y0 + wdxPrev);
-	      widePath->lineTo(seg->x0 - wdy - miter * wdx,
-			       seg->y0 + wdx - miter * wdy);
-	      widePath->lineTo(seg->x0 - wdy, seg->y0 + wdx);
-	    }
-	  } else {
-	    if (dy * dxPrev > dx * dyPrev) {
-	      widePath->lineTo(seg->x0 + wdyPrev, seg->y0 - wdxPrev);
-	      widePath->lineTo(seg->x0 + wdy, seg->y0 - wdx);
-	    } else {
-	      widePath->lineTo(seg->x0 - wdyPrev, seg->y0 + wdxPrev);
-	      widePath->lineTo(seg->x0 - wdy, seg->y0 + wdx);
-	    }
-	  }
-	}
-	break;
-      case splashLineJoinRound:
-	widePath = new OPVPSplashPath();
-	/* draw circle */
-	widePath->moveTo(seg->x0 + wdy, seg->y0 - wdx);
-	x0 = seg->x0 + wdy;
-	y0 = seg->y0 - wdx;
-	x3 = seg->x0 - wdx;
-	y3 = seg->y0 - wdy;
-	splash->arcToCurve(x0, y0, x3, y3,
-	  seg->x0, seg->y0, &x1,&y1,&x2,&y2);
-	widePath->curveTo(x1,y1,x2,y2,x3,y3);
-	x0 = x3;
-	y0 = y3;
-	x3 = seg->x0 - wdy;
-	y3 = seg->y0 + wdx;
-	splash->arcToCurve(x0, y0, x3, y3,
-	  seg->x0, seg->y0, &x1,&y1,&x2,&y2);
-	widePath->curveTo(x1,y1,x2,y2,x3,y3);
-	x0 = x3;
-	y0 = y3;
-	x3 = seg->x0 + wdx;
-	y3 = seg->y0 + wdy;
-	splash->arcToCurve(x0, y0, x3, y3,
-	  seg->x0, seg->y0, &x1,&y1,&x2,&y2);
-	widePath->curveTo(x1,y1,x2,y2,x3,y3);
-	x0 = x3;
-	y0 = y3;
-	x3 = seg->x0 + wdy;
-	y3 = seg->y0 - wdx;
-	splash->arcToCurve(x0, y0, x3, y3,
-	  seg->x0, seg->y0, &x1,&y1,&x2,&y2);
-	widePath->curveTo(x1,y1,x2,y2,x3,y3);
-	break;
-      case splashLineJoinBevel:
-	widePath = new OPVPSplashPath();
-	widePath->moveTo(seg->x0, seg->y0);
-	if (dy * dxPrev > dx * dyPrev) {
-	  widePath->lineTo(seg->x0 + wdyPrev, seg->y0 - wdxPrev);
-	  widePath->lineTo(seg->x0 + wdy, seg->y0 - wdx);
-	} else {
-	  widePath->lineTo(seg->x0 - wdyPrev, seg->y0 + wdxPrev);
-	  widePath->lineTo(seg->x0 - wdy, seg->y0 + wdx);
-	}
-	break;
-      }
-      if (widePath) {
-	splash->fill(widePath, true);
-	delete widePath;
-      }
-    }
-  }
-}
-#endif
-
 void OPVPSplashXPath::strokeNarrow(OPVPSplash *splash, OPVPSplashState *state)
 {
   SplashXPathSeg *seg;
diff --git a/filter/pdftoopvp/oprs/OPVPSplashXPath.h b/filter/pdftoopvp/oprs/OPVPSplashXPath.h
index c80243ae..2a07782c 100644
--- a/filter/pdftoopvp/oprs/OPVPSplashXPath.h
+++ b/filter/pdftoopvp/oprs/OPVPSplashXPath.h
@@ -23,15 +23,8 @@ public:
 
   OPVPSplashXPath *makeDashedPath(OPVPSplashState *state);
   void strokeNarrow(OPVPSplash *splash, OPVPSplashState *state);
-#if POPPLER_VERSION_MAJOR <= 0 && POPPLER_VERSION_MINOR < 19
-  void strokeWide(OPVPSplash *splash, OPVPSplashState *state);
-#endif
 private:
-#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
   OPVPSplashXPath() : SplashXPath(new SplashPath(), 0, 0, false) {};
-#else
-  OPVPSplashXPath() {};
-#endif
   OPVPSplashXPath(OPVPSplashXPath *xPath) : SplashXPath(xPath) {
   }
 };
diff --git a/filter/pdftoopvp/pdftoopvp.cxx b/filter/pdftoopvp/pdftoopvp.cxx
index 867d4070..65aca4d8 100644
--- a/filter/pdftoopvp/pdftoopvp.cxx
+++ b/filter/pdftoopvp/pdftoopvp.cxx
@@ -111,7 +111,6 @@ static int outOnePage(PDFDoc *doc, OPVPOutputDev *opvpOut, int pg)
 
 #define MAX_OPVP_OPTIONS 20
 
-#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
 #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
 void CDECL myErrorFun(void *data, ErrorCategory category,
 #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 70
@@ -136,19 +135,6 @@ void CDECL myErrorFun(void *data, ErrorCategory category,
   fprintf(stderr, "%s\n",msg);
   fflush(stderr);
 }
-#else
-void CDECL myErrorFun(int pos, char *msg, va_list args)
-{
-  if (pos >= 0) {
-    fprintf(stderr, "ERROR (%d): ", pos);
-  } else {
-    fprintf(stderr, "ERROR: ");
-  }
-  vfprintf(stderr, msg, args);
-  fprintf(stderr, "\n");
-  fflush(stderr);
-}
-#endif
 
 static bool getColorProfilePath(ppd_file_t *ppd, GooString *path)
 {
@@ -254,11 +240,7 @@ int main(int argc, char *argv[]) {
   GooString colorProfilePath("opvp.icc");
 
   exitCode = 99;
-#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
   setErrorCallback(::myErrorFun,NULL);
-#else
-  setErrorFunction(::myErrorFun);
-#endif
 
   // parse args
   int num_options;
diff --git a/filter/pdftoraster.cxx b/filter/pdftoraster.cxx
index 13229e19..ee8b6ce6 100644
--- a/filter/pdftoraster.cxx
+++ b/filter/pdftoraster.cxx
@@ -280,7 +280,6 @@ cmsHPROFILE sgray_profile()
     return sgray;
 }
 
-#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
 #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
 void CDECL myErrorFun(void *data, ErrorCategory category,
 #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 70
@@ -305,19 +304,6 @@ void CDECL myErrorFun(void *data, ErrorCategory category,
   fprintf(stderr, "%s\n",msg);
   fflush(stderr);
 }
-#else
-void CDECL myErrorFun(int pos, char *msg, va_list args)
-{
-  if (pos >= 0) {
-    fprintf(stderr, "ERROR (%d): ", pos);
-  } else {
-    fprintf(stderr, "ERROR: ");
-  }
-  vfprintf(stderr, msg, args);
-  fprintf(stderr, "\n");
-  fflush(stderr);
-}
-#endif
 
 #ifdef USE_LCMS1
 static int lcmsErrorHandler(int ErrorCode, const char *ErrorText)
@@ -1970,11 +1956,7 @@ int main(int argc, char *argv[]) {
   int rowpad;
   Catalog *catalog;
 
-#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
   setErrorCallback(::myErrorFun,NULL);
-#else
-  setErrorFunction(::myErrorFun);
-#endif
   cmsSetLogErrorHandler(lcmsErrorHandler);
   globalParams = new GlobalParams();
   parseOpts(argc, argv);
@@ -2133,11 +2115,7 @@ int main(int argc, char *argv[]) {
     ,false
 #endif
     );
-#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
   out->startDoc(doc);
-#else
-  out->startDoc(doc->getXRef());
-#endif
 
   if ((raster = cupsRasterOpen(1, pwgraster ? CUPS_RASTER_WRITE_PWG :
 			       CUPS_RASTER_WRITE)) == 0) {
-- 
2.20.1

Places

File 0001-Raise-minimum-poppler-version-from-0.18-to-0.19.patch of Package cups-filters (Revision 68891116c77d2ab26a4cf1a46e8d2088)

Places