diff options
Diffstat (limited to 'tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp')
| -rw-r--r-- | tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp b/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp index 9b4f6208..a2463362 100644 --- a/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp +++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp @@ -124,12 +124,16 @@ TQImage Page::renderToImage(double xres, double yres, bool doLinks) const TQString Page::getText(const Rectangle &r) const { TextOutputDev *output_dev; +# if (POPPLER_VERSION_C >= 25001000) + GooString s; +# else GooString *s; +# endif const PDFRectangle *rect; TQString result; ::Page *p; -#if defined(HAVE_POPPLER_058) || defined(HAVE_POPPLER_030) || defined(HAVE_POPPLER_020) +#if (POPPLER_VERSION_C >= 20000) output_dev = new TextOutputDev(0, gFalse, 0, gFalse, gFalse); #else output_dev = new TextOutputDev(0, gFalse, gFalse, gFalse); @@ -151,10 +155,16 @@ TQString Page::getText(const Rectangle &r) const s = output_dev->getText(r.m_x1, y1, r.m_x2, y2); } +# if (POPPLER_VERSION_C >= 25001000) + result = TQString::fromUtf8(s.GOO_GET_CSTR()); +# else result = TQString::fromUtf8(s->GOO_GET_CSTR()); +# endif delete output_dev; +# if (POPPLER_VERSION_C < 25001000) delete s; +# endif return result; } @@ -164,7 +174,7 @@ TQValueList<TextBox*> Page::textList() const TQValueList<TextBox*> output_list; -#if defined(HAVE_POPPLER_058) || defined(HAVE_POPPLER_030) || defined(HAVE_POPPLER_020) +#if (POPPLER_VERSION_C >= 20000) output_dev = new TextOutputDev(0, gFalse, 0, gFalse, gFalse); #else output_dev = new TextOutputDev(0, gFalse, gFalse, gFalse); @@ -173,7 +183,7 @@ TQValueList<TextBox*> Page::textList() const data->doc->data->doc.displayPageSlice(output_dev, data->index + 1, 72, 72, 0, false, false, false, -1, -1, -1, -1); -# if defined(HAVE_POPPLER_2111) +# if (POPPLER_VERSION_C >= 21011000) std::unique_ptr<TextWordList> word_list = output_dev->makeWordList(); # else TextWordList *word_list = output_dev->makeWordList(); @@ -197,7 +207,7 @@ TQValueList<TextBox*> Page::textList() const output_list.append(text_box); } -# if !defined(HAVE_POPPLER_2111) +# if (POPPLER_VERSION_C < 21011000) delete word_list; # endif delete output_dev; @@ -211,14 +221,14 @@ PageTransition *Page::getTransition() const { Object o; PageTransitionParams params; -# if defined(HAVE_POPPLER_058) +# if (POPPLER_VERSION_C >= 58000) 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_058) +# if (POPPLER_VERSION_C < 58000) o.free(); # endif } |