diff options
| author | Thorsten Behrens <tbehrens@suse.com> | 2013-04-30 00:05:18 +0200 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2013-04-30 00:07:34 +0200 |
| commit | 6b18d7d28efb0285f01e36f5b0cb2cddb1c68488 (patch) | |
| tree | c06bb8578ea779e34970a45bcbcffefd3d191bee /sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | |
| parent | 3719396649c8c944727f89c517a8191cd37b2499 (diff) | |
Fix import of images from pdf.
Seems poppler changed outputdev virt func signatures with version
12, so with system poppler, we never got any image import functions
called. Added override annotation to prevent this from happening in
the future.
Change-Id: I565de80ce218e831e276d3a1d88ded3baee876e7
Diffstat (limited to 'sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx')
| -rw-r--r-- | sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index b55648685252..4ee6a5964695 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -846,6 +846,9 @@ 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*/ ) { OutputBuffer aBuf; initBuf(aBuf); @@ -872,6 +875,9 @@ 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*/ ) { OutputBuffer aBuf; initBuf(aBuf); @@ -918,9 +924,16 @@ 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) + GBool maskInvert +#if POPPLER_CHECK_VERSION(0, 12, 0) + , GBool /*maskInterpolate*/ +#endif + ) { OutputBuffer aBuf; initBuf(aBuf); printf( "drawImage %d %d 0", width, height ); @@ -931,9 +944,16 @@ 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 ) + GfxImageColorMap* maskColorMap +#if POPPLER_CHECK_VERSION(0, 12, 0) + , GBool /*maskInterpolate*/ +#endif + ) { OutputBuffer aBuf; initBuf(aBuf); printf( "drawImage %d %d 0", width, height ); |