From: Samuel Rødal <samuel.rodal@digia.com>
Date: Fri, 26 Apr 2013 10:40:18 +0000 (+0200)
Subject: Fixed segmentation fault when setting shadowBlur in Canvas element.
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=7b7b0b30fce3a72e472a05052cf8221ebaa83459;p=konrad%2Fqtdeclarative.git

Fixed segmentation fault when setting shadowBlur in Canvas element.

Task-number: QTBUG-30882
Change-Id: I6c941394527bac62c0d2792acf5cf223279babc7
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
---

diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index 2859388..b366775 100644
--- a/src/quick/items/context2d/qquickcontext2d.cpp
+++ b/src/quick/items/context2d/qquickcontext2d.cpp
@@ -282,7 +282,7 @@ QImage qt_image_convolute_filter(const QImage& src, const QVector<qreal>& weight
              for (int cx=0; cx<sides; cx++) {
                int scy = sy + cy - half;
                int scx = sx + cx - half;
-               if (scy >= 0 && scy < w && scx >= 0 && scx < h) {
+               if (scy >= 0 && scy < h && scx >= 0 && scx < w) {
                   const QRgb *sr = (const QRgb*)(src.constScanLine(scy));
                   const unsigned char* sRgb = ((const unsigned char*)&sr[scx]);
                   qreal wt = radius ? weights[0] : weights[cy*sides+cx];