JXR: added CMYK image to read test

Improved read test to skip unsupported image format: the CMYK image test only works if you compile with Qt 6.8 or higher.
This commit is contained in:
Mirco Miranda
2024-06-07 14:09:34 +00:00
committed by Albert Astals Cid
parent 4f61e3912c
commit cb5ca7fc48
6 changed files with 34 additions and 7 deletions

View File

@ -28,9 +28,12 @@ bool TemplateImage::isTemplate() const
return false;
}
QFileInfo TemplateImage::compareImage() const
QFileInfo TemplateImage::compareImage(bool &skipTest) const
{
auto fi = jsonImage();
auto fi = jsonImage(skipTest);
if (skipTest) {
return {};
}
if (fi.exists()) {
return fi;
}
@ -55,7 +58,7 @@ QFileInfo TemplateImage::legacyImage() const
return {};
}
QFileInfo TemplateImage::jsonImage() const
QFileInfo TemplateImage::jsonImage(bool &skipTest) const
{
auto fi = QFileInfo(QStringLiteral("%1.json").arg(m_fi.filePath()));
if (!fi.exists()) {
@ -82,14 +85,19 @@ QFileInfo TemplateImage::jsonImage() const
auto minQt = QVersionNumber::fromString(obj.value("minQtVersion").toString());
auto maxQt = QVersionNumber::fromString(obj.value("maxQtVersion").toString());
auto name = obj.value("fileName").toString();
auto unsupportedFormat = obj.value("unsupportedFormat").toBool();
// filter
if (name.isEmpty())
if (name.isEmpty() && !unsupportedFormat)
continue;
if (!minQt.isNull() && currentQt < minQt)
continue;
if (!maxQt.isNull() && currentQt > maxQt)
continue;
if (unsupportedFormat) {
skipTest = true;
break;
}
return QFileInfo(QStringLiteral("%1/%2").arg(fi.path(), name));
}