This commit is contained in:
Kovid Goyal 2011-10-01 12:42:02 -06:00
parent 04409eb4bd
commit 53792745b2
2 changed files with 3 additions and 8 deletions

View File

@ -625,11 +625,7 @@ static string get_link_dest(LinkAction *link, PDFDoc *doc) {
return oss.str(); return oss.str();
} }
#if (POPPLER_MAJOR_VERSION == 0) && (POPPLER_MINOR_VERSION < 17)
void XMLOutputDev::process_link(Link* link){
#else
void XMLOutputDev::process_link(AnnotLink* link){ void XMLOutputDev::process_link(AnnotLink* link){
#endif
double _x1, _y1, _x2, _y2; double _x1, _y1, _x2, _y2;
int x1, y1, x2, y2; int x1, y1, x2, y2;

View File

@ -41,6 +41,9 @@ using namespace std;
namespace calibre_reflow { namespace calibre_reflow {
#ifndef AnnotLink
#define AnnotLink Link
#endif
enum UnicodeTextDirection { enum UnicodeTextDirection {
text_dir_unknown, text_dir_unknown,
@ -244,11 +247,7 @@ class XMLOutputDev : public OutputDev {
XMLImages *images; XMLImages *images;
PDFDoc *doc; PDFDoc *doc;
#if (POPPLER_MAJOR_VERSION == 0) && (POPPLER_MINOR_VERSION < 17)
void process_link(Link* link);
#else
void process_link(AnnotLink* link); void process_link(AnnotLink* link);
#endif
}; };
} }