Attachment 895661 Details for Bug 1097945 – poppler-0.26 patch

[patch] poppler-0.26 patch

inkscape-0.48.4_poppler.patch (text/plain), 3.94 KB, created by Sandro Mani on 2014-05-14 23:07:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sandro Mani

Created: 2014-05-14 23:07:46 UTC

Size: 3.94 KB

patch

obsolete

>diff -rupN inkscape-0.48.4/src/extension/internal/pdfinput/pdf-parser.cpp inkscape-0.48.4-new/src/extension/internal/pdfinput/pdf-parser.cpp
>--- inkscape-0.48.4/src/extension/internal/pdfinput/pdf-parser.cpp	2012-12-13 18:00:46.726633000 +0100
>+++ inkscape-0.48.4-new/src/extension/internal/pdfinput/pdf-parser.cpp	2014-05-15 00:06:39.247501345 +0200
>@@ -861,7 +861,7 @@ void PdfParser::opSetExtGState(Object ar
> 	  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);
>+	    blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, NULL);
> #else
> 	    blendingColorSpace = GfxColorSpace::parse(&obj5);
> #endif
>@@ -1085,9 +1085,9 @@ void PdfParser::opSetFillColorSpace(Obje
>   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()) {
>@@ -1120,9 +1120,9 @@ void PdfParser::opSetStrokeColorSpace(Ob
>   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()) {
>@@ -1213,7 +1213,7 @@ void PdfParser::opSetFillColorN(Object a
>     }
> #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);
>     }
>@@ -1273,7 +1273,7 @@ void PdfParser::opSetStrokeColorN(Object
>     }
> #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);
>     }
>@@ -1711,7 +1711,7 @@ void PdfParser::opShFill(Object args[],
>   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
>@@ -2727,7 +2727,7 @@ void PdfParser::doImage(Object *ref, Str
>     }
>     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
>@@ -2816,7 +2816,7 @@ void PdfParser::doImage(Object *ref, Str
> 	}
>       }
> #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
>-      maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
>+      maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
> #else
>       maskColorSpace = GfxColorSpace::parse(&obj1);
> #endif
>@@ -3007,7 +3007,7 @@ void PdfParser::doForm(Object *str) {
>       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);
>+	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, NULL);
> #else
> 	blendingColorSpace = GfxColorSpace::parse(&obj3);
> #endif

Actions: View | Diff

Attachments on bug 1097945: 895661 | 895662