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

Revert "Fix comparisons of image with different color spaces"

Browse Source 
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>
This commit is contained in:
Eirik Aavitsland 2019-07-29 10:04:23 +02:00 committed by Liang Qi
parent ce99361cc0
commit ac885a34ec
2 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/image/qimage.cpp
View File

@ -3834,9 +3834,7 @@ bool QImage::operator==(const QImage & i) const
return false; return false;
// obviously different stuff? // obviously different stuff?
if (i.d->height != d->height || i.d->width != d->width) if (i.d->height != d->height || i.d->width != d->width || i.d->format != d->format)
return false;
if (i.d->format != d->format || i.d->colorSpace != d->colorSpace)
return false; return false;
if (d->format != Format_RGB32) { if (d->format != Format_RGB32) {

18
tests/auto/gui/image/qimage/tst_qimage.cpp
View File

@ -232,8 +232,6 @@ private slots:
void wideImage(); void wideImage();
void colorspaceEquality();
#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) #if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
void toWinHBITMAP_data(); void toWinHBITMAP_data();
void toWinHBITMAP(); void toWinHBITMAP();
@ -3620,22 +3618,6 @@ void tst_QImage::wideImage()
// Qt6: Test that it actually works on 64bit architectures. // Qt6: Test that it actually works on 64bit architectures.
} }
void tst_QImage::colorspaceEquality()
{
QImage image1(10, 10, QImage::Format_RGB32);
image1.fill(Qt::red);
QImage image2(image1);
QCOMPARE(image1, image2);
image1.setColorSpace(QColorSpace::SRgbLinear);
QVERIFY(image1 != image2);
image2.setColorSpace(QColorSpace::SRgbLinear);
QVERIFY(image1 == image2);
image1.setColorSpace(QColorSpace(QColorSpace::Gamut::DciP3D65, QColorSpace::TransferFunction::Gamma, 2.2f));
QVERIFY(image1 != image2);
image2.setColorSpace(QColorSpace(QColorSpace::Gamut::DciP3D65, QColorSpace::TransferFunction::Gamma, 2.2001f));
QVERIFY(image1 == image2);
}
#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) #if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
Q_GUI_EXPORT HBITMAP qt_imageToWinHBITMAP(const QImage &p, int hbitmapFormat = 0); Q_GUI_EXPORT HBITMAP qt_imageToWinHBITMAP(const QImage &p, int hbitmapFormat = 0);