#include "../gfxsource.h"
#include "../gfxtools.h"
-#include "config.h"
+#include "../../config.h"
#include "GFXOutputDev.h"
#include "InfoOutputDev.h"
#include "PDFDoc.h"
#include "CommonOutputDev.h"
+#include "popplercompat.h"
struct ClipState
{
virtual GBool interpretType3Chars();
virtual GBool needNonText();
virtual void setDefaultCTM(double *ctm);
-/* virtual GBool checkPageSlice(Page *page, double hDPI, double vDPI,
+ virtual GBool checkPageSlice(Page *page, double hDPI, double vDPI,
int rotate, GBool useMediaBox, GBool crop,
int sliceX, int sliceY, int sliceW, int sliceH,
GBool printing, Catalog *catalog,
GBool (*abortCheckCbk)(void *data) = NULL,
- void *abortCheckCbkData = NULL);*/
+ void *abortCheckCbkData = NULL);
- virtual void startPage(int pageNum, GfxState *state, double x1,double y1,double x2,double y2);
+ virtual void startPage(int pageNum, GfxState *state);
virtual void endPage();
virtual void finishPage();
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 POPPLER_TILING_PATERN_RETURN tilingPatternFill(
+ GfxState *state, POPPLER_TILING_PATERN_GFX Object *str,
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 void drawImageMask(GfxState *state, Object *ref, Stream *str,
int width, int height, GBool invert,
+ POPPLER_INTERPOLATE
GBool inlineImg);
virtual void drawImage(GfxState *state, Object *ref, Stream *str,
int width, int height, GfxImageColorMap *colorMap,
+ POPPLER_INTERPOLATE
int *maskColors, GBool inlineImg);
virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str,
int width, int height,
GfxImageColorMap *colorMap,
+ POPPLER_INTERPOLATE
Stream *maskStr, int maskWidth, int maskHeight,
- GBool maskInvert);
+ GBool maskInvert
+ POPPLER_MASK_INTERPOLATE);
virtual void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
int width, int height,
GfxImageColorMap *colorMap,
+ POPPLER_INTERPOLATE
Stream *maskStr,
int maskWidth, int maskHeight,
- GfxImageColorMap *maskColorMap);
+ GfxImageColorMap *maskColorMap
+ POPPLER_MASK_INTERPOLATE);
virtual void type3D0(GfxState *state, double wx, double wy);
virtual void type3D1(GfxState *state, double wx, double wy, double llx, double lly, double urx, double ury);