summaryrefslogtreecommitdiff
path: root/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-09-02 13:15:49 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-09-02 13:24:18 +0100
commit91313fc05abbfe35ee1e0c2464a28dd580780f07 (patch)
treecaba2a8e6f180a6f85d3d781ea2966e8d0d44129 /sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
parent11e8dc2d901988b4e638e6fff1edfbbf0b3b999d (diff)
Resolves: rhbz#735182 libreoffice doesn't build with poppler-0.17.3
Diffstat (limited to 'sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx')
-rw-r--r--sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index cf28922d2e7d..3f1261c9413b 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -150,7 +150,11 @@ void writeBinaryBuffer( const OutputBuffer& rBuffer )
void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str, bool bWithLinefeed )
{
// dump JPEG file as-is
+#if POPPLER_CHECK_VERSION(0, 17, 3)
+ str = str->getBaseStream();
+#else
str = ((DCTStream *)str)->getRawStream();
+#endif
str->reset();
int c;
@@ -490,7 +494,7 @@ void PDFOutDev::endPage()
}
#if POPPLER_CHECK_VERSION(0, 17, 0)
-void PDFOutDev::processLink(AnnotLink *link, Catalog *catalog)
+void PDFOutDev::processLink(AnnotLink *link, Catalog *)
#else
void PDFOutDev::processLink(Link* link, Catalog*)
#endif