diff options
Diffstat (limited to 'main/inkscape/poppler-0.29.patch')
| -rw-r--r-- | main/inkscape/poppler-0.29.patch | 98 |
1 files changed, 0 insertions, 98 deletions
diff --git a/main/inkscape/poppler-0.29.patch b/main/inkscape/poppler-0.29.patch deleted file mode 100644 index 8b326a4f62..0000000000 --- a/main/inkscape/poppler-0.29.patch +++ /dev/null @@ -1,98 +0,0 @@ -=== modified file 'configure.ac' ---- a/configure.ac 2014-06-20 21:38:59 +0000 -+++ b/configure.ac 2014-12-10 20:32:33 +0000 -@@ -593,6 +593,11 @@ - AC_DEFINE(POPPLER_EVEN_NEWER_COLOR_SPACE_API, 1, [Use even newer color space API from Poppler >= 0.26.0]) - fi - -+PKG_CHECK_MODULES(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, poppler >= 0.29.0, popplernewernewcolorspaceapi=yes, popplernewernewcolorspaceapi=no) -+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 Poppler's GfxPatch no longer uses GfxColor]) - popplergfxcolor="no" -=== modified file 'src/extension/internal/pdfinput/pdf-parser.cpp' ---- a/src/extension/internal/pdfinput/pdf-parser.cpp 2014-06-03 15:44:09 +0000 -+++ b/src/extension/internal/pdfinput/pdf-parser.cpp 2014-12-10 20:32:30 +0000 -@@ -860,7 +860,9 @@ - blendingColorSpace = NULL; - isolated = knockout = gFalse; - if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) { --#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) -+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) -+ blendingColorSpace = GfxColorSpace::parse(NULL, &obj5, NULL, NULL); -+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) - blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, NULL); - #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) - blendingColorSpace = GfxColorSpace::parse(&obj5, NULL); -@@ -1085,7 +1087,13 @@ - - state->setFillPattern(NULL); - res->lookupColorSpace(args[0].getName(), &obj); --#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) -+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) -+ if (obj.isNull()) { -+ colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL); -+ } else { -+ colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL); -+ } -+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) - if (obj.isNull()) { - colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL); - } else { -@@ -1126,7 +1134,13 @@ - - state->setStrokePattern(NULL); - res->lookupColorSpace(args[0].getName(), &obj); --#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) -+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) -+ if (obj.isNull()) { -+ colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL); -+ } else { -+ colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL); -+ } -+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) - if (obj.isNull()) { - colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL); - } else { -@@ -2756,8 +2770,10 @@ - } - } - if (!obj1.isNull()) { --#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) -- colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL); -+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) -+ colorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL); -+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) -+ colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL); - #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) - colorSpace = GfxColorSpace::parse(&obj1, NULL); - #else -@@ -2847,8 +2863,10 @@ - obj2.free(); - } - } --#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) -- GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL); -+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) -+ GfxColorSpace *maskColorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL); -+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) -+ GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL); - #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) - maskColorSpace = GfxColorSpace::parse(&obj1, NULL); - #else -@@ -3040,7 +3058,9 @@ - if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) { - transpGroup = gTrue; - if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) { --#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) -+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) -+ blendingColorSpace = GfxColorSpace::parse(NULL, &obj3, NULL, NULL); -+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) - blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, NULL); - #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) - blendingColorSpace = GfxColorSpace::parse(&obj3, NULL); - - |