Attachment 134571 Details for Bug 103041 – Patch that implements drawSoftMaskedImage

[patch] Patch that implements drawSoftMaskedImage

0004-Arthur-Implement-the-drawSoftMaskedImage-method.patch (text/plain), 4.28 KB, created by oliver.sander on 2017-09-29 19:48:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: oliver.sander

Created: 2017-09-29 19:48:39 UTC

Size: 4.28 KB

patch

obsolete

>From 7f220c625fd565e7623515144b5ad0423ad8ac19 Mon Sep 17 00:00:00 2001
>From: Oliver Sander <oliver.sander@tu-dresden.de>
>Date: Fri, 29 Sep 2017 21:24:23 +0200
>Subject: [PATCH 4/4] [Arthur] Implement the drawSoftMaskedImage method
>
>---
> qt5/src/ArthurOutputDev.cc | 67 ++++++++++++++++++++++++++++++++++++++++++++++
> qt5/src/ArthurOutputDev.h  |  9 +++++++
> 2 files changed, 76 insertions(+)
>
>diff --git a/qt5/src/ArthurOutputDev.cc b/qt5/src/ArthurOutputDev.cc
>index 5a3a6f47..bc996cfe 100644
>--- a/qt5/src/ArthurOutputDev.cc
>+++ b/qt5/src/ArthurOutputDev.cc
>@@ -907,3 +907,70 @@ void ArthurOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
>   delete imgStr;
> 
> }
>+
>+void ArthurOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
>+                                          int width, int height,
>+                                          GfxImageColorMap *colorMap,
>+                                          GBool interpolate,
>+                                          Stream *maskStr,
>+                                          int maskWidth, int maskHeight,
>+                                          GfxImageColorMap *maskColorMap,
>+                                          GBool maskInterpolate)
>+{
>+  // Bail out if the image size doesn't match the mask size.  I don't know
>+  // what to do in this case.
>+  if (width!=maskWidth || height!=maskHeight)
>+  {
>+    qDebug() << "Soft mask size does not match image size!";
>+    drawImage(state, ref, str, width, height, colorMap, interpolate, nullptr, gFalse);
>+  }
>+
>+  // Bail out if the mask isn't a single channel.  I don't know
>+  // what to do in this case.
>+  if (maskColorMap->getColorSpace()->getNComps() != 1)
>+  {
>+    qDebug() << "Soft mask is not a single 8-bit channel!";
>+    drawImage(state, ref, str, width, height, colorMap, interpolate, nullptr, gFalse);
>+  }
>+
>+  /* TODO: Do we want to cache these? */
>+  std::unique_ptr<ImageStream> imgStr(new ImageStream(str, width,
>+                                                      colorMap->getNumPixelComps(),
>+                                                      colorMap->getBits()));
>+  imgStr->reset();
>+
>+  std::unique_ptr<ImageStream> maskImageStr(new ImageStream(maskStr, maskWidth,
>+                                                            maskColorMap->getNumPixelComps(),
>+                                                            maskColorMap->getBits()));
>+  maskImageStr->reset();
>+
>+  QImage image(width, height, QImage::Format_ARGB32);
>+  unsigned int *data = (unsigned int *)image.bits();
>+  int stride = image.bytesPerLine()/4;
>+
>+  std::vector<Guchar> maskLine(maskWidth);
>+
>+  for (int y = 0; y < height; y++) {
>+
>+    Guchar *pix = imgStr->getLine();
>+    Guchar *maskPix = maskImageStr->getLine();
>+
>+    // Invert the vertical coordinate: y is increasing from top to bottom
>+    // on the page, but y is increasing bottom to top in the picture.
>+    unsigned int* line = data+(height-1-y)*stride;
>+    colorMap->getRGBLine(pix, line, width);
>+
>+    // Apply the mask values to the image alpha channel
>+    maskColorMap->getGrayLine(maskPix, maskLine.data(), width);
>+    for (int x = 0; x < width; x++)
>+    {
>+      *line = *line | (maskLine[x]<<24);
>+      line++;
>+    }
>+  }
>+
>+  // At this point, the QPainter coordinate transformation (CTM) is such
>+  // that QRect(0,0,1,1) is exactly the area of the image.
>+  m_painter->drawImage( QRect(0,0,1,1), image );
>+}
>+
>diff --git a/qt5/src/ArthurOutputDev.h b/qt5/src/ArthurOutputDev.h
>index b893c0eb..a2ce20d0 100644
>--- a/qt5/src/ArthurOutputDev.h
>+++ b/qt5/src/ArthurOutputDev.h
>@@ -152,6 +152,15 @@ public:
> 		 int width, int height, GfxImageColorMap *colorMap,
> 		 GBool interpolate, int *maskColors, GBool inlineImg) override;
> 
>+  void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
>+                           int width, int height,
>+                           GfxImageColorMap *colorMap,
>+                           GBool interpolate,
>+                           Stream *maskStr,
>+                           int maskWidth, int maskHeight,
>+                           GfxImageColorMap *maskColorMap,
>+                           GBool maskInterpolate) override;
>+
>   //----- Type 3 font operators
>   void type3D0(GfxState *state, double wx, double wy) override;
>   void type3D1(GfxState *state, double wx, double wy,
>-- 
>2.14.1
>

Actions: View | Splinter Review

Attachments on bug 103041: 134571 | 134572 | 134627

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.