From: kramm <kramm>
Date: Sun, 26 Nov 2006 19:42:08 +0000 (+0000)
Subject: added drawMaskedImage, drawSoftMaskedImage, call functions of superclass
X-Git-Tag: release-0-8-0~109
X-Git-Url: http://git.asbjorn.it/?a=commitdiff_plain;h=a2f21288d10ce4e448ba07a72463aa2689d59ed3;p=swftools.git

added drawMaskedImage, drawSoftMaskedImage, call functions of superclass
after counter incrementation (to fix stream errors)
---

diff --git a/lib/pdf/InfoOutputDev.cc b/lib/pdf/InfoOutputDev.cc
index 6574d76..830776d 100644
--- a/lib/pdf/InfoOutputDev.cc
+++ b/lib/pdf/InfoOutputDev.cc
@@ -28,6 +28,7 @@ void InfoOutputDev::startPage(int pageNum, GfxState *state, double crop_x1, doub
     this->y1 = (int)y1;
     this->x2 = (int)x2;
     this->y2 = (int)y2;
+    msg("<verbose> Generating info structure for page %d", pageNum);
 }
 void InfoOutputDev::drawLink(Link *link, Catalog *catalog) 
 {
@@ -102,11 +103,31 @@ void InfoOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
 			   GBool inlineImg) 
 {
     num_images++;
+    OutputDev::drawImageMask(state,ref,str,width,height,invert,inlineImg);
 }
 void InfoOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
 		       int width, int height, GfxImageColorMap *colorMap,
 		       int *maskColors, GBool inlineImg)
 {
     num_images++;
+    OutputDev::drawImage(state,ref,str,width,height,colorMap,maskColors,inlineImg);
+}
+void InfoOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str,
+				int width, int height,
+				GfxImageColorMap *colorMap,
+				Stream *maskStr,
+				int maskWidth, int maskHeight,
+				GBool maskInvert) 
+{
+    OutputDev::drawMaskedImage(state,ref,str,width,height,colorMap,maskStr,maskWidth,maskHeight,maskInvert);
 }
 
+void InfoOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
+				    int width, int height,
+				    GfxImageColorMap *colorMap,
+				    Stream *maskStr,
+				    int maskWidth, int maskHeight,
+				    GfxImageColorMap *maskColorMap) 
+{
+    OutputDev::drawSoftMaskedImage(state,ref,str,width,height,colorMap,maskStr,maskWidth,maskHeight,maskColorMap);
+}
diff --git a/lib/pdf/InfoOutputDev.h b/lib/pdf/InfoOutputDev.h
index 27d3b3d..82fa082 100644
--- a/lib/pdf/InfoOutputDev.h
+++ b/lib/pdf/InfoOutputDev.h
@@ -40,6 +40,18 @@ class InfoOutputDev: public OutputDev
   virtual void drawImage(GfxState *state, Object *ref, Stream *str,
 			 int width, int height, GfxImageColorMap *colorMap,
 			 int *maskColors, GBool inlineImg);
+  virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str,
+				int width, int height,
+				GfxImageColorMap *colorMap,
+				Stream *maskStr,
+				int maskWidth, int maskHeight,
+				GBool maskInvert);
+  virtual void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
+				    int width, int height,
+				    GfxImageColorMap *colorMap,
+				    Stream *maskStr,
+				    int maskWidth, int maskHeight,
+				    GfxImageColorMap *maskColorMap);
 };
 
 #endif //__infooutputdev_h__