Attachment #376216 for bug #509280




	  isolated = knockout = gFalse;
	  if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
	    blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, NULL);
#else
	    blendingColorSpace = GfxColorSpace::parse(&obj5);
#endif

  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, NULL);
  } else {
    colorSpace = GfxColorSpace::parse(&obj, NULL, NULL);
  }
#else
  if (obj.isNull()) {

  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, NULL);
  } else {
    colorSpace = GfxColorSpace::parse(&obj, NULL, NULL);
  }
#else
  if (obj.isNull()) {

    }
#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
    if (args[numArgs-1].isName() &&
	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL, NULL))) {
      state->setFillPattern(pattern);
      builder->updateStyle(state);
    }

    }
#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
    if (args[numArgs-1].isName() &&
	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL, NULL))) {
      state->setStrokePattern(pattern);
      builder->updateStyle(state);
    }

  GBool savedState = gFalse;

#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
  if (!(shading = res->lookupShading(args[0].getName(), NULL, NULL))) {
    return;
  }
#else

    }
    if (!obj1.isNull()) {
#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
      colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
#else
      colorSpace = GfxColorSpace::parse(&obj1);
#endif

	}
      }
#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
      maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
#else
      maskColorSpace = GfxColorSpace::parse(&obj1);
#endif

      transpGroup = gTrue;
      if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, NULL);
#else
	blendingColorSpace = GfxColorSpace::parse(&obj3);
#endif

Return to bug 509280

Lines 861-867 void PdfParser::opSetExtGState(Object args[], int numA Link Here

(-)src/extension/internal/pdfinput/pdf-parser.cpp.orig (-11 / +11 lines)
861	isolated = knockout = gFalse;	861	isolated = knockout = gFalse;
862	if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {	862	if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
863	#if defined(POPPLER_NEW_COLOR_SPACE_API) \|\| defined(POPPLER_NEW_ERRORAPI)	863	#if defined(POPPLER_NEW_COLOR_SPACE_API) \|\| defined(POPPLER_NEW_ERRORAPI)
864	blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);	864	blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, NULL);
865	#else	865	#else
866	blendingColorSpace = GfxColorSpace::parse(&obj5);	866	blendingColorSpace = GfxColorSpace::parse(&obj5);
867	#endif	867	#endif
Lines 1085-1093 void PdfParser::opSetFillColorSpace(Object args[], int Link Here
1085	res->lookupColorSpace(args[0].getName(), &obj);	1085	res->lookupColorSpace(args[0].getName(), &obj);
1086	#if defined(POPPLER_NEW_COLOR_SPACE_API) \|\| defined(POPPLER_NEW_ERRORAPI)	1086	#if defined(POPPLER_NEW_COLOR_SPACE_API) \|\| defined(POPPLER_NEW_ERRORAPI)
1087	if (obj.isNull()) {	1087	if (obj.isNull()) {
1088	colorSpace = GfxColorSpace::parse(&args[0], NULL);	1088	colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
1089	} else {	1089	} else {
1090	colorSpace = GfxColorSpace::parse(&obj, NULL);	1090	colorSpace = GfxColorSpace::parse(&obj, NULL, NULL);
1091	}	1091	}
1092	#else	1092	#else
1093	if (obj.isNull()) {	1093	if (obj.isNull()) {
Lines 1120-1128 void PdfParser::opSetStrokeColorSpace(Object args[], i Link Here
1120	res->lookupColorSpace(args[0].getName(), &obj);	1120	res->lookupColorSpace(args[0].getName(), &obj);
1121	#if defined(POPPLER_NEW_COLOR_SPACE_API) \|\| defined(POPPLER_NEW_ERRORAPI)	1121	#if defined(POPPLER_NEW_COLOR_SPACE_API) \|\| defined(POPPLER_NEW_ERRORAPI)
1122	if (obj.isNull()) {	1122	if (obj.isNull()) {
1123	colorSpace = GfxColorSpace::parse(&args[0], NULL);	1123	colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
1124	} else {	1124	} else {
1125	colorSpace = GfxColorSpace::parse(&obj, NULL);	1125	colorSpace = GfxColorSpace::parse(&obj, NULL, NULL);
1126	}	1126	}
1127	#else	1127	#else
1128	if (obj.isNull()) {	1128	if (obj.isNull()) {
Lines 1213-1219 void PdfParser::opSetFillColorN(Object args[], int num Link Here
1213	}	1213	}
1214	#if defined(POPPLER_NEW_COLOR_SPACE_API) \|\| defined(POPPLER_NEW_ERRORAPI)	1214	#if defined(POPPLER_NEW_COLOR_SPACE_API) \|\| defined(POPPLER_NEW_ERRORAPI)
1215	if (args[numArgs-1].isName() &&	1215	if (args[numArgs-1].isName() &&
1216	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {	1216	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL, NULL))) {
1217	state->setFillPattern(pattern);	1217	state->setFillPattern(pattern);
1218	builder->updateStyle(state);	1218	builder->updateStyle(state);
1219	}	1219	}
Lines 1273-1279 void PdfParser::opSetStrokeColorN(Object args[], int n Link Here
1273	}	1273	}
1274	#if defined(POPPLER_NEW_COLOR_SPACE_API) \|\| defined(POPPLER_NEW_ERRORAPI)	1274	#if defined(POPPLER_NEW_COLOR_SPACE_API) \|\| defined(POPPLER_NEW_ERRORAPI)
1275	if (args[numArgs-1].isName() &&	1275	if (args[numArgs-1].isName() &&
1276	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {	1276	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL, NULL))) {
1277	state->setStrokePattern(pattern);	1277	state->setStrokePattern(pattern);
1278	builder->updateStyle(state);	1278	builder->updateStyle(state);
1279	}	1279	}
Lines 1711-1717 void PdfParser::opShFill(Object args[], int numArgs) { Link Here
1711	GBool savedState = gFalse;	1711	GBool savedState = gFalse;
1712		1712
1713	#if defined(POPPLER_NEW_COLOR_SPACE_API) \|\| defined(POPPLER_NEW_ERRORAPI)	1713	#if defined(POPPLER_NEW_COLOR_SPACE_API) \|\| defined(POPPLER_NEW_ERRORAPI)
1714	if (!(shading = res->lookupShading(args[0].getName(), NULL))) {	1714	if (!(shading = res->lookupShading(args[0].getName(), NULL, NULL))) {
1715	return;	1715	return;
1716	}	1716	}
1717	#else	1717	#else
Lines 2727-2733 void PdfParser::doImage(Object ref, Stream str, GBoo Link Here
2727	}	2727	}
2728	if (!obj1.isNull()) {	2728	if (!obj1.isNull()) {
2729	#if defined(POPPLER_NEW_COLOR_SPACE_API) \|\| defined(POPPLER_NEW_ERRORAPI)	2729	#if defined(POPPLER_NEW_COLOR_SPACE_API) \|\| defined(POPPLER_NEW_ERRORAPI)
2730	colorSpace = GfxColorSpace::parse(&obj1, NULL);	2730	colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
2731	#else	2731	#else
2732	colorSpace = GfxColorSpace::parse(&obj1);	2732	colorSpace = GfxColorSpace::parse(&obj1);
2733	#endif	2733	#endif
Lines 2816-2822 void PdfParser::doImage(Object ref, Stream str, GBoo Link Here
2816	}	2816	}
2817	}	2817	}
2818	#if defined(POPPLER_NEW_COLOR_SPACE_API) \|\| defined(POPPLER_NEW_ERRORAPI)	2818	#if defined(POPPLER_NEW_COLOR_SPACE_API) \|\| defined(POPPLER_NEW_ERRORAPI)
2819	maskColorSpace = GfxColorSpace::parse(&obj1, NULL);	2819	maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
2820	#else	2820	#else
2821	maskColorSpace = GfxColorSpace::parse(&obj1);	2821	maskColorSpace = GfxColorSpace::parse(&obj1);
2822	#endif	2822	#endif
Lines 3007-3013 void PdfParser::doForm(Object *str) { Link Here
3007	transpGroup = gTrue;	3007	transpGroup = gTrue;
3008	if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {	3008	if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
3009	#if defined(POPPLER_NEW_COLOR_SPACE_API) \|\| defined(POPPLER_NEW_ERRORAPI)	3009	#if defined(POPPLER_NEW_COLOR_SPACE_API) \|\| defined(POPPLER_NEW_ERRORAPI)
3010	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);	3010	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, NULL);
3011	#else	3011	#else
3012	blendingColorSpace = GfxColorSpace::parse(&obj3);	3012	blendingColorSpace = GfxColorSpace::parse(&obj3);
3013	#endif	3013	#endif