mirror/kimageformats
1
0
Fork 0
mirror of https://invent.kde.org/frameworks/kimageformats.git synced 2025-07-19 12:14:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

heif: improve handling of grayscale ICC profiles

Browse Source
This commit is contained in:
Daniel Novomeský
2025-02-09 11:12:25 +01:00
parent 9fd6896cec
commit 36a6ef7d78
1 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/imageformats/heif.cpp
View File

@ -794,10 +794,40 @@ bool HEIFHandler::ensureDecoder()
if (err.code) { if (err.code) {
qWarning() << "icc profile loading failed"; qWarning() << "icc profile loading failed";
} else { } else {
m_current_image.setColorSpace(QColorSpace::fromIccProfile(ba)); QColorSpace colorspace = QColorSpace::fromIccProfile(ba);
if (!m_current_image.colorSpace().isValid()) { if (!colorspace.isValid()) {
qWarning() << "HEIC image has Qt-unsupported or invalid ICC profile!"; qWarning() << "HEIC image has Qt-unsupported or invalid ICC profile!";
} }
#if (QT_VERSION >= QT_VERSION_CHECK(6, 8, 0))
else if (colorspace.colorModel() == QColorSpace::ColorModel::Cmyk) {
qWarning("CMYK ICC profile is not expected for HEIF, discarding the ICCprofile!");
colorspace = QColorSpace();
} else if (colorspace.colorModel() == QColorSpace::ColorModel::Gray) {
if (hasAlphaChannel) {
QPointF gray_whitePoint = colorspace.whitePoint();
if (gray_whitePoint.isNull()) {
gray_whitePoint = QPointF(0.3127f, 0.329f);
}
const QPointF redP(0.64f, 0.33f);
const QPointF greenP(0.3f, 0.6f);
const QPointF blueP(0.15f, 0.06f);
QColorSpace::TransferFunction trc_new = colorspace.transferFunction();
float gamma_new = colorspace.gamma();
if (trc_new == QColorSpace::TransferFunction::Custom) {
trc_new = QColorSpace::TransferFunction::SRgb;
}
colorspace = QColorSpace(gray_whitePoint, redP, greenP, blueP, trc_new, gamma_new);
if (!colorspace.isValid()) {
qWarning("HEIF plugin created invalid QColorSpace!");
}
} else { // no alpha channel
m_current_image.convertTo(bit_depth > 8 ? QImage::Format_Grayscale16 : QImage::Format_Grayscale8);
}
}
#endif
m_current_image.setColorSpace(colorspace);
} }
} else { } else {
qWarning() << "icc profile is empty or above limits"; qWarning() << "icc profile is empty or above limits";