1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed assert in blend_transformed_tiled_argb

Browse Source 
px16 and py16 might be <0 in the first iteration of the loop. In order
to avoid accessing an invalid index the values have to be corrected
before px and py are accessed.

Change-Id: I790faeacc2b77ae8af52bf5e69a2d801c9fe973d
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
This commit is contained in:
Oliver Wolff 2014-01-29 10:07:34 +01:00 committed by The Qt Project
parent e4588b70dd
commit 848c5d01e2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/painting/qdrawhelper.cpp
View File

@ -5145,6 +5145,8 @@ static void blend_transformed_tiled_argb(int count, const QSpan *spans, void *us
int px_delta = fdx % (image_width << 16);
int py_delta = fdy % (image_height << 16);
while (b < end) {
if (px16 < 0) px16 += image_width << 16;
if (py16 < 0) py16 += image_height << 16;
int px = px16 >> 16;
int py = py16 >> 16;
int y_offset = py * scanline_offset;
@ -5161,8 +5163,6 @@ static void blend_transformed_tiled_argb(int count, const QSpan *spans, void *us
py16 += py_delta;
if (py16 >= image_height << 16)
py16 -= image_height << 16;
if (px16 < 0) px16 += image_width << 16;
if (py16 < 0) py16 += image_height << 16;
++b;
}
func(target, buffer, l, coverage);