diff options
| author | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2019-07-29 10:04:23 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-07-29 12:45:16 +0000 |
| commit | ac885a34ecd56b32788c6ca67ef657852bfa2308 (patch) | |
| tree | 96954ae26f3459590fa92ab0315687a18fd85330 /src/gui/image | |
| parent | ce99361cc0260f9672ebfe92918f2a9727a6db3d (diff) | |
Revert "Fix comparisons of image with different color spaces"
QImage comparison has always ignored differences in
metadata. Introducing colorspace comparison can break backwards
compatibility, as not all image formats or handlers have colorspace
capability.
This partially reverts commit
733ca2230c283cdfaae424eac481ddc33593f44f.
Fixes: QTBUG-77205
Change-Id: I1d525a9727e84502624cd118f503eec7be306c99
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qimage.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index 7ac4b3546e..cd2fe5bc10 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -3834,9 +3834,7 @@ bool QImage::operator==(const QImage & i) const return false; // obviously different stuff? - if (i.d->height != d->height || i.d->width != d->width) - return false; - if (i.d->format != d->format || i.d->colorSpace != d->colorSpace) + if (i.d->height != d->height || i.d->width != d->width || i.d->format != d->format) return false; if (d->format != Format_RGB32) { |