Implement ImageOutputDev::drawMaskedImage and ImageOutputDev::drawSoftMaskedImage so all images are exported when using pdfimages

2 files changed, 30 insertions, 0 deletions

diff --git a/utils/ImageOutputDev.cc b/utils/ImageOutputDev.cc
index 8aea9e71..a6af146c 100644
--- a/utils/ImageOutputDev.cc
+++ b/utils/ImageOutputDev.cc
@@ -195,3 +195,22 @@ void ImageOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
     fclose(f);
   }
 }
+
+void ImageOutputDev::drawMaskedImage(
+  GfxState *state, Object *ref, Stream *str,
+  int width, int height, GfxImageColorMap *colorMap,
+  Stream *maskStr, int maskWidth, int maskHeight, GBool maskInvert) {
+  drawImage(state, ref, str, width, height, colorMap, NULL, gFalse);
+  drawImageMask(state, ref, maskStr, maskWidth, maskHeight,
+		maskInvert, gFalse);
+}
+
+void ImageOutputDev::drawSoftMaskedImage(
+  GfxState *state, Object *ref, Stream *str,
+  int width, int height, GfxImageColorMap *colorMap,
+  Stream *maskStr, int maskWidth, int maskHeight,
+  GfxImageColorMap *maskColorMap) {
+  drawImage(state, ref, str, width, height, colorMap, NULL, gFalse);
+  drawImage(state, ref, maskStr, maskWidth, maskHeight,
+	    maskColorMap, NULL, gFalse);
+}
diff --git a/utils/ImageOutputDev.h b/utils/ImageOutputDev.h
index 7583860b..56c97a5f 100644
--- a/utils/ImageOutputDev.h
+++ b/utils/ImageOutputDev.h
@@ -63,6 +63,17 @@ public:
   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);
 
 private: