poppler-0.82.patch

   1 From 20c3fc7cb4a4ec2a67642bd83ddb6e403488b0fe Mon Sep 17 00:00:00 2001
   2 From: Even Rouault <even.rouault@spatialys.com>
   3 Date: Tue, 22 Oct 2019 13:11:57 +0200
   4 Subject: [PATCH] PDF: fix build against Poppler 0.82.0dev
   5
   6 ---
   7  gdal/frmts/pdf/pdfdataset.cpp | 6 +++++-
   8  1 file changed, 5 insertions(+), 1 deletion(-)
   9
  10 diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/gdal/frmts/pdf/pdfdataset.cpp
  11 index 15537ca7fd7..8f944c40d30 100644
  12 --- a/gdal/frmts/pdf/pdfdataset.cpp
  13 +++ b/gdal/frmts/pdf/pdfdataset.cpp
  14 @@ -205,7 +205,11 @@ class GDALPDFOutputDev : public SplashOutputDev
  15          virtual void drawChar(GfxState *state, double x, double y,
  16                                double dx, double dy,
  17                                double originX, double originY,
  18 -                              CharCode code, int nBytes, Unicode *u, int uLen) override
  19 +                              CharCode code, int nBytes,
  20 +#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 82
  21 +                              const
  22 +#endif
  23 +                              Unicode *u, int uLen) override
  24          {
  25              if (bEnableText)
  26                  SplashOutputDev::drawChar(state, x, y, dx, dy,
  27 From 94daceefebd464858888ddc85170c1a8c4bd50d7 Mon Sep 17 00:00:00 2001
  28 From: Even Rouault <even.rouault@spatialys.com>
  29 Date: Sun, 29 Sep 2019 23:55:18 +0200
  30 Subject: [PATCH] PDF: fix build against Poppler 0.82.0dev
  31
  32 ---
  33  gdal/frmts/pdf/pdfdataset.cpp | 7 ++++++-
  34  1 file changed, 6 insertions(+), 1 deletion(-)
  35
  36 diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/gdal/frmts/pdf/pdfdataset.cpp
  37 index 3d68f92abe8..b3db5374227 100644
  38 --- a/gdal/frmts/pdf/pdfdataset.cpp
  39 +++ b/gdal/frmts/pdf/pdfdataset.cpp
  40 @@ -265,7 +265,12 @@ class GDALPDFOutputDev : public SplashOutputDev
  41
  42          virtual void drawImage(GfxState *state, Object *ref, Stream *str,
  43                                 int width, int height, GfxImageColorMap *colorMap,
  44 -                               GBool interpolate, int *maskColors, GBool inlineImg) override
  45 +                               GBool interpolate,
  46 +#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 82
  47 +                               const
  48 +#endif
  49 +                               int *maskColors,
  50 +                               GBool inlineImg) override
  51          {
  52              if (bEnableBitmap)
  53                  SplashOutputDev::drawImage(state, ref, str,