1 $NetBSD: patch-ak,v 1.2 2009/11/22 16:08:46 drochner Exp $
3 --- src/extension/internal/pdfinput/pdf-parser.cpp.orig 2008-03-11 05:20:21.000000000 +0100
4 +++ src/extension/internal/pdfinput/pdf-parser.cpp
5 @@ -810,7 +810,7 @@ void PdfParser::opSetExtGState(Object ar
6 blendingColorSpace = NULL;
7 isolated = knockout = gFalse;
8 if (!obj4.dictLookup("CS", &obj5)->isNull()) {
9 - blendingColorSpace = GfxColorSpace::parse(&obj5);
10 + blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
13 if (obj4.dictLookup("I", &obj5)->isBool()) {
14 @@ -1010,9 +1010,9 @@ void PdfParser::opSetFillColorSpace(Obje
15 state->setFillPattern(NULL);
16 res->lookupColorSpace(args[0].getName(), &obj);
18 - colorSpace = GfxColorSpace::parse(&args[0]);
19 + colorSpace = GfxColorSpace::parse(&args[0], NULL);
21 - colorSpace = GfxColorSpace::parse(&obj);
22 + colorSpace = GfxColorSpace::parse(&obj, NULL);
26 @@ -1033,9 +1033,9 @@ void PdfParser::opSetStrokeColorSpace(Ob
27 state->setStrokePattern(NULL);
28 res->lookupColorSpace(args[0].getName(), &obj);
30 - colorSpace = GfxColorSpace::parse(&args[0]);
31 + colorSpace = GfxColorSpace::parse(&args[0], NULL);
33 - colorSpace = GfxColorSpace::parse(&obj);
34 + colorSpace = GfxColorSpace::parse(&obj, NULL);
38 @@ -1102,7 +1102,7 @@ void PdfParser::opSetFillColorN(Object a
39 builder->updateStyle(state);
41 if (args[numArgs-1].isName() &&
42 - (pattern = res->lookupPattern(args[numArgs-1].getName()))) {
43 + (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
44 state->setFillPattern(pattern);
45 builder->updateStyle(state);
47 @@ -1146,7 +1146,7 @@ void PdfParser::opSetStrokeColorN(Object
48 builder->updateStyle(state);
50 if (args[numArgs-1].isName() &&
51 - (pattern = res->lookupPattern(args[numArgs-1].getName()))) {
52 + (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
53 state->setStrokePattern(pattern);
54 builder->updateStyle(state);
56 @@ -1544,7 +1544,7 @@ void PdfParser::opShFill(Object args[],
57 double *matrix = NULL;
58 GBool savedState = gFalse;
60 - if (!(shading = res->lookupShading(args[0].getName()))) {
61 + if (!(shading = res->lookupShading(args[0].getName(), NULL))) {
65 @@ -2196,7 +2196,7 @@ void PdfParser::doShowText(GooString *s)
71 double x, y, dx, dy, dx2, dy2, curX, curY, tdx, tdy, lineX, lineY;
72 double originX, originY, tOriginX, tOriginY;
73 double oldCTM[6], newCTM[6];
74 @@ -2244,7 +2244,7 @@ void PdfParser::doShowText(GooString *s)
77 n = font->getNextChar(p, len, &code,
78 - u, (int)(sizeof(u) / sizeof(Unicode)), &uLen,
80 &dx, &dy, &originX, &originY);
81 dx = dx * state->getFontSize() + state->getCharSpace();
82 if (n == 1 && *p == ' ') {
83 @@ -2293,7 +2293,7 @@ void PdfParser::doShowText(GooString *s)
86 n = font->getNextChar(p, len, &code,
87 - u, (int)(sizeof(u) / sizeof(Unicode)), &uLen,
89 &dx, &dy, &originX, &originY);
92 @@ -2487,7 +2487,7 @@ void PdfParser::doImage(Object *ref, Str
96 - colorSpace = GfxColorSpace::parse(&obj1);
97 + colorSpace = GfxColorSpace::parse(&obj1, NULL);
98 } else if (csMode == streamCSDeviceGray) {
99 colorSpace = new GfxDeviceGrayColorSpace();
100 } else if (csMode == streamCSDeviceRGB) {
101 @@ -2572,7 +2572,7 @@ void PdfParser::doImage(Object *ref, Str
105 - maskColorSpace = GfxColorSpace::parse(&obj1);
106 + maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
108 if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) {
110 @@ -2747,7 +2747,7 @@ void PdfParser::doForm(Object *str) {
111 if (obj1.dictLookup("S", &obj2)->isName("Transparency")) {
113 if (!obj1.dictLookup("CS", &obj3)->isNull()) {
114 - blendingColorSpace = GfxColorSpace::parse(&obj3);
115 + blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
118 if (obj1.dictLookup("I", &obj3)->isBool()) {