diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-06 19:26:11 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-06 19:27:40 +0200 |
| commit | 906ce1c52b1d65428222ffd56b7e3c92fdc47db5 (patch) | |
| tree | 0496d78bbda268b7d59fe9d695e42267cd303cb2 /src/gui/painting | |
| parent | 7724e4f378f8d97a3b2a3ad6c01e2db057d638aa (diff) | |
| parent | ec16ba393baf504d4b192cc349775c62d3c96aa0 (diff) | |
Merge remote-tracking branch 'origin/5.9.2' into 5.9
Change-Id: Iaae1d9efe6b9267e8e8349905811525ff344e00c
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qdrawhelper.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp index c78fdfe62e..6c25710271 100644 --- a/src/gui/painting/qdrawhelper.cpp +++ b/src/gui/painting/qdrawhelper.cpp @@ -5627,6 +5627,8 @@ static void qt_alphamapblit_generic(QRasterBuffer *rasterBuffer, int start = qMax<int>(x, clip.x); int end = qMin<int>(x + mapWidth, clip.x + clip.len); + if (end <= start) + continue; Q_ASSERT(end - start <= buffer_size); QRgba64 *dest = destFetch64((QRgba64*)buffer, rasterBuffer, start, clip.y, end - start); @@ -5900,6 +5902,8 @@ static void qt_alphargbblit_generic(QRasterBuffer *rasterBuffer, int start = qMax<int>(x, clip.x); int end = qMin<int>(x + mapWidth, clip.x + clip.len); + if (end <= start) + continue; Q_ASSERT(end - start <= buffer_size); QRgba64 *dest = destFetch64((QRgba64*)buffer, rasterBuffer, start, clip.y, end - start); |