From 544868bcc9aeaf703d4347b9726930a4e091c83e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 15 Dec 2021 17:30:53 +0100 Subject: Add support for Poppler >= 21.11. This resolves issue #36. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 9cde144216b331f0eef2ce2c3800d8356109ccc7) --- config.h.cmake | 1 + tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake | 2 +- tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp | 6 ++++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/config.h.cmake b/config.h.cmake index b3b6d1ec..fa71d600 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -1,6 +1,7 @@ #cmakedefine VERSION "@VERSION@" // poppler-tqt +#cmakedefine HAVE_POPPLER_2111 #cmakedefine HAVE_POPPLER_2108 #cmakedefine HAVE_POPPLER_086 #cmakedefine HAVE_POPPLER_083 diff --git a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake index 52f08a4c..ceeaf409 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 0.86 21.08 ) +foreach( _poppler_ver 0.58 0.64 0.70 0.71 0.72 0.76 0.82 0.83 0.86 21.08 21.11 ) 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-page.cpp b/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp index 426b750f..9b4f6208 100644 --- a/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp +++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp @@ -173,7 +173,11 @@ TQValueList 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) + std::unique_ptr word_list = output_dev->makeWordList(); +# else TextWordList *word_list = output_dev->makeWordList(); +# endif if (!word_list) { delete output_dev; @@ -193,7 +197,9 @@ TQValueList Page::textList() const output_list.append(text_box); } +# if !defined(HAVE_POPPLER_2111) delete word_list; +# endif delete output_dev; return output_list; -- cgit v1.2.3