|
 |
542cdfd |
From bb6a12caede53029ecb99810f2f58daae4e11af7 Mon Sep 17 00:00:00 2001
|
|
|
542cdfd |
From: Rene Engelhard <rene@debian.org>
|
|
|
542cdfd |
Date: Wed, 31 Oct 2012 18:00:18 +0100
|
|
|
542cdfd |
Subject: [PATCH] fix sdext build with poppler >= 0.19.x
|
|
|
542cdfd |
|
|
|
542cdfd |
Change-Id: I655e8e15c7f7a8c292b3a1820ee48c29e847d05a
|
|
|
542cdfd |
---
|
|
|
542cdfd |
configure.ac | 3 ---
|
|
|
542cdfd |
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 4 +++-
|
|
|
542cdfd |
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 8 +++++---
|
|
|
542cdfd |
3 files changed, 8 insertions(+), 7 deletions(-)
|
|
|
542cdfd |
|
|
|
542cdfd |
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
|
|
542cdfd |
index 77a9aa6..7adc487 100644
|
|
|
542cdfd |
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
|
|
542cdfd |
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
|
|
542cdfd |
@@ -489,7 +489,9 @@ void PDFOutDev::endPage()
|
|
|
542cdfd |
printf("endPage\n");
|
|
|
542cdfd |
}
|
|
|
542cdfd |
|
|
|
542cdfd |
-#if POPPLER_CHECK_VERSION(0, 17, 0)
|
|
|
542cdfd |
+#if POPPLER_CHECK_VERSION(0, 19, 0)
|
|
|
542cdfd |
+void PDFOutDev::processLink(AnnotLink *link)
|
|
|
542cdfd |
+#elif POPPLER_CHECK_VERSION(0, 17, 0)
|
|
|
542cdfd |
void PDFOutDev::processLink(AnnotLink *link, Catalog *)
|
|
|
542cdfd |
#else
|
|
|
542cdfd |
void PDFOutDev::processLink(Link* link, Catalog*)
|
|
|
542cdfd |
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
|
|
|
542cdfd |
index 0a19b9a..e5e48fc 100644
|
|
|
542cdfd |
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
|
|
|
542cdfd |
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
|
|
|
542cdfd |
@@ -189,10 +189,12 @@ namespace pdfi
|
|
|
542cdfd |
// virtual void cvtDevToUser(double dx, double dy, double *ux, double *uy);
|
|
|
542cdfd |
// virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy);
|
|
|
542cdfd |
|
|
|
542cdfd |
- #if POPPLER_CHECK_VERSION(0, 17, 0)
|
|
|
542cdfd |
- virtual void processLink(AnnotLink *link, Catalog *catalog);
|
|
|
542cdfd |
- #else
|
|
|
542cdfd |
//----- link borders
|
|
|
542cdfd |
+ #if POPPLER_CHECK_VERSION(0, 19, 0)
|
|
|
542cdfd |
+ virtual void processLink(AnnotLink *link);
|
|
|
542cdfd |
+ #elif POPPLER_CHECK_VERSION(0, 17, 0)
|
|
|
542cdfd |
+ virtual void processLink(AnnotLink *link, Catalog *catalog);
|
|
|
542cdfd |
+ #else
|
|
|
542cdfd |
virtual void processLink(Link *link, Catalog *catalog);
|
|
|
542cdfd |
#endif
|
|
|
542cdfd |
|
|
|
542cdfd |
--
|
|
|
542cdfd |
1.7.11.7
|
|
|
542cdfd |
|