You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
44 lines
1.6 KiB
44 lines
1.6 KiB
14 years ago
|
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||
|
|
index f7741b4..df15a94 100644
|
||
|
|
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||
|
|
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||
|
|
@@ -489,7 +489,11 @@ void PDFOutDev::endPage()
|
||
|
|
printf("endPage\n");
|
||
|
|
}
|
||
|
|
|
||
|
|
+#if POPPLER_CHECK_VERSION(0, 17, 0)
|
||
|
|
+void PDFOutDev::processLink(AnnotLink *link, Catalog *catalog);
|
||
|
|
+#else
|
||
|
|
void PDFOutDev::processLink(Link* link, Catalog*)
|
||
|
|
+#endif
|
||
|
|
{
|
||
|
|
assert(link);
|
||
|
|
|
||
|
|
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
|
||
|
|
index 3ac0f49..27914d3 100644
|
||
|
|
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
|
||
|
|
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
|
||
|
|
@@ -65,6 +65,7 @@ class GfxPath;
|
||
|
|
class GfxFont;
|
||
|
|
class PDFDoc;
|
||
|
|
#ifndef SYSTEM_POPPLER
|
||
|
|
+#define POPPLER_CHECK_VERSION(major,minor,micro) (0)
|
||
|
|
typedef GString GooString;
|
||
|
|
#endif
|
||
|
|
|
||
|
|
@@ -193,9 +194,13 @@ namespace pdfi
|
||
|
|
// Convert between device and user coordinates.
|
||
|
|
// 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)
|
||
|
|
+ virtual void processLink(AnnotLink *link, Catalog *catalog);
|
||
|
|
+ #else
|
||
|
|
//----- link borders
|
||
|
|
virtual void processLink(Link *link, Catalog *catalog);
|
||
|
|
+ #endif
|
||
|
|
|
||
|
|
//----- save/restore graphics state
|
||
|
|
virtual void saveState(GfxState *state);
|