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

Allow building against poppler >= 0.20

Browse Source
This commit is contained in:
Kovid Goyal 2012-05-19 08:14:00 +05:30
parent 8227581a2c
commit e054082d9f
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
setup/build_environment.py
View File

@ -191,6 +191,9 @@ else:
lh = os.path.join(poppler_inc_dirs[0], 'Link.h') lh = os.path.join(poppler_inc_dirs[0], 'Link.h')
if 'class AnnotLink' not in open(lh, 'rb').read(): if 'class AnnotLink' not in open(lh, 'rb').read():
poppler_cflags.append('-DPOPPLER_OLD_LINK_TYPE') poppler_cflags.append('-DPOPPLER_OLD_LINK_TYPE')
ph = os.path.join(poppler_inc_dirs[0], 'Page.h')
if 'getLinks(Catalog' in open(ph, 'rb').read():
poppler_cflags.append('-DPOPPLER_PRE_20')
magick_error = None magick_error = None
if not magick_inc_dirs or not os.path.exists(os.path.join(magick_inc_dirs[0], if not magick_inc_dirs or not os.path.exists(os.path.join(magick_inc_dirs[0],

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

@ -647,7 +647,12 @@ void XMLOutputDev::process_link(AnnotLink* link){
void XMLOutputDev::endPage() { void XMLOutputDev::endPage() {
#ifdef POPPLER_PRE_20
Links *slinks = catalog->getPage(current_page->number())->getLinks(catalog); Links *slinks = catalog->getPage(current_page->number())->getLinks(catalog);
#else
Links *slinks = catalog->getPage(current_page->number())->getLinks();
#endif
for (int i = 0; i < slinks->getNumLinks(); i++) for (int i = 0; i < slinks->getNumLinks(); i++)
{ {
this->process_link(slinks->getLink(i)); this->process_link(slinks->getLink(i));
@ -878,7 +883,11 @@ vector<char>* Reflow::render_first_page(bool use_crop_box, double x_res,
throw ReflowException("Failed to allocate SplashOutputDev"); throw ReflowException("Failed to allocate SplashOutputDev");
} }
try { try {
#ifdef POPPLER_PRE_20
out->startDoc(doc->getXRef()); out->startDoc(doc->getXRef());
#else
out->startDoc(doc);
#endif
out->startPage(1, NULL); out->startPage(1, NULL);
double pg_w, pg_h; double pg_w, pg_h;