From 8063c4fe47de5f26d0fce48c36501b422efef4e3 Mon Sep 17 00:00:00 2001 From: Ray Vine Date: Sat, 8 Sep 2018 14:23:15 +0200 Subject: Change the poppler test from 0.60 to 0.58 because the relevant code changes are related to 0.58 Signed-off-by: Ray Vine (cherry picked from commit 594387b4f345169662031732f2c9495d297be17d) --- tdefile-plugins/dependencies/poppler-tqt/poppler-page.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tdefile-plugins/dependencies/poppler-tqt/poppler-page.cc') diff --git a/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cc b/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cc index 3c6bafca..45ea5b74 100644 --- a/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cc +++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cc @@ -129,7 +129,7 @@ TQString Page::getText(const Rectangle &r) const TQString result; ::Page *p; -#if defined(HAVE_POPPLER_060) || defined(HAVE_POPPLER_030) || defined(HAVE_POPPLER_020) +#if defined(HAVE_POPPLER_058) || defined(HAVE_POPPLER_030) || defined(HAVE_POPPLER_020) output_dev = new TextOutputDev(0, gFalse, 0, gFalse, gFalse); #else output_dev = new TextOutputDev(0, gFalse, gFalse, gFalse); @@ -164,7 +164,7 @@ TQValueList Page::textList() const TQValueList output_list; -#if defined(HAVE_POPPLER_060) || defined(HAVE_POPPLER_030) || defined(HAVE_POPPLER_020) +#if defined(HAVE_POPPLER_058) || defined(HAVE_POPPLER_030) || defined(HAVE_POPPLER_020) output_dev = new TextOutputDev(0, gFalse, 0, gFalse, gFalse); #else output_dev = new TextOutputDev(0, gFalse, gFalse, gFalse); @@ -205,14 +205,14 @@ PageTransition *Page::getTransition() const { Object o; PageTransitionParams params; -# if defined(HAVE_POPPLER_060) +# if defined(HAVE_POPPLER_058) o = data->doc->data->doc.getCatalog()->getPage(data->index + 1)->getTrans(); # else data->doc->data->doc.getCatalog()->getPage(data->index + 1)->getTrans(&o); # endif params.dictObj = &o; data->transition = new PageTransition(params); -# if !defined(HAVE_POPPLER_060) +# if !defined(HAVE_POPPLER_058) o.free(); # endif } -- cgit v1.2.1