diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2017-12-26 17:03:04 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2017-12-26 17:03:14 +0100 |
| commit | 9b9293b1cd83f25f69c1f75e03fcb103b43bb575 (patch) | |
| tree | fb9e6162632afdd420d51740babc89b24dd7a592 /tdefile-plugins/dependencies/poppler-tqt/poppler-page.cc | |
| parent | ec9ef61440bbf98e86d39b0bb228c66f19377c6c (diff) | |
| download | tdegraphics-9b9293b1cd83f25f69c1f75e03fcb103b43bb575.tar.gz tdegraphics-9b9293b1cd83f25f69c1f75e03fcb103b43bb575.zip | |
Add support for Poppler >= 0.60
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 9dd187337acce50e168b06571dfa315c41a1b628)
Diffstat (limited to 'tdefile-plugins/dependencies/poppler-tqt/poppler-page.cc')
| -rw-r--r-- | tdefile-plugins/dependencies/poppler-tqt/poppler-page.cc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cc b/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cc index 2c6a5f0e..3c6bafca 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_030) || defined(HAVE_POPPLER_020) +#if defined(HAVE_POPPLER_060) || 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<TextBox*> Page::textList() const TQValueList<TextBox*> output_list; -#if defined(HAVE_POPPLER_030) || defined(HAVE_POPPLER_020) +#if defined(HAVE_POPPLER_060) || 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,9 +205,16 @@ PageTransition *Page::getTransition() const { Object o; PageTransitionParams params; - params.dictObj = data->doc->data->doc.getCatalog()->getPage(data->index + 1)->getTrans(&o); +# if defined(HAVE_POPPLER_060) + 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) o.free(); +# endif } return data->transition; } |