=== modified file 'src/extension/internal/pdfinput/pdf-parser.cpp' --- src/extension/internal/pdfinput/pdf-parser.cpp 2014-03-27 01:33:44 +0000 +++ src/extension/internal/pdfinput/pdf-parser.cpp 2014-05-04 13:08:17 +0000 @@ -867,7 +867,7 @@ GBool knockout = gFalse; if (!obj4.dictLookup(const_cast("CS"), &obj5)->isNull()) { #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) - blendingColorSpace = GfxColorSpace::parse(&obj5, NULL); + blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, NULL); #else blendingColorSpace = GfxColorSpace::parse(&obj5); #endif @@ -1102,9 +1102,9 @@ GfxColorSpace *colorSpace = 0; #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) if (obj.isNull()) { - colorSpace = GfxColorSpace::parse(&args[0], NULL); + colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL); } else { - colorSpace = GfxColorSpace::parse(&obj, NULL); + colorSpace = GfxColorSpace::parse(&obj, NULL, NULL); } #else if (obj.isNull()) { @@ -1139,9 +1139,9 @@ res->lookupColorSpace(args[0].getName(), &obj); #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) if (obj.isNull()) { - colorSpace = GfxColorSpace::parse(&args[0], NULL); + colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL); } else { - colorSpace = GfxColorSpace::parse(&obj, NULL); + colorSpace = GfxColorSpace::parse(&obj, NULL, NULL); } #else if (obj.isNull()) { @@ -1233,7 +1233,7 @@ GfxPattern *pattern; #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) if (args[numArgs-1].isName() && - (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) { + (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL, NULL))) { state->setFillPattern(pattern); builder->updateStyle(state); } @@ -1293,7 +1293,7 @@ GfxPattern *pattern; #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) if (args[numArgs-1].isName() && - (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) { + (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL, NULL))) { state->setStrokePattern(pattern); builder->updateStyle(state); } @@ -1747,7 +1747,7 @@ GBool savedState = gFalse; #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) - if (!(shading = res->lookupShading(args[0].getName(), NULL))) { + if (!(shading = res->lookupShading(args[0].getName(), NULL, NULL))) { return; } #else @@ -2818,7 +2818,7 @@ } if (!obj1.isNull()) { #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) - colorSpace = GfxColorSpace::parse(&obj1, NULL); + colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL); #else colorSpace = GfxColorSpace::parse(&obj1); #endif @@ -2910,7 +2910,7 @@ } } #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) - GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL); + GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL); #else GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1); #endif @@ -3100,7 +3100,7 @@ transpGroup = gTrue; if (!obj1.dictLookup(const_cast("CS"), &obj3)->isNull()) { #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) - blendingColorSpace = GfxColorSpace::parse(&obj3, NULL); + blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, NULL); #else blendingColorSpace = GfxColorSpace::parse(&obj3); #endif