inkscape-poppler-0.26.patch

   1 --- src/extension/internal/pdfinput/pdf-parser.cpp.orig 2014-04-28 13:42:17.843140695 +0000
   2 +++ src/extension/internal/pdfinput/pdf-parser.cpp      2014-04-28 14:05:10.646106685 +0000
   3 @@ -861,7 +861,7 @@
   4           isolated = knockout = gFalse;
   5           if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
   6  #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
   7 -           blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
   8 +           blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, NULL);
   9  #else
  10             blendingColorSpace = GfxColorSpace::parse(&obj5);
  11  #endif
  12 @@ -1085,9 +1085,9 @@
  13    res->lookupColorSpace(args[0].getName(), &obj);
  14  #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
  15    if (obj.isNull()) {
  16 -    colorSpace = GfxColorSpace::parse(&args[0], NULL);
  17 +    colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
  18    } else {
  19 -    colorSpace = GfxColorSpace::parse(&obj, NULL);
  20 +    colorSpace = GfxColorSpace::parse(&obj, NULL, NULL);
  21    }
  22  #else
  23    if (obj.isNull()) {
  24 @@ -1120,9 +1120,9 @@
  25    res->lookupColorSpace(args[0].getName(), &obj);
  26  #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
  27    if (obj.isNull()) {
  28 -    colorSpace = GfxColorSpace::parse(&args[0], NULL);
  29 +    colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
  30    } else {
  31 -    colorSpace = GfxColorSpace::parse(&obj, NULL);
  32 +    colorSpace = GfxColorSpace::parse(&obj, NULL, NULL);
  33    }
  34  #else
  35    if (obj.isNull()) {
  36 @@ -1213,7 +1213,7 @@
  37      }
  38  #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
  39      if (args[numArgs-1].isName() &&
  40 -       (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
  41 +       (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL, NULL))) {
  42        state->setFillPattern(pattern);
  43        builder->updateStyle(state);
  44      }
  45 @@ -1273,7 +1273,7 @@
  46      }
  47  #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
  48      if (args[numArgs-1].isName() &&
  49 -       (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
  50 +       (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL, NULL))) {
  51        state->setStrokePattern(pattern);
  52        builder->updateStyle(state);
  53      }
  54 @@ -1711,7 +1711,7 @@
  55    GBool savedState = gFalse;
  56
  57  #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
  58 -  if (!(shading = res->lookupShading(args[0].getName(), NULL))) {
  59 +  if (!(shading = res->lookupShading(args[0].getName(), NULL, NULL))) {
  60      return;
  61    }
  62  #else
  63 @@ -2727,7 +2727,7 @@
  64      }
  65      if (!obj1.isNull()) {
  66  #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
  67 -      colorSpace = GfxColorSpace::parse(&obj1, NULL);
  68 +      colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
  69  #else
  70        colorSpace = GfxColorSpace::parse(&obj1);
  71  #endif
  72 @@ -2816,7 +2816,7 @@
  73         }
  74        }
  75  #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
  76 -      maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
  77 +      maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
  78  #else
  79        maskColorSpace = GfxColorSpace::parse(&obj1);
  80  #endif
  81 @@ -3007,7 +3007,7 @@
  82        transpGroup = gTrue;
  83        if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
  84  #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
  85 -       blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
  86 +       blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, NULL);
  87  #else
  88         blendingColorSpace = GfxColorSpace::parse(&obj3);
  89  #endif