[poppler] poppler/CairoOutputDev.cc poppler/CairoOutputDev.h

Carlos Garcia Campos carlosgc at kemper.freedesktop.org
Sat Feb 26 02:11:21 PST 2011


 poppler/CairoOutputDev.cc |    4 ++--
 poppler/CairoOutputDev.h  |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 7a68199b342eb3f33733f7d7446ede8f94130fba
Author: Carlos Garcia Campos <carlosgc at gnome.org>
Date:   Sat Feb 26 11:09:27 2011 +0100

    cairo: Check if cairo version is == 1.11.2 to use mesh gradients api
    
    Cairo API has changed in 1.11.3.

diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc
index 18fc480..7ffeb1f 100644
--- a/poppler/CairoOutputDev.cc
+++ b/poppler/CairoOutputDev.cc
@@ -816,7 +816,7 @@ GBool CairoOutputDev::radialShadedSupportExtend(GfxState *state, GfxRadialShadin
   return (shading->getExtend0() == shading->getExtend1());
 }
 
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 11, 2)
+#if CAIRO_VERSION == CAIRO_VERSION_ENCODE(1, 11, 2)
 GBool CairoOutputDev::gouraudTriangleShadedFill(GfxState *state, GfxGouraudTriangleShading *shading)
 {
   double x0, y0, x1, y1, x2, y2;
@@ -953,7 +953,7 @@ GBool CairoOutputDev::patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *
 
   return gTrue;
 }
-#endif /* CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 11, 2) */
+#endif /* CAIRO_VERSION == CAIRO_VERSION_ENCODE(1, 11, 2) */
 
 void CairoOutputDev::clip(GfxState *state) {
   doPath (cairo, state, state->getPath());
diff --git a/poppler/CairoOutputDev.h b/poppler/CairoOutputDev.h
index 630590c..fa22059 100644
--- a/poppler/CairoOutputDev.h
+++ b/poppler/CairoOutputDev.h
@@ -107,7 +107,7 @@ public:
   // Does this device use functionShadedFill(), axialShadedFill(), and
   // radialShadedFill()?  If this returns false, these shaded fills
   // will be reduced to a series of other drawing operations.
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 11, 2)
+#if CAIRO_VERSION == CAIRO_VERSION_ENCODE(1, 11, 2)
   virtual GBool useShadedFills(int type) { return type <= 7; }
 #else
   virtual GBool useShadedFills(int type) { return type < 4; }
@@ -170,7 +170,7 @@ public:
   virtual GBool axialShadedSupportExtend(GfxState *state, GfxAxialShading *shading);
   virtual GBool radialShadedFill(GfxState *state, GfxRadialShading *shading, double sMin, double sMax);
   virtual GBool radialShadedSupportExtend(GfxState *state, GfxRadialShading *shading);
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 11, 2)
+#if CAIRO_VERSION == CAIRO_VERSION_ENCODE(1, 11, 2)
   virtual GBool gouraudTriangleShadedFill(GfxState *state, GfxGouraudTriangleShading *shading);
   virtual GBool patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *shading);
 #endif


More information about the poppler mailing list