From 25383c0c1eaef546f83e65dc2514f493a0de19c6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Asbj=C3=B8rn=20Sloth=20T=C3=B8nnesen?= Date: Tue, 8 Jun 2010 09:25:16 +0000 Subject: [PATCH] poppler: add new axial and radialShadedFill parameters --- lib/pdf/BitmapOutputDev.cc | 14 ++++++++------ lib/pdf/BitmapOutputDev.h | 4 ++-- lib/pdf/FullBitmapOutputDev.cc | 8 ++++---- lib/pdf/FullBitmapOutputDev.h | 4 ++-- lib/pdf/popplercompat.h | 8 ++++++++ 5 files changed, 24 insertions(+), 14 deletions(-) diff --git a/lib/pdf/BitmapOutputDev.cc b/lib/pdf/BitmapOutputDev.cc index 14a42dd..b94fcde 100644 --- a/lib/pdf/BitmapOutputDev.cc +++ b/lib/pdf/BitmapOutputDev.cc @@ -1434,19 +1434,21 @@ GBool BitmapOutputDev::functionShadedFill(GfxState *state, GfxFunctionShading *s checkNewBitmap(UNKNOWN_BOUNDING_BOX); return rgbdev->functionShadedFill(state, shading); } -GBool BitmapOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading) + +GBool BitmapOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading POPPLER_RAXIAL_MIN_MAX) { msg(" axialShadedFill"); - boolpolydev->axialShadedFill(state, shading); + boolpolydev->axialShadedFill(state, shading POPPLER_RAXIAL_MIN_MAX_ARG); checkNewBitmap(UNKNOWN_BOUNDING_BOX); - return rgbdev->axialShadedFill(state, shading); + return rgbdev->axialShadedFill(state, shading POPPLER_RAXIAL_MIN_MAX_ARG); } -GBool BitmapOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading) + +GBool BitmapOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading POPPLER_RAXIAL_MIN_MAX) { msg(" radialShadedFill"); - boolpolydev->radialShadedFill(state, shading); + boolpolydev->radialShadedFill(state, shading POPPLER_RAXIAL_MIN_MAX_ARG); checkNewBitmap(UNKNOWN_BOUNDING_BOX); - return rgbdev->radialShadedFill(state, shading); + return rgbdev->radialShadedFill(state, shading POPPLER_RAXIAL_MIN_MAX_ARG); } SplashColor black = {0,0,0}; diff --git a/lib/pdf/BitmapOutputDev.h b/lib/pdf/BitmapOutputDev.h index 2869d09..8e72ff6 100644 --- a/lib/pdf/BitmapOutputDev.h +++ b/lib/pdf/BitmapOutputDev.h @@ -121,8 +121,8 @@ public: virtual GBool functionShadedFill(GfxState *state, GfxFunctionShading *shading); - virtual GBool axialShadedFill(GfxState *state, GfxAxialShading *shading); - virtual GBool radialShadedFill(GfxState *state, GfxRadialShading *shading); + virtual GBool axialShadedFill(GfxState *state, GfxAxialShading *shading POPPLER_RAXIAL_MIN_MAX); + virtual GBool radialShadedFill(GfxState *state, GfxRadialShading *shading POPPLER_RAXIAL_MIN_MAX); virtual void clip(GfxState *state); virtual void eoClip(GfxState *state); diff --git a/lib/pdf/FullBitmapOutputDev.cc b/lib/pdf/FullBitmapOutputDev.cc index 320a46d..e809f07 100644 --- a/lib/pdf/FullBitmapOutputDev.cc +++ b/lib/pdf/FullBitmapOutputDev.cc @@ -435,15 +435,15 @@ GBool FullBitmapOutputDev::functionShadedFill(GfxState *state, GfxFunctionShadin msg(" functionShadedFill"); return rgbdev->functionShadedFill(state, shading); } -GBool FullBitmapOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading) +GBool FullBitmapOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading POPPLER_RAXIAL_MIN_MAX) { msg(" axialShadedFill"); - return rgbdev->axialShadedFill(state, shading); + return rgbdev->axialShadedFill(state, shading POPPLER_RAXIAL_MIN_MAX_ARG); } -GBool FullBitmapOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading) +GBool FullBitmapOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading POPPLER_RAXIAL_MIN_MAX) { msg(" radialShadedFill"); - return rgbdev->radialShadedFill(state, shading); + return rgbdev->radialShadedFill(state, shading POPPLER_RAXIAL_MIN_MAX_ARG); } void FullBitmapOutputDev::clip(GfxState *state) diff --git a/lib/pdf/FullBitmapOutputDev.h b/lib/pdf/FullBitmapOutputDev.h index 4936afb..22ae635 100644 --- a/lib/pdf/FullBitmapOutputDev.h +++ b/lib/pdf/FullBitmapOutputDev.h @@ -109,8 +109,8 @@ public: virtual GBool functionShadedFill(GfxState *state, GfxFunctionShading *shading); - virtual GBool axialShadedFill(GfxState *state, GfxAxialShading *shading); - virtual GBool radialShadedFill(GfxState *state, GfxRadialShading *shading); + virtual GBool axialShadedFill(GfxState *state, GfxAxialShading *shading POPPLER_RAXIAL_MIN_MAX); + virtual GBool radialShadedFill(GfxState *state, GfxRadialShading *shading POPPLER_RAXIAL_MIN_MAX); virtual void clip(GfxState *state); virtual void eoClip(GfxState *state); diff --git a/lib/pdf/popplercompat.h b/lib/pdf/popplercompat.h index ab2f07b..b091228 100644 --- a/lib/pdf/popplercompat.h +++ b/lib/pdf/popplercompat.h @@ -34,4 +34,12 @@ char* mktmpname(char*ptr); #endif +#ifdef HAVE_POPPLER + #define POPPLER_RAXIAL_MIN_MAX , double min, double max + #define POPPLER_RAXIAL_MIN_MAX_ARG , min, max +#else + #define POPPLER_RAXIAL_MIN_MAX + #define POPPLER_RAXIAL_MIN_MAX_ARG +#endif + #endif -- 1.7.10.4