commit 6f7d0e79120a973eb4a17abbd8ac5bef6be06804

Author: Matthias Kilian <Unknown>

Date:   Wed Jun 4 15:01:44 2014 +0200

    Fix build failure with poppler 0.26 (Bug #1315142)

diff --git a/configure.ac b/configure.ac

index 712aa68..f78668d 100644

--- a/configure.ac

+++ b/configure.ac

@@ -491,6 +491,11 @@ else

 	AC_MSG_RESULT(no)

 fi

+PKG_CHECK_MODULES(POPPLER_EVEN_NEWER_COLOR_SPACE_API, poppler >= 0.26.0, popplernewercolorspaceapi=yes, popplernewercolorspaceapi=no)

+if test "x$popplernewercolorspaceapi" = "xyes"; then

+	AC_DEFINE(POPPLER_EVEN_NEWER_COLOR_SPACE_API, 1, [Use even newer color space API from Poppler >= 0.26.0])

+fi

+

 # Poppler's b604a008 commit changes this

 AC_MSG_CHECKING([whether Poppler's GfxPatch no longer uses GfxColor])

 popplergfxcolor="no"

diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp

index b398486..c5f03e5 100644

--- a/src/extension/internal/pdfinput/pdf-parser.cpp

+++ b/src/extension/internal/pdfinput/pdf-parser.cpp

@@ -866,7 +866,9 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/)

 	  blendingColorSpace = NULL;

 	  isolated = knockout = gFalse;

 	  if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {

-#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)

+#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)

+	    blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, NULL);

+#elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)

 	    blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);

 #else

 	    blendingColorSpace = GfxColorSpace::parse(&obj5);

@@ -1100,7 +1102,13 @@ void PdfParser::opSetFillColorSpace(Object args[], int /*numArgs*/)

   state->setFillPattern(NULL);

   res->lookupColorSpace(args[0].getName(), &obj);

-#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)

+#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)

+  if (obj.isNull()) {

+    colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);

+  } else {

+    colorSpace = GfxColorSpace::parse(&obj, NULL, NULL);

+  }

+#elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)

   if (obj.isNull()) {

     colorSpace = GfxColorSpace::parse(&args[0], NULL);

   } else {

@@ -1137,7 +1145,13 @@ void PdfParser::opSetStrokeColorSpace(Object args[], int /*numArgs*/)

   state->setStrokePattern(NULL);

   res->lookupColorSpace(args[0].getName(), &obj);

-#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)

+#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)

+  if (obj.isNull()) {

+    colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);

+  } else {

+    colorSpace = GfxColorSpace::parse(&obj, NULL, NULL);

+  }

+#elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)

   if (obj.isNull()) {

     colorSpace = GfxColorSpace::parse(&args[0], NULL);

   } else {

@@ -1231,7 +1245,13 @@ void PdfParser::opSetFillColorN(Object args[], int numArgs) {

       state->setFillColor(&color;;

       builder->updateStyle(state);

     }

-#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)

+#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)

+    if (args[numArgs-1].isName() &&

+	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL, NULL))) {

+      state->setFillPattern(pattern);

+      builder->updateStyle(state);

+    }

+#elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)

     if (args[numArgs-1].isName() &&

 	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {

       state->setFillPattern(pattern);

@@ -1291,7 +1311,13 @@ void PdfParser::opSetStrokeColorN(Object args[], int numArgs) {

       state->setStrokeColor(&color;;

       builder->updateStyle(state);

     }

-#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)

+#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)

+    if (args[numArgs-1].isName() &&

+	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL, NULL))) {

+      state->setStrokePattern(pattern);

+      builder->updateStyle(state);

+    }

+#elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)

     if (args[numArgs-1].isName() &&

 	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {

       state->setStrokePattern(pattern);

@@ -1746,7 +1772,11 @@ void PdfParser::opShFill(Object args[], int /*numArgs*/)

   double *matrix = NULL;

   GBool savedState = gFalse;

-#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)

+#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)

+  if (!(shading = res->lookupShading(args[0].getName(), NULL, NULL))) {

+    return;

+  }

+#elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)

   if (!(shading = res->lookupShading(args[0].getName(), NULL))) {

     return;

   }

@@ -2817,7 +2847,9 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg)

       }

     }

     if (!obj1.isNull()) {

-#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)

+#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)

+      colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);

+#elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)

       colorSpace = GfxColorSpace::parse(&obj1, NULL);

 #else

       colorSpace = GfxColorSpace::parse(&obj1);

@@ -2909,7 +2941,9 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg)

 	  obj2.free();

 	}

       }

-#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)

+#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)

+      maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);

+#elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)

       maskColorSpace = GfxColorSpace::parse(&obj1, NULL);

 #else

       maskColorSpace = GfxColorSpace::parse(&obj1);

@@ -3099,7 +3133,9 @@ void PdfParser::doForm(Object *str) {

     if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {

       transpGroup = gTrue;

       if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {

-#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)

+#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)

+	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, NULL);

+#elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)

 	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);

 #else

 	blendingColorSpace = GfxColorSpace::parse(&obj3);