Attachment 138381 Details for Bug 105531 – Patch that implements ArthurOutputDev::drawImageMask

[patch] Patch that implements ArthurOutputDev::drawImageMask

0003-Implement-ArthurOutputDev-drawImageMask.patch (text/plain), 3.68 KB, created by oliver.sander on 2018-03-27 19:35:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: oliver.sander

Created: 2018-03-27 19:35:01 UTC

Size: 3.68 KB

patch

obsolete

>From 24eb89e013bfae382743d91368acb94787bf284b Mon Sep 17 00:00:00 2001
>From: Oliver Sander <oliver.sander@tu-dresden.de>
>Date: Thu, 15 Mar 2018 20:18:14 +0100
>Subject: [PATCH 3/7] Implement ArthurOutputDev::drawImageMask
>
>---
> qt5/src/ArthurOutputDev.cc | 86 +++++++++++++---------------------------------
> 1 file changed, 24 insertions(+), 62 deletions(-)
>
>diff --git a/qt5/src/ArthurOutputDev.cc b/qt5/src/ArthurOutputDev.cc
>index 0fc9178d..d5d47823 100644
>--- a/qt5/src/ArthurOutputDev.cc
>+++ b/qt5/src/ArthurOutputDev.cc
>@@ -923,76 +923,38 @@ void ArthurOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
> 				    int width, int height, GBool invert,
> 				    GBool interpolate, GBool inlineImg)
> {
>-  qDebug() << "drawImageMask";
>-#if 0
>-  unsigned char *buffer;
>-  unsigned char *dest;
>-  cairo_surface_t *image;
>-  cairo_pattern_t *pattern;
>-  int x, y;
>-  ImageStream *imgStr;
>-  Guchar *pix;
>-  double *ctm;
>-  cairo_matrix_t matrix;
>-  int invert_bit;
>-  int row_stride;
>-
>-  row_stride = (width + 3) & ~3;
>-  buffer = (unsigned char *) malloc (height * row_stride);
>-  if (buffer == nullptr) {
>-    error(-1, "Unable to allocate memory for image.");
>-    return;
>-  }
>-
>-  /* TODO: Do we want to cache these? */
>-  imgStr = new ImageStream(str, width, 1, 1);
>+  std::unique_ptr<ImageStream> imgStr(new ImageStream(str, width,
>+                                                      1,    // numPixelComps
>+                                                      1));  // getBits
>   imgStr->reset();
> 
>-  invert_bit = invert ? 1 : 0;
>+  // TODO: Would using QImage::Format_Mono be more efficient here?
>+  QImage image(width, height, QImage::Format_ARGB32);
>+  unsigned int *data = (unsigned int *)image.bits();
>+  int stride = image.bytesPerLine()/4;
> 
>-  for (y = 0; y < height; y++) {
>-    pix = imgStr->getLine();
>-    dest = buffer + y * row_stride;
>-    for (x = 0; x < width; x++) {
>+  QRgb fillColor = m_currentBrush.color().rgb();
>+
>+  for (int y = 0; y < height; y++) {
>+
>+    Guchar *pix = imgStr->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* dest = data + (height-1-y) * stride;
>+
>+    for (int x = 0; x < width; x++) {
>+
>+      bool opaque = ((bool)pix[x]) == invert;
>+      dest[x] = (opaque) ? fillColor : 0;
> 
>-      if (pix[x] ^ invert_bit)
>-	*dest++ = 0;
>-      else
>-	*dest++ = 255;
>     }
>   }
> 
>-  image = cairo_image_surface_create_for_data (buffer, CAIRO_FORMAT_A8,
>-					  width, height, row_stride);
>-  if (image == nullptr)
>-    return;
>-  pattern = cairo_pattern_create_for_surface (image);
>-  if (pattern == nullptr)
>-    return;
>-
>-  ctm = state->getCTM();
>-  LOG (printf ("drawImageMask %dx%d, matrix: %f, %f, %f, %f, %f, %f\n",
>-	       width, height, ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]));
>-  matrix.xx = ctm[0] / width;
>-  matrix.xy = -ctm[2] / height;
>-  matrix.yx = ctm[1] / width;
>-  matrix.yy = -ctm[3] / height;
>-  matrix.x0 = ctm[2] + ctm[4];
>-  matrix.y0 = ctm[3] + ctm[5];
>-  cairo_matrix_invert (&matrix);
>-  cairo_pattern_set_matrix (pattern, &matrix);
>-
>-  cairo_pattern_set_filter (pattern, CAIRO_FILTER_BEST);
>-  /* FIXME: Doesn't the image mask support any colorspace? */
>-  cairo_set_source_rgb (cairo, fill_color.r, fill_color.g, fill_color.b);
>-  cairo_mask (cairo, pattern);
>-
>-  cairo_pattern_destroy (pattern);
>-  cairo_surface_destroy (image);
>-  free (buffer);
>+  // 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.top()->drawImage( QRect(0,0,1,1), image );
>   imgStr->close ();
>-  delete imgStr;
>-#endif
> }
> 
> //TODO: lots more work here.
>-- 
>2.16.2
>

Actions: View | Splinter Review

Attachments on bug 105531: 138147 | 138381 | 138382 | 138385 | 138640

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.