Attachment 134099 Details for Bug 102630 – Patch fixing dash pattern bugs

[patch] Patch fixing dash pattern bugs

0001-Fix-several-small-bugs-related-to-dash-pattern-handl.patch (text/plain), 2.00 KB, created by oliver.sander on 2017-09-08 21:32:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: oliver.sander

Created: 2017-09-08 21:32:19 UTC

Size: 2.00 KB

patch

obsolete

>From 3b813a2d062d954d8b48dfe9b2025866a51b0c04 Mon Sep 17 00:00:00 2001
>From: Oliver Sander <oliver.sander@tu-dresden.de>
>Date: Fri, 8 Sep 2017 23:27:45 +0200
>Subject: [PATCH 1/3] Fix several small bugs related to dash pattern handling
>
>---
> qt5/src/ArthurOutputDev.cc | 21 ++++++++++++++++++++-
> 1 file changed, 20 insertions(+), 1 deletion(-)
>
>diff --git a/qt5/src/ArthurOutputDev.cc b/qt5/src/ArthurOutputDev.cc
>index fe285aa9..91ddec26 100644
>--- a/qt5/src/ArthurOutputDev.cc
>+++ b/qt5/src/ArthurOutputDev.cc
>@@ -187,9 +187,23 @@ void ArthurOutputDev::updateLineDash(GfxState *state)
>   int dashLength;
>   double dashStart;
>   state->getLineDash(&dashPattern, &dashLength, &dashStart);
>+
>+  // Special handling for zero-length patterns, i.e., solid lines.
>+  // Simply calling QPen::setDashPattern with an empty pattern does *not*
>+  // result in a solid line.  Rather, the current pattern is unchanged.
>+  // See the implementation of the setDashPattern method in the file qpen.cpp.
>+  if (dashLength==0)
>+  {
>+    m_currentPen.setStyle(Qt::SolidLine);
>+    m_painter->setPen(m_currentPen);
>+    return;
>+  }
>+
>   QVector<qreal> pattern(dashLength);
>   for (int i = 0; i < dashLength; ++i) {
>-    pattern[i] = dashPattern[i];
>+    // pdf measures the dash pattern in dots, but Qt uses the
>+    // line width as the unit.
>+    pattern[i] = dashPattern[i] / state->getLineWidth();
>   }
>   m_currentPen.setDashPattern(pattern);
>   m_currentPen.setDashOffset(dashStart);
>@@ -246,6 +260,11 @@ void ArthurOutputDev::updateLineWidth(GfxState *state)
> {
>   m_currentPen.setWidthF(state->getLineWidth());
>   m_painter->setPen(m_currentPen);
>+  // The updateLineDash method needs to know the line width, but it is sometimes
>+  // called before the updateLineWidth method.  To make sure that the last call
>+  // to updateLineDash before a drawing operation is always with the correct line
>+  // width, we call it here, right after a change to the line width.
>+  updateLineDash(state);
> }
> 
> void ArthurOutputDev::updateFillColor(GfxState *state)
>-- 
>2.14.1
>

Actions: View | Splinter Review

Attachments on bug 102630: 134098 | 134099 | 134109 | 134118 | 134559 | 134560

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.