From 319cae5588b7e5366dd1ca08f0714c639c902b66 Mon Sep 17 00:00:00 2001 From: Stephen Gaito Date: Thu, 26 Sep 2019 16:00:11 +0100 Subject: [PATCH] commiting changes required to compile with poppler-0.76.0 --- src/HTMLRenderer/HTMLRenderer.h | 3 ++- src/HTMLRenderer/link.cc | 2 +- src/HTMLRenderer/outline.cc | 11 ++++------- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/HTMLRenderer/HTMLRenderer.h b/src/HTMLRenderer/HTMLRenderer.h index 329f868..a1195e8 100644 --- a/src/HTMLRenderer/HTMLRenderer.h +++ b/src/HTMLRenderer/HTMLRenderer.h @@ -16,6 +16,7 @@ #include #include #include +#include /************ from goo/gtypes.h ***************/ // #include @@ -197,7 +198,7 @@ protected: void post_process(void); void process_outline(void); - void process_outline_items(const GooList * items); + void process_outline_items(const std::vector * items); void process_form(std::ofstream & out); diff --git a/src/HTMLRenderer/link.cc b/src/HTMLRenderer/link.cc index 9f3a62d..842b6de 100644 --- a/src/HTMLRenderer/link.cc +++ b/src/HTMLRenderer/link.cc @@ -40,7 +40,7 @@ static string get_linkdest_detail_str(LinkDest * dest, Catalog * catalog, int & if(dest->isPageRef()) { auto pageref = dest->getPageRef(); - pageno = catalog->findPage(pageref.num, pageref.gen); + pageno = catalog->findPage(pageref); } else { diff --git a/src/HTMLRenderer/outline.cc b/src/HTMLRenderer/outline.cc index 205eac7..2dac02c 100644 --- a/src/HTMLRenderer/outline.cc +++ b/src/HTMLRenderer/outline.cc @@ -9,9 +9,6 @@ #include -#include -#include - #include "HTMLRenderer.h" #include "util/namespace.h" #include "util/encoding.h" @@ -21,16 +18,16 @@ namespace pdf2htmlEX { using std::ostream; -void HTMLRenderer::process_outline_items(const GooList * items) +void HTMLRenderer::process_outline_items(const std::vector * items) { - if((!items) || (items->getLength() == 0)) + if((!items) || (items->size() == 0)) return; f_outline.fs << "
    "; - for(int i = 0; i < items->getLength(); ++i) + for(std::size_t i = 0; i < items->size(); ++i) { - OutlineItem * item = (OutlineItem*)(items->get(i)); + OutlineItem * item = items->at(i); string detail; string dest = get_linkaction_str(item->getAction(), detail);