Patchwork [meta-qt5] qtbase: add upstream QTBUG-31579 patch for QPainter regression

login
register
mail settings
Submitter Jonathan Liu
Date Oct. 9, 2013, 1:20 p.m.
Message ID <1381324856-24216-1-git-send-email-net147@gmail.com>
Download mbox | patch
Permalink /patch/59567/
State Accepted, archived
Headers show

Comments

Jonathan Liu - Oct. 9, 2013, 1:20 p.m.
Signed-off-by: Jonathan Liu <net147@gmail.com>
---
 ...Pixel.y-is-also-initalized-to-1-when-nece.patch | 47 ++++++++++++++++++++++
 ...Pixel.y-is-also-initalized-to-1-when-nece.patch | 47 ++++++++++++++++++++++
 recipes-qt/qt5/qtbase.inc                          |  1 +
 3 files changed, 95 insertions(+)
 create mode 100644 recipes-qt/qt5/qtbase-5.1.0/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch
 create mode 100644 recipes-qt/qt5/qtbase-git/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch

Patch

diff --git a/recipes-qt/qt5/qtbase-5.1.0/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch b/recipes-qt/qt5/qtbase-5.1.0/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch
new file mode 100644
index 0000000..0d53305
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-5.1.0/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch
@@ -0,0 +1,47 @@ 
+From f0b950144dde85b65df0c3cf83f7c8df0e94bbbf Mon Sep 17 00:00:00 2001
+From: Andy Shaw <andy.shaw@digia.com>
+Date: Tue, 8 Oct 2013 15:45:42 +0200
+Subject: [PATCH] Ensure lastPixel.y is also initalized to -1 when necessary
+
+Task-number: QTBUG-31579
+
+Upstream-Status: Accepted [https://codereview.qt-project.org/#change,67578]
+Signed-off-by: Jonathan Liu <net147@gmail.com>
+
+Change-Id: Ia4916ac0d384ea523bbfad0dafbc90044da7ec3e
+Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
+---
+ src/gui/painting/qcosmeticstroker.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/gui/painting/qcosmeticstroker.cpp b/src/gui/painting/qcosmeticstroker.cpp
+index 39f6422..a2301e3 100644
+--- a/src/gui/painting/qcosmeticstroker.cpp
++++ b/src/gui/painting/qcosmeticstroker.cpp
+@@ -305,6 +305,7 @@ void QCosmeticStroker::setup()
+     ymax = deviceRect.bottom() + 2;
+ 
+     lastPixel.x = -1;
++    lastPixel.y = -1;
+ }
+ 
+ // returns true if the whole line gets clipped away
+@@ -533,6 +534,7 @@ void QCosmeticStroker::drawPath(const QVectorPath &path)
+             QPointF p = QPointF(points[0], points[1]) * state->matrix;
+             patternOffset = state->lastPen.dashOffset()*64;
+             lastPixel.x = -1;
++            lastPixel.y = -1;
+ 
+             bool closed;
+             const QPainterPath::ElementType *e = subPath(type, end, points, &closed);
+@@ -587,6 +589,7 @@ void QCosmeticStroker::drawPath(const QVectorPath &path)
+         QPointF movedTo = p;
+         patternOffset = state->lastPen.dashOffset()*64;
+         lastPixel.x = -1;
++        lastPixel.y = -1;
+ 
+         const qreal *begin = points;
+         const qreal *end = points + 2*path.elementCount();
+-- 
+1.8.4
+
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
new file mode 100644
index 0000000..0d53305
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch
@@ -0,0 +1,47 @@ 
+From f0b950144dde85b65df0c3cf83f7c8df0e94bbbf Mon Sep 17 00:00:00 2001
+From: Andy Shaw <andy.shaw@digia.com>
+Date: Tue, 8 Oct 2013 15:45:42 +0200
+Subject: [PATCH] Ensure lastPixel.y is also initalized to -1 when necessary
+
+Task-number: QTBUG-31579
+
+Upstream-Status: Accepted [https://codereview.qt-project.org/#change,67578]
+Signed-off-by: Jonathan Liu <net147@gmail.com>
+
+Change-Id: Ia4916ac0d384ea523bbfad0dafbc90044da7ec3e
+Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
+---
+ src/gui/painting/qcosmeticstroker.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/gui/painting/qcosmeticstroker.cpp b/src/gui/painting/qcosmeticstroker.cpp
+index 39f6422..a2301e3 100644
+--- a/src/gui/painting/qcosmeticstroker.cpp
++++ b/src/gui/painting/qcosmeticstroker.cpp
+@@ -305,6 +305,7 @@ void QCosmeticStroker::setup()
+     ymax = deviceRect.bottom() + 2;
+ 
+     lastPixel.x = -1;
++    lastPixel.y = -1;
+ }
+ 
+ // returns true if the whole line gets clipped away
+@@ -533,6 +534,7 @@ void QCosmeticStroker::drawPath(const QVectorPath &path)
+             QPointF p = QPointF(points[0], points[1]) * state->matrix;
+             patternOffset = state->lastPen.dashOffset()*64;
+             lastPixel.x = -1;
++            lastPixel.y = -1;
+ 
+             bool closed;
+             const QPainterPath::ElementType *e = subPath(type, end, points, &closed);
+@@ -587,6 +589,7 @@ void QCosmeticStroker::drawPath(const QVectorPath &path)
+         QPointF movedTo = p;
+         patternOffset = state->lastPen.dashOffset()*64;
+         lastPixel.x = -1;
++        lastPixel.y = -1;
+ 
+         const qreal *begin = points;
+         const qreal *end = points + 2*path.elementCount();
+-- 
+1.8.4
+
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index b6927d1..ffd5af4 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -23,6 +23,7 @@  SRC_URI += " \
     file://0023-configure-make-freetype-a-configurable-option.patch \
     file://0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch \
     file://0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch \
+    file://0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch \
 "
 
 DEPENDS += "qtbase-native"