aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@digia.com>2013-11-12 16:14:03 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-14 15:53:59 +0100
commit0bade306539069c353d4c3b5f232d1885298224c (patch)
tree0e32412bee509f37dd708438dae362effd40f6f5 /src
parentc640a496d63036ead177dd006ef56b9b12d962bb (diff)
Avoid out-of-bounds access
Task-number: QTBUG-33364 Change-Id: I33d713df5d60a349c48f109a5f76db5fa57573af Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/effects/private/GaussianDirectionalBlur.qml9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/effects/private/GaussianDirectionalBlur.qml b/src/effects/private/GaussianDirectionalBlur.qml
index c2af1f3..20a4658 100644
--- a/src/effects/private/GaussianDirectionalBlur.qml
+++ b/src/effects/private/GaussianDirectionalBlur.qml
@@ -102,7 +102,7 @@ Item {
property variant factor_21_23: Qt.vector3d(gwts[21], gwts[22], gwts[23]);
property variant factor_24_26: Qt.vector3d(gwts[24], gwts[25], gwts[26]);
property variant factor_27_29: Qt.vector3d(gwts[27], gwts[28], gwts[29]);
- property variant factor_30_32: Qt.vector3d(gwts[30], gwts[31], gwts[32]);
+ property variant factor_30_31: Qt.point(gwts[30], gwts[31]);
property color color: rootItem.color
property real spread: 1.0 - (rootItem.spread * 0.98)
@@ -176,9 +176,8 @@ Item {
"gl_FragColor += texture2D(source, texCoord) * factor_27_29.y; texCoord += shift;",
"gl_FragColor += texture2D(source, texCoord) * factor_27_29.z; texCoord += shift;",
- "gl_FragColor += texture2D(source, texCoord) * factor_30_32.x; texCoord += shift;",
- "gl_FragColor += texture2D(source, texCoord) * factor_30_32.y; texCoord += shift;",
- "gl_FragColor += texture2D(source, texCoord) * factor_30_32.z; texCoord += shift;"
+ "gl_FragColor += texture2D(source, texCoord) * factor_30_31.x; texCoord += shift;",
+ "gl_FragColor += texture2D(source, texCoord) * factor_30_31.y; texCoord += shift;"
]
var shader = fragmentShaderBegin
@@ -253,7 +252,7 @@ Item {
uniform highp vec3 factor_21_23;
uniform highp vec3 factor_24_26;
uniform highp vec3 factor_27_29;
- uniform highp vec3 factor_30_32;
+ uniform highp vec3 factor_30_31;
uniform highp float gaussianSum;
uniform highp float expandX;
uniform highp float expandY;