poppler-0.71.patch

   1 diff -ru libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper.orig/pdfioutdev_gpl.cxx libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
   2 --- libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper.orig/pdfioutdev_gpl.cxx      2018-11-01 20:43:55.802520387 +0000
   3 +++ libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx   2018-11-01 20:44:33.399286879 +0000
   4 @@ -514,7 +514,7 @@
   5  PDFOutDev::PDFOutDev( PDFDoc* pDoc ) :
   6      m_pDoc( pDoc ),
   7      m_aFontMap(),
   8 -    m_pUtf8Map( new UnicodeMap("UTF-8", gTrue, &mapUTF8) ),
   9 +    m_pUtf8Map( new UnicodeMap("UTF-8", true, &mapUTF8) ),
  10      m_bSkipImages(false)
  11  {
  12  }
  13 @@ -943,11 +943,11 @@
  14  }
  15
  16  void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str,
  17 -                              int width, int height, GBool invert,
  18 +                              int width, int height, bool invert,
  19  #if POPPLER_CHECK_VERSION(0, 12, 0)
  20 -                              GBool /*interpolate*/,
  21 +                              bool /*interpolate*/,
  22  #endif
  23 -                              GBool /*inlineImg*/ )
  24 +                              bool /*inlineImg*/ )
  25  {
  26      if (m_bSkipImages)
  27          return;
  28 @@ -976,9 +976,9 @@
  29  void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
  30                            int width, int height, GfxImageColorMap* colorMap,
  31  #if POPPLER_CHECK_VERSION(0, 12, 0)
  32 -                          GBool /*interpolate*/,
  33 +                          bool /*interpolate*/,
  34  #endif
  35 -                          int* maskColors, GBool /*inlineImg*/ )
  36 +                          int* maskColors, bool /*inlineImg*/ )
  37  {
  38      if (m_bSkipImages)
  39          return;
  40 @@ -1027,13 +1027,13 @@
  41                                  int width, int height,
  42                                  GfxImageColorMap* colorMap,
  43  #if POPPLER_CHECK_VERSION(0, 12, 0)
  44 -                                GBool /*interpolate*/,
  45 +                                bool /*interpolate*/,
  46  #endif
  47                                  Stream* maskStr,
  48                                  int maskWidth, int maskHeight,
  49 -                                GBool maskInvert
  50 +                                bool maskInvert
  51  #if POPPLER_CHECK_VERSION(0, 12, 0)
  52 -                                , GBool /*maskInterpolate*/
  53 +                                , bool /*maskInterpolate*/
  54  #endif
  55                                 )
  56  {
  57 @@ -1049,13 +1049,13 @@
  58                                      int width, int height,
  59                                      GfxImageColorMap* colorMap,
  60  #if POPPLER_CHECK_VERSION(0, 12, 0)
  61 -                                    GBool /*interpolate*/,
  62 +                                    bool /*interpolate*/,
  63  #endif
  64                                      Stream* maskStr,
  65                                      int maskWidth, int maskHeight,
  66                                      GfxImageColorMap* maskColorMap
  67  #if POPPLER_CHECK_VERSION(0, 12, 0)
  68 -                                    , GBool /*maskInterpolate*/
  69 +                                    , bool /*maskInterpolate*/
  70  #endif
  71                                     )
  72  {
  73 diff -ru libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper.orig/pdfioutdev_gpl.hxx libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
  74 --- libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper.orig/pdfioutdev_gpl.hxx      2018-11-01 20:43:55.802520387 +0000
  75 +++ libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx   2018-11-01 20:44:33.402620221 +0000
  76 @@ -151,17 +151,17 @@
  77
  78          // Does this device use upside-down coordinates?
  79          // (Upside-down means (0,0) is the top left corner of the page.)
  80 -        virtual GBool upsideDown() override { return gTrue; }
  81 +        virtual bool upsideDown() override { return true; }
  82
  83          // Does this device use drawChar() or drawString()?
  84 -        virtual GBool useDrawChar() override { return gTrue; }
  85 +        virtual bool useDrawChar() override { return true; }
  86
  87          // Does this device use beginType3Char/endType3Char?  Otherwise,
  88          // text in Type 3 fonts will be drawn with drawChar/drawString.
  89 -        virtual GBool interpretType3Chars() override { return gFalse; }
  90 +        virtual bool interpretType3Chars() override { return false; }
  91
  92          // Does this device need non-text content?
  93 -        virtual GBool needNonText() override { return gTrue; }
  94 +        virtual bool needNonText() override { return true; }
  95
  96          //----- initialization and control
  97
  98 @@ -237,40 +237,40 @@
  99
 100          //----- image drawing
 101          virtual void drawImageMask(GfxState *state, Object *ref, Stream *str,
 102 -                                   int width, int height, GBool invert,
 103 +                                   int width, int height, bool invert,
 104  #if POPPLER_CHECK_VERSION(0, 12, 0)
 105 -                                   GBool interpolate,
 106 +                                   bool interpolate,
 107  #endif
 108 -                                   GBool inlineImg) override;
 109 +                                   bool inlineImg) override;
 110          virtual void drawImage(GfxState *state, Object *ref, Stream *str,
 111                                 int width, int height, GfxImageColorMap *colorMap,
 112  #if POPPLER_CHECK_VERSION(0, 12, 0)
 113 -                               GBool interpolate,
 114 +                               bool interpolate,
 115  #endif
 116 -                               int *maskColors, GBool inlineImg) override;
 117 +                               int *maskColors, bool inlineImg) override;
 118          virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str,
 119                                       int width, int height,
 120                                       GfxImageColorMap *colorMap,
 121  #if POPPLER_CHECK_VERSION(0, 12, 0)
 122 -                                     GBool interpolate,
 123 +                                     bool interpolate,
 124  #endif
 125                                       Stream *maskStr, int maskWidth, int maskHeight,
 126 -                                     GBool maskInvert
 127 +                                     bool maskInvert
 128  #if POPPLER_CHECK_VERSION(0, 12, 0)
 129 -                                     , GBool maskInterpolate
 130 +                                     , bool maskInterpolate
 131  #endif
 132                                      ) override;
 133          virtual void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
 134                                           int width, int height,
 135                                           GfxImageColorMap *colorMap,
 136  #if POPPLER_CHECK_VERSION(0, 12, 0)
 137 -                                         GBool interpolate,
 138 +                                         bool interpolate,
 139  #endif
 140                                           Stream *maskStr,
 141                                           int maskWidth, int maskHeight,
 142                                           GfxImageColorMap *maskColorMap
 143  #if POPPLER_CHECK_VERSION(0, 12, 0)
 144 -                                         , GBool maskInterpolate
 145 +                                         , bool maskInterpolate
 146  #endif
 147                                          ) override;
 148
 149 diff -ru libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper.orig/wrapper_gpl.cxx libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
 150 --- libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper.orig/wrapper_gpl.cxx 2018-11-01 20:43:55.802520387 +0000
 151 +++ libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx      2018-11-01 20:44:33.402620221 +0000
 152 @@ -69,7 +69,7 @@
 153
 154      // read config file
 155      globalParams = new GlobalParams();
 156 -    globalParams->setErrQuiet(gTrue);
 157 +    globalParams->setErrQuiet(true);
 158  #if defined(_MSC_VER)
 159      globalParams->setupBaseFonts(nullptr);
 160  #endif
 161 @@ -143,7 +143,7 @@
 162                  i,
 163                  PDFI_OUTDEV_RESOLUTION,
 164                  PDFI_OUTDEV_RESOLUTION,
 165 -                0, gTrue, gTrue, gTrue);
 166 +                0, true, true, true);
 167          rDoc.processLinks(&aOutDev, i);
 168      }
 169