summaryrefslogtreecommitdiffstats
path: root/extra/inkscape/50-poppler-API.dpatch
diff options
context:
space:
mode:
authortnut <thierryn1 at hispeed dot ch>2010-10-14 09:08:22 +0200
committertnut <thierryn1 at hispeed dot ch>2010-10-14 09:08:22 +0200
commit946f091e3f7e4d959f9fba8f9aa955ff6bfc0b4d (patch)
tree36d98fca9c324d8bb066615dba0d5b5cb4f7c78c /extra/inkscape/50-poppler-API.dpatch
parentbf109da9602a6799f5adcd452321fd95f1803394 (diff)
downloadnutyx-extra-946f091e3f7e4d959f9fba8f9aa955ff6bfc0b4d.tar.gz
nutyx-extra-946f091e3f7e4d959f9fba8f9aa955ff6bfc0b4d.tar.bz2
nutyx-extra-946f091e3f7e4d959f9fba8f9aa955ff6bfc0b4d.tar.xz
nutyx-extra-946f091e3f7e4d959f9fba8f9aa955ff6bfc0b4d.zip
inkscape, port nettoyé
Diffstat (limited to 'extra/inkscape/50-poppler-API.dpatch')
-rw-r--r--extra/inkscape/50-poppler-API.dpatch97
1 files changed, 0 insertions, 97 deletions
diff --git a/extra/inkscape/50-poppler-API.dpatch b/extra/inkscape/50-poppler-API.dpatch
deleted file mode 100644
index b97969de1..000000000
--- a/extra/inkscape/50-poppler-API.dpatch
+++ /dev/null
@@ -1,97 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50-poppler-API.patch.dpatch by Kees Cook <kees@ubuntu.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: https://bugs.launchpad.net/inkscape/+bug/487038
-
-@DPATCH@
-diff -urNad inkscape~/src/extension/internal/pdfinput/pdf-parser.cpp inkscape/src/extension/internal/pdfinput/pdf-parser.cpp
---- inkscape~/src/extension/internal/pdfinput/pdf-parser.cpp 2009-10-10 12:17:47.000000000 -0700
-+++ inkscape/src/extension/internal/pdfinput/pdf-parser.cpp 2009-12-23 22:34:13.000000000 -0800
-@@ -809,7 +809,7 @@
- blendingColorSpace = NULL;
- isolated = knockout = gFalse;
- if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
-- blendingColorSpace = GfxColorSpace::parse(&obj5);
-+ blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
- }
- obj5.free();
- if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) {
-@@ -1009,9 +1009,9 @@
- state->setFillPattern(NULL);
- res->lookupColorSpace(args[0].getName(), &obj);
- if (obj.isNull()) {
-- colorSpace = GfxColorSpace::parse(&args[0]);
-+ colorSpace = GfxColorSpace::parse(&args[0], NULL);
- } else {
-- colorSpace = GfxColorSpace::parse(&obj);
-+ colorSpace = GfxColorSpace::parse(&obj, NULL);
- }
- obj.free();
- if (colorSpace) {
-@@ -1032,9 +1032,9 @@
- state->setStrokePattern(NULL);
- res->lookupColorSpace(args[0].getName(), &obj);
- if (obj.isNull()) {
-- colorSpace = GfxColorSpace::parse(&args[0]);
-+ colorSpace = GfxColorSpace::parse(&args[0], NULL);
- } else {
-- colorSpace = GfxColorSpace::parse(&obj);
-+ colorSpace = GfxColorSpace::parse(&obj, NULL);
- }
- obj.free();
- if (colorSpace) {
-@@ -1101,7 +1101,7 @@
- builder->updateStyle(state);
- }
- if (args[numArgs-1].isName() &&
-- (pattern = res->lookupPattern(args[numArgs-1].getName()))) {
-+ (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
- state->setFillPattern(pattern);
- builder->updateStyle(state);
- }
-@@ -1145,7 +1145,7 @@
- builder->updateStyle(state);
- }
- if (args[numArgs-1].isName() &&
-- (pattern = res->lookupPattern(args[numArgs-1].getName()))) {
-+ (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
- state->setStrokePattern(pattern);
- builder->updateStyle(state);
- }
-@@ -1543,7 +1543,7 @@
- double *matrix = NULL;
- GBool savedState = gFalse;
-
-- if (!(shading = res->lookupShading(args[0].getName()))) {
-+ if (!(shading = res->lookupShading(args[0].getName(), NULL))) {
- return;
- }
-
-@@ -2507,7 +2507,7 @@
- }
- }
- if (!obj1.isNull()) {
-- colorSpace = GfxColorSpace::parse(&obj1);
-+ colorSpace = GfxColorSpace::parse(&obj1, NULL);
- } else if (csMode == streamCSDeviceGray) {
- colorSpace = new GfxDeviceGrayColorSpace();
- } else if (csMode == streamCSDeviceRGB) {
-@@ -2592,7 +2592,7 @@
- obj2.free();
- }
- }
-- maskColorSpace = GfxColorSpace::parse(&obj1);
-+ maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
- obj1.free();
- if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) {
- goto err1;
-@@ -2767,7 +2767,7 @@
- if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
- transpGroup = gTrue;
- if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
-- blendingColorSpace = GfxColorSpace::parse(&obj3);
-+ blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
- }
- obj3.free();
- if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) {