Fix build with poppler-0.20.

This commit is contained in:
kili 2012-07-13 15:05:47 +00:00
parent ee578fffb1
commit 906c8a2c57

View File

@ -1,11 +1,6 @@
$OpenBSD: patch-src_calibre_ebooks_pdf_reflow_cpp,v 1.1 2011/11/26 19:50:08 kili Exp $
With poppler-0.18, the classes Link and AnnotLink had been merged
into AnnotLink. The latter should now contain all functionality of
the former.
$OpenBSD: patch-src_calibre_ebooks_pdf_reflow_cpp,v 1.2 2012/07/13 15:05:47 kili Exp $
--- src/calibre/ebooks/pdf/reflow.cpp.orig Fri Sep 23 19:14:20 2011
+++ src/calibre/ebooks/pdf/reflow.cpp Thu Nov 17 16:35:55 2011
+++ src/calibre/ebooks/pdf/reflow.cpp Fri Jul 13 13:39:19 2012
@@ -625,7 +625,7 @@ static string get_link_dest(LinkAction *link, PDFDoc *
return oss.str();
}
@ -15,3 +10,21 @@ the former.
double _x1, _y1, _x2, _y2;
int x1, y1, x2, y2;
@@ -646,7 +646,7 @@ void XMLOutputDev::process_link(Link* link){
void XMLOutputDev::endPage() {
- Links *slinks = catalog->getPage(current_page->number())->getLinks(catalog);
+ Links *slinks = catalog->getPage(current_page->number())->getLinks();
for (int i = 0; i < slinks->getNumLinks(); i++)
{
this->process_link(slinks->getLink(i));
@@ -877,7 +877,7 @@ vector<char>* Reflow::render_first_page(bool use_crop_
throw ReflowException("Failed to allocate SplashOutputDev");
}
try {
- out->startDoc(doc->getXRef());
+ out->startDoc(doc);
out->startPage(1, NULL);
double pg_w, pg_h;