summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2020-04-09 00:15:14 +0200
committerSlávek Banko <slavek.banko@axis.cz>2020-04-09 00:15:14 +0200
commit1c13ba28d73f4de69bbcfd8d32fee8ccf72b48ab (patch)
tree13dac2ccf9d83c2b1972ed3444ea79f2f41f643c
parent649a5eeeae68b929fa5d7c12ad2f396cdf3dc77a (diff)
downloadtdegraphics-1c13ba28d73f4de69bbcfd8d32fee8ccf72b48ab.tar.gz
tdegraphics-1c13ba28d73f4de69bbcfd8d32fee8ccf72b48ab.zip
Add support for Poppler >= 0.86
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--config.h.cmake1
-rw-r--r--tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake2
-rw-r--r--tdefile-plugins/dependencies/poppler-tqt/poppler-link.cc6
3 files changed, 8 insertions, 1 deletions
diff --git a/config.h.cmake b/config.h.cmake
index 30f9fcec..5b88585c 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -1,6 +1,7 @@
#cmakedefine VERSION "@VERSION@"
// poppler-tqt
+#cmakedefine HAVE_POPPLER_086
#cmakedefine HAVE_POPPLER_083
#cmakedefine HAVE_POPPLER_082
#cmakedefine HAVE_POPPLER_076
diff --git a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake
index 65a62f95..1bc139b7 100644
--- a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake
+++ b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake
@@ -24,7 +24,7 @@ check_cxx_source_compiles("
HAVE_POPPLER_030 )
tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
-foreach( _poppler_ver 0.58 0.64 0.70 0.71 0.72 0.76 0.82 0.83 )
+foreach( _poppler_ver 0.58 0.64 0.70 0.71 0.72 0.76 0.82 0.83 0.86 )
string( REPLACE "." "" _poppler_str "${_poppler_ver}" )
if( NOT DEFINED HAVE_POPPLER_${_poppler_str} )
message( STATUS "Performing Test HAVE_POPPLER_${_poppler_str}" )
diff --git a/tdefile-plugins/dependencies/poppler-tqt/poppler-link.cc b/tdefile-plugins/dependencies/poppler-tqt/poppler-link.cc
index 52d7e4ab..ee05eb06 100644
--- a/tdefile-plugins/dependencies/poppler-tqt/poppler-link.cc
+++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-link.cc
@@ -35,7 +35,11 @@ namespace Poppler {
if ( data.namedDest && !ld )
{
deleteDest = true;
+# if defined(HAVE_POPPLER_086)
+ ld = data.doc->doc.findDest( data.namedDest ).get();
+# else
ld = data.doc->doc.findDest( data.namedDest );
+# endif
}
if (!ld) return;
@@ -77,7 +81,9 @@ namespace Poppler {
m_right = rightAux;
m_bottom = bottomAux;
+# if !defined(HAVE_POPPLER_086)
if (deleteDest) delete ld;
+# endif
}
LinkDestination::LinkDestination(const TQString &description)