mirror of
https://abf.rosa.ru/djam/libreoffice.git
synced 2025-02-23 18:43:00 +00:00
31 lines
1.5 KiB
Diff
31 lines
1.5 KiB
Diff
--- ./sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2011-11-14 20:32:45.000000000 +0000
|
|
+++ ./sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2011-11-14 20:30:53.000000000 +0000
|
|
@@ -150,7 +150,7 @@ void writeBinaryBuffer( const OutputBuff
|
|
void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str, bool bWithLinefeed )
|
|
{
|
|
// dump JPEG file as-is
|
|
-#if POPPLER_CHECK_VERSION(0, 17, 3)
|
|
+#if POPPLER_CHECK_VERSION(0, 17, 3) || POPPLER_CHECK_VERSION(0, 18, 1)
|
|
str = str->getBaseStream();
|
|
#else
|
|
str = ((DCTStream *)str)->getRawStream();
|
|
@@ -493,7 +493,7 @@ void PDFOutDev::endPage()
|
|
printf("endPage\n");
|
|
}
|
|
|
|
-#if POPPLER_CHECK_VERSION(0, 17, 0)
|
|
+#if POPPLER_CHECK_VERSION(0, 17, 0) || POPPLER_CHECK_VERSION(0, 18, 1)
|
|
void PDFOutDev::processLink(AnnotLink *link, Catalog *)
|
|
#else
|
|
void PDFOutDev::processLink(Link* link, Catalog*)
|
|
--- ./sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2011-11-14 20:22:04.000000000 +0000
|
|
+++ ./sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2011-11-14 20:22:55.000000000 +0000
|
|
@@ -201,7 +201,7 @@ namespace pdfi
|
|
// virtual void cvtDevToUser(double dx, double dy, double *ux, double *uy);
|
|
// virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy);
|
|
|
|
- #if POPPLER_CHECK_VERSION(0, 17, 0)
|
|
+ #if POPPLER_CHECK_VERSION(0, 17, 0) || POPPLER_CHECK_VERSION(0, 18, 1)
|
|
virtual void processLink(AnnotLink *link, Catalog *catalog);
|
|
#else
|
|
//----- link borders
|