projects / packages / ka5-kitinerary.git / blame
| Commit | Line | Data |
|---|---|---|
| f2732008 JR |
1 | --- kitinerary-19.04.1/src/pdfdocument.cpp~ 2019-04-29 07:13:27.000000000 +0200 |
| 2 | +++ kitinerary-19.04.1/src/pdfdocument.cpp 2019-11-03 14:59:36.863067477 +0100 | |
| 3 | @@ -95,7 +95,11 @@ | |
| 4 | public: | |
| 5 | ExtractorOutputDevice(); | |
| 6 | bool needNonText() override { return true; } | |
| 7 | +#ifdef HAVE_POPPLER_0_82 | |
| 8 | + void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, const int *maskColors, bool inlineImg) override; | |
| 9 | +#else | |
| 10 | void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, int *maskColors, bool inlineImg) override; | |
| 11 | +#endif | |
| 12 | ||
| 13 | std::vector<PdfImage> m_images; | |
| 14 | ||
| 15 | @@ -118,7 +118,11 @@ | |
| 16 | bool upsideDown() override { return false; } | |
| 17 | bool useDrawChar() override { return false; } | |
| 18 | ||
| 19 | +#ifdef HAVE_POPPLER_0_82 | |
| 20 | + void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, const int *maskColors, bool inlineImg) override; | |
| 21 | +#else | |
| 22 | void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, int *maskColors, bool inlineImg) override; | |
| 23 | +#endif | |
| 24 | QImage image() const { return m_image; } | |
| 25 | ||
| 26 | private: | |
| 27 | @@ -178,7 +182,11 @@ | |
| 28 | { | |
| 29 | } | |
| 30 | ||
| 31 | +#ifdef HAVE_POPPLER_0_82 | |
| 32 | +void ExtractorOutputDevice::drawImage(GfxState* state, Object* ref, Stream* str, int width, int height, GfxImageColorMap* colorMap, bool interpolate, const int* maskColors, bool inlineImg) | |
| 33 | +#else | |
| 34 | void ExtractorOutputDevice::drawImage(GfxState* state, Object* ref, Stream* str, int width, int height, GfxImageColorMap* colorMap, bool interpolate, int* maskColors, bool inlineImg) | |
| 35 | +#endif | |
| 36 | { | |
| 37 | Q_UNUSED(str); | |
| 38 | Q_UNUSED(interpolate); | |
| 39 | @@ -233,7 +241,11 @@ | |
| 40 | { | |
| 41 | } | |
| 42 | ||
| 43 | +#ifdef HAVE_POPPLER_0_82 | |
| 44 | +void ImageLoaderOutputDevice::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, const int *maskColors, bool inlineImg) | |
| 45 | +#else | |
| 46 | void ImageLoaderOutputDevice::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, int *maskColors, bool inlineImg) | |
| 47 | +#endif | |
| 48 | { | |
| 49 | Q_UNUSED(state); | |
| 50 | Q_UNUSED(height); | |
| 51 | --- kitinerary-19.04.1/CMakeLists.txt~ 2019-05-07 03:05:49.000000000 +0200 | |
| 52 | +++ kitinerary-19.04.1/CMakeLists.txt 2019-11-03 15:01:21.029730602 +0100 | |
| 53 | @@ -62,6 +62,9 @@ | |
| 54 | if (${Poppler_VERSION} VERSION_GREATER 0.68) | |
| 55 | set(HAVE_POPPLER_0_69 ON) | |
| 56 | endif() | |
| 57 | + if (${Poppler_VERSION} VERSION_GREATER 0.81) | |
| 58 | + set(HAVE_POPPLER_0_82 ON) | |
| 59 | + endif() | |
| 60 | set(CMAKE_REQUIRED_LIBRARIES Poppler::Core Qt5::Core) | |
| 61 | check_cxx_source_compiles(" | |
| 62 | #include <goo/GooString.h> | |
| 63 | --- kitinerary-19.04.1/src/config-kitinerary.h.cmake~ 2019-04-29 07:13:27.000000000 +0200 | |
| 64 | +++ kitinerary-19.04.1/src/config-kitinerary.h.cmake 2019-11-03 15:04:23.523057744 +0100 | |
| 65 | @@ -24,6 +24,7 @@ | |
| 66 | #cmakedefine HAVE_POPPLER_0_58 | |
| 67 | #cmakedefine HAVE_POPPLER_0_69 | |
| 68 | #cmakedefine HAVE_POPPLER_0_72 | |
| 69 | +#cmakedefine HAVE_POPPLER_0_82 | |
| 70 | ||
| 71 | #cmakedefine HAVE_ZXING | |
| 72 | #cmakedefine HAVE_ZXING_OLD |