From: kramm <kramm>
Date: Sun, 22 Apr 2007 17:47:11 +0000 (+0000)
Subject: removed xpdf version switch, added some state variables
X-Git-Tag: buttons-working~695
X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=commitdiff_plain;h=67c5190e8f994e007c6e832a08fd1913d4ebcd22

removed xpdf version switch, added some state variables
---

diff --git a/lib/pdf/GFXOutputDev.h b/lib/pdf/GFXOutputDev.h
index 55d3084..b10cad2 100644
--- a/lib/pdf/GFXOutputDev.h
+++ b/lib/pdf/GFXOutputDev.h
@@ -21,7 +21,9 @@ class GFXOutputState {
     int textRender;
     char createsoftmask;
     char transparencygroup;
-    int softmask;
+    char softmask;
+    char softmask_alpha;
+    char isolated;
 
     GFXOutputState();
 
@@ -167,7 +169,6 @@ public:
 				   GfxImageColorMap *maskColorMap);
 
   //----- transparency groups and soft masks (xpdf >= ~ 3.01.16)
-#if xpdfUpdateVersion >= 16
   virtual void beginTransparencyGroup(GfxState *state, double *bbox,
 				      GfxColorSpace *blendingColorSpace,
 				      GBool isolated, GBool knockout,
@@ -176,9 +177,6 @@ public:
   virtual void paintTransparencyGroup(GfxState *state, double *bbox);
   virtual void setSoftMask(GfxState *state, double *bbox, GBool alpha, Function *transferFunc, GfxColor *backdropColor);
   virtual void clearSoftMask(GfxState *state);
-#else
-  virtual void clearSoftMask(GfxState *state) {};
-#endif
  
   //----- type 3 chars
   virtual GBool beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, Unicode *u, int uLen);