fixed compile for new xpdf versions

diff --git a/lib/pdf/BitmapOutputDev.cc b/lib/pdf/BitmapOutputDev.cc
index 6849eee..153cd02 100644 (file)
--- a/lib/pdf/BitmapOutputDev.cc
+++ b/lib/pdf/BitmapOutputDev.cc
@@ -19,6 +19,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <memory.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <memory.h>

+#include "config.h"

 #include "BitmapOutputDev.h"
 #include "GFXOutputDev.h"
 #include "SplashBitmap.h"
 #include "BitmapOutputDev.h"
 #include "GFXOutputDev.h"
 #include "SplashBitmap.h"

@@ -568,6 +569,7 @@ void BitmapOutputDev::eoFill(GfxState *state)
     msg("<verbose> eoFill");
     rgbdev->eoFill(state);
 }
     msg("<verbose> eoFill");
     rgbdev->eoFill(state);
 }

+#if (xpdfMajorVersion < 3) || (xpdfMinorVersion < 2) || (xpdfUpdateVersion < 7)

 void BitmapOutputDev::tilingPatternFill(GfxState *state, Object *str,
                               int paintType, Dict *resDict,
                               double *mat, double *bbox,
 void BitmapOutputDev::tilingPatternFill(GfxState *state, Object *str,
                               int paintType, Dict *resDict,
                               double *mat, double *bbox,

@@ -577,6 +579,18 @@ void BitmapOutputDev::tilingPatternFill(GfxState *state, Object *str,
     msg("<verbose> tilingPatternFill");
     rgbdev->tilingPatternFill(state, str, paintType, resDict, mat, bbox, x0, y0, x1, y1, xStep, yStep);
 }
     msg("<verbose> tilingPatternFill");
     rgbdev->tilingPatternFill(state, str, paintType, resDict, mat, bbox, x0, y0, x1, y1, xStep, yStep);
 }

+#else
+void BitmapOutputDev::tilingPatternFill(GfxState *state, Gfx *gfx, Object *str,
+                              int paintType, Dict *resDict,
+                              double *mat, double *bbox,
+                              int x0, int y0, int x1, int y1,
+                              double xStep, double yStep) 
+{
+    msg("<verbose> tilingPatternFill");
+    rgbdev->tilingPatternFill(state, gfx, str, paintType, resDict, mat, bbox, x0, y0, x1, y1, xStep, yStep);
+}
+#endif
+

 GBool BitmapOutputDev::functionShadedFill(GfxState *state, GfxFunctionShading *shading) 
 {
     msg("<verbose> functionShadedFill");
 GBool BitmapOutputDev::functionShadedFill(GfxState *state, GfxFunctionShading *shading) 
 {
     msg("<verbose> functionShadedFill");

diff --git a/lib/pdf/BitmapOutputDev.h b/lib/pdf/BitmapOutputDev.h
index 071c64a..8ec6555 100644 (file)
--- a/lib/pdf/BitmapOutputDev.h
+++ b/lib/pdf/BitmapOutputDev.h
@@ -104,11 +104,20 @@ public:
     virtual void stroke(GfxState *state);
     virtual void fill(GfxState *state);
     virtual void eoFill(GfxState *state);
     virtual void stroke(GfxState *state);
     virtual void fill(GfxState *state);
     virtual void eoFill(GfxState *state);

+#if (xpdfMajorVersion < 3) || (xpdfMinorVersion < 2) || (xpdfUpdateVersion < 7)

     virtual void tilingPatternFill(GfxState *state, Object *str,
     virtual void tilingPatternFill(GfxState *state, Object *str,

-                                  int paintType, Dict *resDict,
-                                  double *mat, double *bbox,
-                                  int x0, int y0, int x1, int y1,
-                                  double xStep, double yStep);
+                              int paintType, Dict *resDict,
+                              double *mat, double *bbox,
+                              int x0, int y0, int x1, int y1,
+                              double xStep, double yStep);
+#else
+    virtual void tilingPatternFill(GfxState *state, Gfx *gfx, Object *str,
+                              int paintType, Dict *resDict,
+                              double *mat, double *bbox,
+                              int x0, int y0, int x1, int y1,
+                              double xStep, double yStep);
+#endif
+

     virtual GBool functionShadedFill(GfxState *state,
                                     GfxFunctionShading *shading);
     virtual GBool axialShadedFill(GfxState *state, GfxAxialShading *shading);
     virtual GBool functionShadedFill(GfxState *state,
                                     GfxFunctionShading *shading);
     virtual GBool axialShadedFill(GfxState *state, GfxAxialShading *shading);