mirror/kimageformats
1
0
Fork 0
mirror of https://invent.kde.org/frameworks/kimageformats.git synced 2025-05-28 00:30:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

LAB/CMYK conversion speed improved by ~10%

Browse Source
This commit is contained in:
Mirco Miranda 2023-01-22 10:57:54 +01:00
parent cef8d08ad4
commit a67dcac7d1
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/imageformats/psd.cpp
View File

@ -845,6 +845,7 @@ inline void cmykToRgb(uchar *target, qint32 targetChannels, const char *source,
auto s = reinterpret_cast<const T*>(source); auto s = reinterpret_cast<const T*>(source);
auto t = reinterpret_cast<T*>(target); auto t = reinterpret_cast<T*>(target);
auto max = double(std::numeric_limits<T>::max()); auto max = double(std::numeric_limits<T>::max());
auto invmax = 1.0 / max; // speed improvements by ~10%
if (sourceChannels < 4) { if (sourceChannels < 4) {
qDebug() << "cmykToRgb: image is not a valid CMYK!"; qDebug() << "cmykToRgb: image is not a valid CMYK!";
@ -853,10 +854,10 @@ inline void cmykToRgb(uchar *target, qint32 targetChannels, const char *source,
for (qint32 w = 0; w < width; ++w) { for (qint32 w = 0; w < width; ++w) {
auto ps = s + sourceChannels * w; auto ps = s + sourceChannels * w;
auto C = 1 - *(ps + 0) / max; auto C = 1 - *(ps + 0) * invmax;
auto M = 1 - *(ps + 1) / max; auto M = 1 - *(ps + 1) * invmax;
auto Y = 1 - *(ps + 2) / max; auto Y = 1 - *(ps + 2) * invmax;
auto K = 1 - *(ps + 3) / max; auto K = 1 - *(ps + 3) * invmax;
auto pt = t + targetChannels * w; auto pt = t + targetChannels * w;
*(pt + 0) = T(std::min(max - (C * (1 - K) + K) * max + 0.5, max)); *(pt + 0) = T(std::min(max - (C * (1 - K) + K) * max + 0.5, max));
@ -892,6 +893,7 @@ inline void labToRgb(uchar *target, qint32 targetChannels, const char *source, q
auto s = reinterpret_cast<const T*>(source); auto s = reinterpret_cast<const T*>(source);
auto t = reinterpret_cast<T*>(target); auto t = reinterpret_cast<T*>(target);
auto max = double(std::numeric_limits<T>::max()); auto max = double(std::numeric_limits<T>::max());
auto invmax = 1.0 / max;
if (sourceChannels < 3) { if (sourceChannels < 3) {
qDebug() << "labToRgb: image is not a valid LAB!"; qDebug() << "labToRgb: image is not a valid LAB!";
@ -900,14 +902,14 @@ inline void labToRgb(uchar *target, qint32 targetChannels, const char *source, q
for (qint32 w = 0; w < width; ++w) { for (qint32 w = 0; w < width; ++w) {
auto ps = s + sourceChannels * w; auto ps = s + sourceChannels * w;
auto L = (*(ps + 0) / max) * 100.0; auto L = (*(ps + 0) * invmax) * 100.0;
auto A = (*(ps + 1) / max) * 255.0 - 128.0; auto A = (*(ps + 1) * invmax) * 255.0 - 128.0;
auto B = (*(ps + 2) / max) * 255.0 - 128.0; auto B = (*(ps + 2) * invmax) * 255.0 - 128.0;
// converting LAB to XYZ (D65 illuminant) // converting LAB to XYZ (D65 illuminant)
auto Y = (L + 16.0) / 116.0; auto Y = (L + 16.0) * (1.0 / 116.0);
auto X = A / 500.0 + Y; auto X = A * (1.0 / 500.0) + Y;
auto Z = Y - B / 200.0; auto Z = Y - B * (1.0 / 200.0);
// NOTE: use the constants of the illuminant of the target RGB color space // NOTE: use the constants of the illuminant of the target RGB color space
X = finv(X) * 0.9504; // D50: * 0.9642 X = finv(X) * 0.9504; // D50: * 0.9642
@ -1197,12 +1199,16 @@ bool PSDHandler::read(QImage *image)
return false; return false;
} }
auto t = QTime::currentTime();
QImage img; QImage img;
if (!LoadPSD(s, header, img)) { if (!LoadPSD(s, header, img)) {
// qDebug() << "Error loading PSD file."; // qDebug() << "Error loading PSD file.";
return false; return false;
} }
qDebug() << t.msecsTo(QTime::currentTime());
*image = img; *image = img;
return true; return true;
} }