Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #855587 (Doesn't build with poppler 0.17/0.18)

Browse Source
This commit is contained in:
Kovid Goyal 2011-09-26 12:07:20 -06:00
parent bebe2467cc
commit dc9b181dae
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/ebooks/pdf/images.cpp
View File

@ -126,7 +126,7 @@ void XMLImages::add(GfxState *state, Object *ref, Stream *str,
if (img->type == jpeg) { if (img->type == jpeg) {
int c; int c;
str = ((DCTStream *)str)->getRawStream(); str = str->getNextStream();
str->reset(); str->reset();
// copy the stream // copy the stream

5
src/calibre/ebooks/pdf/reflow.cpp
View File

@ -625,7 +625,12 @@ 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){ void XMLOutputDev::process_link(Link* link){
#else
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;

5
src/calibre/ebooks/pdf/reflow.h
View File

@ -244,6 +244,11 @@ 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); void process_link(Link* link);
#else
void process_link(AnnotLink* link);
#endif
}; };
} }