]>
Commit | Line | Data |
---|---|---|
fc333597 MB |
1 | --- inkscape-0.47/src/extension/internal/pdfinput/pdf-parser.cpp~ 2009-11-16 18:29:17.000000000 +0100 |
2 | +++ inkscape-0.47/src/extension/internal/pdfinput/pdf-parser.cpp 2009-12-02 22:41:16.831452938 +0100 | |
3 | @@ -809,7 +809,7 @@ | |
4 | blendingColorSpace = NULL; | |
5 | isolated = knockout = gFalse; | |
6 | if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) { | |
7 | - blendingColorSpace = GfxColorSpace::parse(&obj5); | |
8 | + blendingColorSpace = GfxColorSpace::parse(&obj5, NULL); | |
9 | } | |
10 | obj5.free(); | |
11 | if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) { | |
12 | @@ -1009,9 +1009,9 @@ | |
13 | state->setFillPattern(NULL); | |
14 | res->lookupColorSpace(args[0].getName(), &obj); | |
15 | if (obj.isNull()) { | |
16 | - colorSpace = GfxColorSpace::parse(&args[0]); | |
17 | + colorSpace = GfxColorSpace::parse(&args[0], NULL); | |
18 | } else { | |
19 | - colorSpace = GfxColorSpace::parse(&obj); | |
20 | + colorSpace = GfxColorSpace::parse(&obj, NULL); | |
21 | } | |
22 | obj.free(); | |
23 | if (colorSpace) { | |
24 | @@ -1032,9 +1032,9 @@ | |
25 | state->setStrokePattern(NULL); | |
26 | res->lookupColorSpace(args[0].getName(), &obj); | |
27 | if (obj.isNull()) { | |
28 | - colorSpace = GfxColorSpace::parse(&args[0]); | |
29 | + colorSpace = GfxColorSpace::parse(&args[0], NULL); | |
30 | } else { | |
31 | - colorSpace = GfxColorSpace::parse(&obj); | |
32 | + colorSpace = GfxColorSpace::parse(&obj, NULL); | |
33 | } | |
34 | obj.free(); | |
35 | if (colorSpace) { | |
36 | @@ -1101,7 +1101,7 @@ | |
37 | builder->updateStyle(state); | |
38 | } | |
39 | if (args[numArgs-1].isName() && | |
40 | - (pattern = res->lookupPattern(args[numArgs-1].getName()))) { | |
41 | + (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) { | |
42 | state->setFillPattern(pattern); | |
43 | builder->updateStyle(state); | |
44 | } | |
45 | @@ -1145,7 +1145,7 @@ | |
46 | builder->updateStyle(state); | |
47 | } | |
48 | if (args[numArgs-1].isName() && | |
49 | - (pattern = res->lookupPattern(args[numArgs-1].getName()))) { | |
50 | + (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) { | |
51 | state->setStrokePattern(pattern); | |
52 | builder->updateStyle(state); | |
53 | } | |
54 | @@ -1543,7 +1543,7 @@ | |
55 | double *matrix = NULL; | |
56 | GBool savedState = gFalse; | |
57 | ||
58 | - if (!(shading = res->lookupShading(args[0].getName()))) { | |
59 | + if (!(shading = res->lookupShading(args[0].getName(), NULL))) { | |
60 | return; | |
61 | } | |
62 | ||
63 | @@ -2507,7 +2507,7 @@ | |
ad046c70 | 64 | } |
fc333597 MB |
65 | } |
66 | if (!obj1.isNull()) { | |
67 | - colorSpace = GfxColorSpace::parse(&obj1); | |
68 | + colorSpace = GfxColorSpace::parse(&obj1, NULL); | |
69 | } else if (csMode == streamCSDeviceGray) { | |
70 | colorSpace = new GfxDeviceGrayColorSpace(); | |
71 | } else if (csMode == streamCSDeviceRGB) { | |
72 | @@ -2592,7 +2592,7 @@ | |
73 | obj2.free(); | |
74 | } | |
75 | } | |
76 | - maskColorSpace = GfxColorSpace::parse(&obj1); | |
77 | + maskColorSpace = GfxColorSpace::parse(&obj1, NULL); | |
78 | obj1.free(); | |
79 | if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) { | |
80 | goto err1; | |
81 | @@ -2767,7 +2767,7 @@ | |
82 | if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) { | |
83 | transpGroup = gTrue; | |
84 | if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) { | |
85 | - blendingColorSpace = GfxColorSpace::parse(&obj3); | |
86 | + blendingColorSpace = GfxColorSpace::parse(&obj3, NULL); | |
87 | } | |
88 | obj3.free(); | |
89 | if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) { |