1
#! /bin/sh /usr/share/dpatch/dpatch-run
2
## 50-poppler-API.patch.dpatch by Kees Cook <kees@ubuntu.com>
4
## All lines beginning with `## DP:' are a description of the patch.
5
## DP: https://bugs.launchpad.net/inkscape/+bug/487038
8
diff -urNad inkscape~/src/extension/internal/pdfinput/pdf-parser.cpp inkscape/src/extension/internal/pdfinput/pdf-parser.cpp
9
--- inkscape~/src/extension/internal/pdfinput/pdf-parser.cpp 2009-10-10 12:17:47.000000000 -0700
10
+++ inkscape/src/extension/internal/pdfinput/pdf-parser.cpp 2009-12-23 22:34:13.000000000 -0800
12
blendingColorSpace = NULL;
13
isolated = knockout = gFalse;
14
if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
15
- blendingColorSpace = GfxColorSpace::parse(&obj5);
16
+ blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
19
if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) {
21
state->setFillPattern(NULL);
22
res->lookupColorSpace(args[0].getName(), &obj);
24
- colorSpace = GfxColorSpace::parse(&args[0]);
25
+ colorSpace = GfxColorSpace::parse(&args[0], NULL);
27
- colorSpace = GfxColorSpace::parse(&obj);
28
+ colorSpace = GfxColorSpace::parse(&obj, NULL);
33
state->setStrokePattern(NULL);
34
res->lookupColorSpace(args[0].getName(), &obj);
36
- colorSpace = GfxColorSpace::parse(&args[0]);
37
+ colorSpace = GfxColorSpace::parse(&args[0], NULL);
39
- colorSpace = GfxColorSpace::parse(&obj);
40
+ colorSpace = GfxColorSpace::parse(&obj, NULL);
45
builder->updateStyle(state);
47
if (args[numArgs-1].isName() &&
48
- (pattern = res->lookupPattern(args[numArgs-1].getName()))) {
49
+ (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
50
state->setFillPattern(pattern);
51
builder->updateStyle(state);
54
builder->updateStyle(state);
56
if (args[numArgs-1].isName() &&
57
- (pattern = res->lookupPattern(args[numArgs-1].getName()))) {
58
+ (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
59
state->setStrokePattern(pattern);
60
builder->updateStyle(state);
63
double *matrix = NULL;
64
GBool savedState = gFalse;
66
- if (!(shading = res->lookupShading(args[0].getName()))) {
67
+ if (!(shading = res->lookupShading(args[0].getName(), NULL))) {
75
- colorSpace = GfxColorSpace::parse(&obj1);
76
+ colorSpace = GfxColorSpace::parse(&obj1, NULL);
77
} else if (csMode == streamCSDeviceGray) {
78
colorSpace = new GfxDeviceGrayColorSpace();
79
} else if (csMode == streamCSDeviceRGB) {
84
- maskColorSpace = GfxColorSpace::parse(&obj1);
85
+ maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
87
if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) {
90
if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
92
if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
93
- blendingColorSpace = GfxColorSpace::parse(&obj3);
94
+ blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
97
if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) {