From dc9b181dae236b86e28bb30b9242c2faca1d1786 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 26 Sep 2011 12:07:20 -0600
Subject: [PATCH] Fix #855587 (Doesn't build with poppler 0.17/0.18)

---
 src/calibre/ebooks/pdf/images.cpp | 2 +-
 src/calibre/ebooks/pdf/reflow.cpp | 5 +++++
 src/calibre/ebooks/pdf/reflow.h   | 5 +++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/pdf/images.cpp b/src/calibre/ebooks/pdf/images.cpp
index 8ca7448001..466c69af4b 100644
--- a/src/calibre/ebooks/pdf/images.cpp
+++ b/src/calibre/ebooks/pdf/images.cpp
@@ -126,7 +126,7 @@ void XMLImages::add(GfxState *state, Object *ref, Stream *str,
 
     if (img->type == jpeg) {
         int c;
-        str = ((DCTStream *)str)->getRawStream();
+        str = str->getNextStream();
         str->reset();
 
         // copy the stream
diff --git a/src/calibre/ebooks/pdf/reflow.cpp b/src/calibre/ebooks/pdf/reflow.cpp
index 65b5de6ae0..8103e1a03d 100644
--- a/src/calibre/ebooks/pdf/reflow.cpp
+++ b/src/calibre/ebooks/pdf/reflow.cpp
@@ -625,7 +625,12 @@ static string get_link_dest(LinkAction *link, PDFDoc *doc) {
   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){
+#endif
+
   double _x1, _y1, _x2, _y2;
   int x1, y1, x2, y2;
   
diff --git a/src/calibre/ebooks/pdf/reflow.h b/src/calibre/ebooks/pdf/reflow.h
index 768799f004..d99137d376 100644
--- a/src/calibre/ebooks/pdf/reflow.h
+++ b/src/calibre/ebooks/pdf/reflow.h
@@ -244,6 +244,11 @@ class XMLOutputDev : public OutputDev {
     XMLImages *images;
     PDFDoc *doc;
 
+#if (POPPLER_MAJOR_VERSION == 0) && (POPPLER_MINOR_VERSION < 17)
     void process_link(Link* link);
+#else
+    void process_link(AnnotLink* link);
+#endif
+
 };
 }