diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-15 01:00:50 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-15 01:00:51 +0200 |
| commit | 425d34b70edfea5f1be1c37f83f7919b9e2bd84a (patch) | |
| tree | adb4ffb4383a068d5385e8965aee7b9a1a0026af /src/gui/painting | |
| parent | 1d496a4a1085e6a3ebaa0448b8d6c4da6f8f50d6 (diff) | |
| parent | 8bd48a1c335b404ebbeb7c09c859e0715e6b5cd4 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Icc80dacbca8613f2996be75553ff15d0ad242b7e
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qdrawhelper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp index 674f52678d..55d69221f5 100644 --- a/src/gui/painting/qdrawhelper.cpp +++ b/src/gui/painting/qdrawhelper.cpp @@ -4544,7 +4544,7 @@ void blend_color_generic_rgb64(int count, const QSpan *spans, void *userData) while (count--) { int x = spans->x; int length = spans->len; - if (solidFill && bpp >= QPixelLayout::BPP8 && spans->coverage == 255 && length) { + if (solidFill && bpp >= QPixelLayout::BPP8 && spans->coverage == 255 && length && op.destStore64) { // If dest doesn't matter we don't need to bother with blending or converting all the identical pixels op.destStore64(data->rasterBuffer, x, spans->y, &color, 1); spanfill_from_first(data->rasterBuffer, bpp, x, spans->y, length); |