aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@digia.com>2013-04-26 12:40:18 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-26 12:57:03 +0200
commit7b7b0b30fce3a72e472a05052cf8221ebaa83459 (patch)
tree0108df89b3895614becceee614cb1f81faeb2476 /src/quick/items
parent73721b5c275ca811a869d9c3b92e88edd31abcab (diff)
Fixed segmentation fault when setting shadowBlur in Canvas element.
Task-number: QTBUG-30882 Change-Id: I6c941394527bac62c0d2792acf5cf223279babc7 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'src/quick/items')
-rw-r--r--src/quick/items/context2d/qquickcontext2d.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index 2859388e0b..b366775c03 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];