diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2016-01-11 14:29:11 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2016-01-11 14:29:11 +0000 |
| commit | bc664c1d06f311985502890cb25425f9bd340761 (patch) | |
| tree | 787ca76eea6d935ffc8862e60c15b55b8216596b | |
| parent | Bump poppler dep to 0.12.2 (see bug #1419263) (diff) | |
| download | inkscape-bc664c1d06f311985502890cb25425f9bd340761.tar.gz inkscape-bc664c1d06f311985502890cb25425f9bd340761.zip | |
Bump poppler dep to 0.15.1 (see bug #1419263)
(bzr r14572)
| -rw-r--r-- | configure.ac | 24 | ||||
| -rw-r--r-- | src/extension/internal/pdfinput/pdf-parser.cpp | 8 |
2 files changed, 3 insertions, 29 deletions
diff --git a/configure.ac b/configure.ac index 6865f611d..edb4f4026 100644 --- a/configure.ac +++ b/configure.ac @@ -432,12 +432,12 @@ AC_ARG_ENABLE(poppler-cairo, [enable_poppler_cairo=$enableval], [enable_poppler_cairo=yes]) POPPLER_CFLAGS="" -PKG_CHECK_MODULES(POPPLER, poppler >= 0.12.2, poppler=yes, poppler=no) +PKG_CHECK_MODULES(POPPLER, poppler >= 0.15.1, poppler=yes, poppler=no) if test "x$poppler" = "xyes"; then dnl Working libpoppler dnl Have to test libpoppler-glib presence - PKG_CHECK_MODULES(POPPLER_GLIB, poppler-glib >= 0.12.2, poppler_glib=yes, poppler_glib=no) + PKG_CHECK_MODULES(POPPLER_GLIB, poppler-glib >= 0.15.1, poppler_glib=yes, poppler_glib=no) if test "x$poppler_glib" = "xyes"; then dnl Working libpoppler-glib found dnl Check whether the Cairo SVG backend is available @@ -449,7 +449,7 @@ if test "x$poppler" = "xyes"; then if test "x$enable_poppler_cairo" = "xyes"; then dnl Have to test libpoppler-cairo presence for PDF preview dnl AC_CHECK_HEADER(Magick++.h, magick_ok=yes, magick_ok=no) - PKG_CHECK_MODULES(POPPLER_CAIRO, poppler-cairo >= 0.12.2, poppler_cairo=yes, poppler_cairo=no) + PKG_CHECK_MODULES(POPPLER_CAIRO, poppler-cairo >= 0.15.1, poppler_cairo=yes, poppler_cairo=no) if test "x$poppler_glib" = "xyes" -a "x$poppler_cairo" = "xyes" -a \ "x$cairo_svg" = "xno" then @@ -491,24 +491,6 @@ if test "x$popplernewernewcolorspaceapi" = "xyes"; then AC_DEFINE(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, 1, [Use even newer new color space API from Poppler >= 0.29.0]) fi -# Poppler's b604a008 commit changes this -AC_MSG_CHECKING([whether GfxPatch in Poppler no longer uses GfxColor]) -popplergfxcolor="no" -AC_COMPILE_IFELSE([AC_LANG_PROGRAM( - [[#include <GfxState.h>]], -[[ - GfxPatch::ColorValue color = {c: {0}}; - GfxPatch patch; - patch.color[0][0] = color; -]]) -], [popplergfxcolor=yes]) -if test "x$popplergfxcolor" = "xyes"; then - AC_DEFINE(POPPLER_NEW_GFXPATCH, 1, [GfxPatch no longer uses GfxColor in >= 0.15.1]) - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT(no) -fi - CPPFLAGS=$ink_svd_CPPFLAGS LIBS=$ink_svd_LIBS diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp index 8b0506406..50d44d7a8 100644 --- a/src/extension/internal/pdfinput/pdf-parser.cpp +++ b/src/extension/internal/pdfinput/pdf-parser.cpp @@ -2131,9 +2131,7 @@ void PdfParser::fillPatch(GfxPatch *patch, int nComps, int depth) { GfxPatch patch01 = blankPatch(); GfxPatch patch10 = blankPatch(); GfxPatch patch11 = blankPatch(); -#ifdef POPPLER_NEW_GFXPATCH GfxColor color = {{0}}; -#endif double xx[4][8]; double yy[4][8]; double xxm; @@ -2153,16 +2151,10 @@ void PdfParser::fillPatch(GfxPatch *patch, int nComps, int depth) { > patchColorDelta) { break; } -#ifdef POPPLER_NEW_GFXPATCH color.c[i] = GfxColorComp(patch->color[0][0].c[i]); -#endif } if (i == nComps || depth == maxDepths[pdfPatchMeshShading-1]) { -#ifdef POPPLER_NEW_GFXPATCH state->setFillColor(&color); -#else - state->setFillColor(&patch->color[0][0]); -#endif state->moveTo(patch->x[0][0], patch->y[0][0]); state->curveTo(patch->x[0][1], patch->y[0][1], patch->x[0][2], patch->y[0][2], |