whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Parse PNG cHRM chunks 

Used for setting primaries without a full ICC profile.

Change-Id: I6dd8e62ca15bf1f86e7bbc01aaf8e0bd85803071
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
bb10
Allan Sandfeld Jensen 2019-07-04 18:06:29 +02:00
parent f0f46ade9e
commit 34e457e873
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/gui/image/qpnghandler.cpp
View File

@ -628,11 +628,25 @@ bool QPngHandlerPrivate::readPngHeader()
png_get_gAMA(png_ptr, info_ptr, &file_gamma);
fileGamma = file_gamma;
if (fileGamma > 0.0f && colorSpaceState <= GammaChrm) {
QColorSpacePrivate *csPrivate = colorSpace.d_func();
csPrivate->gamut = QColorSpace::Gamut::SRgb;
csPrivate->transferFunction = QColorSpace::TransferFunction::Gamma;
csPrivate->gamma = fileGamma;
csPrivate->initialize();
QColorSpacePrimaries primaries;
if (png_get_valid(png_ptr, info_ptr, PNG_INFO_cHRM)) {
double white_x, white_y, red_x, red_y;
double green_x, green_y, blue_x, blue_y;
png_get_cHRM(png_ptr, info_ptr,
&white_x, &white_y, &red_x, &red_y,
&green_x, &green_y, &blue_x, &blue_y);
primaries.whitePoint = QPointF(white_x, white_y);
primaries.redPoint = QPointF(red_x, red_y);
primaries.greenPoint = QPointF(green_x, green_y);
primaries.bluePoint = QPointF(blue_x, blue_y);
}
if (primaries.areValid()) {
colorSpace = QColorSpace(primaries.whitePoint, primaries.redPoint, primaries.greenPoint, primaries.bluePoint,
QColorSpace::TransferFunction::Gamma, fileGamma);
} else {
colorSpace = QColorSpace(QColorSpace::Gamut::SRgb,
QColorSpace::TransferFunction::Gamma, fileGamma);
}
colorSpaceState = GammaChrm;
}
}
@ -666,7 +680,7 @@ bool QPngHandlerPrivate::readPngImage(QImage *outImage)
QColorSpacePrivate *csPrivate = colorSpace.d_func();
csPrivate->transferFunction = QColorSpace::TransferFunction::Gamma;
csPrivate->gamma = gamma;
csPrivate->initialize();
csPrivate->setTransferFunction();
colorSpaceState = GammaChrm;
}