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
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);
11 if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) {
13 state->setFillPattern(NULL);
14 res->lookupColorSpace(args[0].getName(), &obj);
16 - colorSpace = GfxColorSpace::parse(&args[0]);
17 + colorSpace = GfxColorSpace::parse(&args[0], NULL);
19 - colorSpace = GfxColorSpace::parse(&obj);
20 + colorSpace = GfxColorSpace::parse(&obj, NULL);
25 state->setStrokePattern(NULL);
26 res->lookupColorSpace(args[0].getName(), &obj);
28 - colorSpace = GfxColorSpace::parse(&args[0]);
29 + colorSpace = GfxColorSpace::parse(&args[0], NULL);
31 - colorSpace = GfxColorSpace::parse(&obj);
32 + colorSpace = GfxColorSpace::parse(&obj, NULL);
37 builder->updateStyle(state);
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);
46 builder->updateStyle(state);
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);
55 double *matrix = NULL;
56 GBool savedState = gFalse;
58 - if (!(shading = res->lookupShading(args[0].getName()))) {
59 + if (!(shading = res->lookupShading(args[0].getName(), NULL))) {
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) {
76 - maskColorSpace = GfxColorSpace::parse(&obj1);
77 + maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
79 if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) {
82 if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
84 if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
85 - blendingColorSpace = GfxColorSpace::parse(&obj3);
86 + blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
89 if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) {