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

Extend colorspace testing and fix bug it uncovered

Browse Source 
When changing transferfunction the look-up-tables needs to be
regenerated.

Change-Id: I83ca5fe570f85d478a374f52c0a82db84e70c3b8
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
(cherry picked from commit b2631c72c0628e68c0fae7567fd12e6646455efc)
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
This commit is contained in:
Allan Sandfeld Jensen 2021-02-11 16:17:55 +01:00
parent 2e3b53ef26
commit 2f0d44b403
3 changed files with 121 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/painting/qcolorspace.cpp
View File

@ -331,6 +331,7 @@ void QColorSpacePrivate::setTransferFunction()
}
trc[1] = trc[0];
trc[2] = trc[0];
lut.generated.storeRelease(0);
}
QColorTransform QColorSpacePrivate::transformationToColorSpace(const QColorSpacePrivate *out) const

2
src/gui/painting/qcolortrc_p.h
View File

@ -114,7 +114,7 @@ public:
if (x >= 0.0f && x <= 1.0f)
return applyInverse(x);
if (m_type == Type::Function)
return std::copysign(applyInverse(x), x);
return std::copysign(applyInverse(std::abs(x)), x);
if (m_type == Type::Table)
return x < 0.0f ? 0.0f : 1.0f;
return x;

119
tests/auto/gui/painting/qcolorspace/tst_qcolorspace.cpp
View File

@ -59,6 +59,10 @@ private slots:
void imageConversion_data();
void imageConversion();
void imageConversion64_data();
void imageConversion64();
void imageConversionOverLargerGamut_data();
void imageConversionOverLargerGamut();
void loadImage();
@ -234,6 +238,7 @@ void tst_QColorSpace::imageConversion_data()
QTest::newRow("Adobe RGB -> sRGB") << QColorSpace::AdobeRgb << QColorSpace::SRgb << 2;
QTest::newRow("Display-P3 -> Adobe RGB") << QColorSpace::DisplayP3 << QColorSpace::AdobeRgb << 2;
QTest::newRow("sRGB -> sRGB Linear") << QColorSpace::SRgb << QColorSpace::SRgbLinear << 0;
QTest::newRow("sRGB Linear -> sRGB") << QColorSpace::SRgbLinear << QColorSpace::SRgb << 0;
}
void tst_QColorSpace::imageConversion()
@ -284,6 +289,120 @@ void tst_QColorSpace::imageConversion()
}
}
void tst_QColorSpace::imageConversion64_data()
{
QTest::addColumn<QColorSpace::NamedColorSpace>("fromColorSpace");
QTest::addColumn<QColorSpace::NamedColorSpace>("toColorSpace");
QTest::newRow("sRGB -> Display-P3") << QColorSpace::SRgb << QColorSpace::DisplayP3;
QTest::newRow("sRGB -> Adobe RGB") << QColorSpace::SRgb << QColorSpace::AdobeRgb;
QTest::newRow("Display-P3 -> sRGB") << QColorSpace::DisplayP3 << QColorSpace::SRgb;
QTest::newRow("Display-P3 -> Adobe RGB") << QColorSpace::DisplayP3 << QColorSpace::AdobeRgb;
QTest::newRow("sRGB -> sRGB Linear") << QColorSpace::SRgb << QColorSpace::SRgbLinear;
QTest::newRow("sRGB Linear -> sRGB") << QColorSpace::SRgbLinear << QColorSpace::SRgb;
}
void tst_QColorSpace::imageConversion64()
{
QFETCH(QColorSpace::NamedColorSpace, fromColorSpace);
QFETCH(QColorSpace::NamedColorSpace, toColorSpace);
QImage testImage(256, 1, QImage::Format_RGBX64);
for (int i = 0; i < 256; ++i)
testImage.setPixel(i, 0, qRgb(i, i, i));
testImage.setColorSpace(fromColorSpace);
QCOMPARE(testImage.colorSpace(), QColorSpace(fromColorSpace));
testImage.convertToColorSpace(toColorSpace);
QCOMPARE(testImage.colorSpace(), QColorSpace(toColorSpace));
int lastRed = 0;
int lastGreen = 0;
int lastBlue = 0;
for (int i = 0; i < 256; ++i) {
QRgb p = testImage.pixel(i, 0);
QVERIFY(qRed(p) >= lastRed);
QVERIFY(qGreen(p) >= lastGreen);
QVERIFY(qBlue(p) >= lastBlue);
lastRed = qRed(p);
lastGreen = qGreen(p);
lastBlue = qBlue(p);
}
lastRed = 0;
lastGreen = 0;
lastBlue = 0;
testImage.convertToColorSpace(fromColorSpace);
QCOMPARE(testImage.colorSpace(), QColorSpace(fromColorSpace));
for (int i = 0; i < 256; ++i) {
QRgb p = testImage.pixel(i, 0);
QCOMPARE(qRed(p), qGreen(p));
QCOMPARE(qRed(p), qBlue(p));
QVERIFY((lastRed - qRed(p)) <= 0);
QVERIFY((lastGreen - qGreen(p)) <= 0);
QVERIFY((lastBlue - qBlue(p)) <= 0);
lastRed = qRed(p);
lastGreen = qGreen(p);
lastBlue = qBlue(p);
}
}
void tst_QColorSpace::imageConversionOverLargerGamut_data()
{
QTest::addColumn<QColorSpace::NamedColorSpace>("fromColorSpace");
QTest::addColumn<QColorSpace::NamedColorSpace>("toColorSpace");
QTest::newRow("sRGB -> Display-P3") << QColorSpace::SRgb << QColorSpace::DisplayP3;
QTest::newRow("sRGB -> Adobe RGB") << QColorSpace::SRgb << QColorSpace::AdobeRgb;
QTest::newRow("sRGB -> ProPhoto RGB") << QColorSpace::SRgb << QColorSpace::ProPhotoRgb;
QTest::newRow("Display-P3 -> ProPhoto RGB") << QColorSpace::DisplayP3 << QColorSpace::ProPhotoRgb;
QTest::newRow("Adobe RGB -> ProPhoto RGB") << QColorSpace::AdobeRgb << QColorSpace::ProPhotoRgb;
}
void tst_QColorSpace::imageConversionOverLargerGamut()
{
QFETCH(QColorSpace::NamedColorSpace, fromColorSpace);
QFETCH(QColorSpace::NamedColorSpace, toColorSpace);
QColorSpace csfrom(fromColorSpace);
QColorSpace csto(toColorSpace);
csfrom.setTransferFunction(QColorSpace::TransferFunction::Linear);
csto.setTransferFunction(QColorSpace::TransferFunction::Linear);
QImage testImage(256, 256, QImage::Format_RGBX64);
testImage.setColorSpace(csfrom);
for (int y = 0; y < 256; ++y)
for (int x = 0; x < 256; ++x)
testImage.setPixel(x, y, qRgb(x, y, 0));
QImage resultImage = testImage.convertedToColorSpace(csto);
for (int y = 0; y < 256; ++y) {
int lastRed = 0;
for (int x = 0; x < 256; ++x) {
QRgb p = resultImage.pixel(x, y);
QVERIFY(qRed(p) >= lastRed);
lastRed = qRed(p);
}
}
for (int x = 0; x < 256; ++x) {
int lastGreen = 0;
for (int y = 0; y < 256; ++y) {
QRgb p = resultImage.pixel(x, y);
QVERIFY(qGreen(p) >= lastGreen);
lastGreen = qGreen(p);
}
}
resultImage.convertToColorSpace(csfrom);
// The images are not exactly identical at 4x16bit, but they preserve 4x8bit accuracy.
for (int y = 0; y < 256; ++y) {
for (int x = 0; x < 256; ++x) {
QCOMPARE(resultImage.pixel(x, y), testImage.pixel(x, y));
}
}
}
void tst_QColorSpace::loadImage()
{