diff options
| author | Dominique Leuenberger <dimstar@suse.de> | 2018-01-05 12:16:03 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-05-10 16:16:40 +0200 |
| commit | 05645e8a9bf90999c7010e75000a7529c91d06f2 (patch) | |
| tree | 43a105819c9e38666e7cd81a0abc4f745475fb4b | |
| parent | ef0b24ee8613d1d13c4c4b4cd193b9aee2f0c023 (diff) | |
Allow building with poppler-0.62
Reviewed-on: https://gerrit.libreoffice.org/47460
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 38368be8527ca655854ee1231d9f355b8c0591ec)
Reviewed-on: https://gerrit.libreoffice.org/48809
Reviewed-by: Rene Engelhard <rene@debian.org>
Tested-by: Rene Engelhard <rene@debian.org>
(cherry picked from commit 02680aaa7b86998718d6ab25177d8adc420c5c42)
Change-Id: Ia627f1628a67dd8ece7d9318639d9ccd06b89765
| -rw-r--r-- | sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index 5d4a797f7c96..b3f524957cd1 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -32,11 +32,13 @@ #pragma warning(push, 1) #endif -// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1 +// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1, then renamed to UnicodeMapFuncs.h in 0.62.0 // FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && !POPPLER_CHECK_VERSION(0, 21, 1) // because the internal poppler does not provide poppler-version.h and the macro always returns 0 -#if POPPLER_CHECK_VERSION(0, 21, 1) -#include "UTF8.h" +#if POPPLER_CHECK_VERSION(0, 62, 0) +#include <UnicodeMapFuncs.h> +#elif POPPLER_CHECK_VERSION(0, 21, 1) +#include <UTF8.h> #elif POPPLER_CHECK_VERSION(0, 21, 0) #include "UTF.h" #else @@ -918,7 +920,11 @@ void PDFOutDev::drawChar(GfxState *state, double x, double y, ); // silence spurious warning +#if POPPLER_CHECK_VERSION(0, 62, 0) + (void)&mapUTF16; +#else (void)&mapUCS2; +#endif char buf[9]; for( int i=0; i<uLen; ++i ) |