summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-git/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch')
-rw-r--r--recipes-qt/qt5/qtbase-git/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch47
1 files changed, 0 insertions, 47 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch b/recipes-qt/qt5/qtbase-git/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch
deleted file mode 100644
index 0d533059..00000000
--- a/recipes-qt/qt5/qtbase-git/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1From f0b950144dde85b65df0c3cf83f7c8df0e94bbbf Mon Sep 17 00:00:00 2001
2From: Andy Shaw <andy.shaw@digia.com>
3Date: Tue, 8 Oct 2013 15:45:42 +0200
4Subject: [PATCH] Ensure lastPixel.y is also initalized to -1 when necessary
5
6Task-number: QTBUG-31579
7
8Upstream-Status: Accepted [https://codereview.qt-project.org/#change,67578]
9Signed-off-by: Jonathan Liu <net147@gmail.com>
10
11Change-Id: Ia4916ac0d384ea523bbfad0dafbc90044da7ec3e
12Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
13---
14 src/gui/painting/qcosmeticstroker.cpp | 3 +++
15 1 file changed, 3 insertions(+)
16
17diff --git a/src/gui/painting/qcosmeticstroker.cpp b/src/gui/painting/qcosmeticstroker.cpp
18index 39f6422..a2301e3 100644
19--- a/src/gui/painting/qcosmeticstroker.cpp
20+++ b/src/gui/painting/qcosmeticstroker.cpp
21@@ -305,6 +305,7 @@ void QCosmeticStroker::setup()
22 ymax = deviceRect.bottom() + 2;
23
24 lastPixel.x = -1;
25+ lastPixel.y = -1;
26 }
27
28 // returns true if the whole line gets clipped away
29@@ -533,6 +534,7 @@ void QCosmeticStroker::drawPath(const QVectorPath &path)
30 QPointF p = QPointF(points[0], points[1]) * state->matrix;
31 patternOffset = state->lastPen.dashOffset()*64;
32 lastPixel.x = -1;
33+ lastPixel.y = -1;
34
35 bool closed;
36 const QPainterPath::ElementType *e = subPath(type, end, points, &closed);
37@@ -587,6 +589,7 @@ void QCosmeticStroker::drawPath(const QVectorPath &path)
38 QPointF movedTo = p;
39 patternOffset = state->lastPen.dashOffset()*64;
40 lastPixel.x = -1;
41+ lastPixel.y = -1;
42
43 const qreal *begin = points;
44 const qreal *end = points + 2*path.elementCount();
45--
461.8.4
47