diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-23 09:43:46 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-23 12:32:05 +0200 |
| commit | 1688a395d05125b83eac6cd5c43f0e3f2f66c491 (patch) | |
| tree | 5af675f3062ac7ab46817ec7708fc08f558ca10d /sdext/source | |
| parent | bdb10815a6003052417421e2b1eb1faf61f52931 (diff) | |
remove old poppler compat code
since we require poppler >= 0.12.0
Change-Id: Ie698ecbe776d12ef21ba8f12ac4dfa0575ed467b
Reviewed-on: https://gerrit.libreoffice.org/62223
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sdext/source')
| -rw-r--r-- | sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 12 | ||||
| -rw-r--r-- | sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 12 |
2 files changed, 0 insertions, 24 deletions
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index 261e680a778f..575a90acb094 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -940,9 +940,7 @@ void PDFOutDev::endTextObject(GfxState*) void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str, int width, int height, GBool invert, -#if POPPLER_CHECK_VERSION(0, 12, 0) GBool /*interpolate*/, -#endif GBool /*inlineImg*/ ) { if (m_bSkipImages) @@ -971,9 +969,7 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str, void PDFOutDev::drawImage(GfxState*, Object*, Stream* str, int width, int height, GfxImageColorMap* colorMap, -#if POPPLER_CHECK_VERSION(0, 12, 0) GBool /*interpolate*/, -#endif int* maskColors, GBool /*inlineImg*/ ) { if (m_bSkipImages) @@ -1022,15 +1018,11 @@ void PDFOutDev::drawImage(GfxState*, Object*, Stream* str, void PDFOutDev::drawMaskedImage(GfxState*, Object*, Stream* str, int width, int height, GfxImageColorMap* colorMap, -#if POPPLER_CHECK_VERSION(0, 12, 0) GBool /*interpolate*/, -#endif Stream* maskStr, int maskWidth, int maskHeight, GBool maskInvert -#if POPPLER_CHECK_VERSION(0, 12, 0) , GBool /*maskInterpolate*/ -#endif ) { if (m_bSkipImages) @@ -1044,15 +1036,11 @@ void PDFOutDev::drawMaskedImage(GfxState*, Object*, Stream* str, void PDFOutDev::drawSoftMaskedImage(GfxState*, Object*, Stream* str, int width, int height, GfxImageColorMap* colorMap, -#if POPPLER_CHECK_VERSION(0, 12, 0) GBool /*interpolate*/, -#endif Stream* maskStr, int maskWidth, int maskHeight, GfxImageColorMap* maskColorMap -#if POPPLER_CHECK_VERSION(0, 12, 0) , GBool /*maskInterpolate*/ -#endif ) { if (m_bSkipImages) diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx index 7e65f085d288..da021a2a039b 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx @@ -234,40 +234,28 @@ namespace pdfi //----- image drawing virtual void drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, GBool invert, -#if POPPLER_CHECK_VERSION(0, 12, 0) GBool interpolate, -#endif GBool inlineImg) override; virtual void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, -#if POPPLER_CHECK_VERSION(0, 12, 0) GBool interpolate, -#endif int *maskColors, GBool inlineImg) override; virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, -#if POPPLER_CHECK_VERSION(0, 12, 0) GBool interpolate, -#endif Stream *maskStr, int maskWidth, int maskHeight, GBool maskInvert -#if POPPLER_CHECK_VERSION(0, 12, 0) , GBool maskInterpolate -#endif ) override; virtual void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, -#if POPPLER_CHECK_VERSION(0, 12, 0) GBool interpolate, -#endif Stream *maskStr, int maskWidth, int maskHeight, GfxImageColorMap *maskColorMap -#if POPPLER_CHECK_VERSION(0, 12, 0) , GBool maskInterpolate -#endif ) override; static void setPageNum( int nNumPages ); |