mirror/kimageformats
1
0
Fork 0
mirror of https://invent.kde.org/frameworks/kimageformats.git synced 2025-06-03 00:58:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

DDS: multiple FP improvements

Browse Source 
- Use of native qfloat16 format
- FP16 and FP32 HDR images are preserved and sRGB Linear profile is set
- Images are always saved as 8-bit so, if valid profile is present the image is converted to sRGB 
- It also fixes (left image) a problem (right image) with HDR images:
![_DF316651-18AF-498F-8689-B3613F8C9D45_](/uploads/f5deb9bff6d22dae94ecf7942d8fd806/_DF316651-18AF-498F-8689-B3613F8C9D45_.png){width=281 height=157}![_AF65379D-E6A5-4007-863D-7B60EDFB7383_](/uploads/92460f2dabbb763061f6e6143bc36719/_AF65379D-E6A5-4007-863D-7B60EDFB7383_.png){width=271 height=169}
This commit is contained in:
Mirco Miranda 2024-12-12 22:07:07 +00:00 committed by Albert Astals Cid
parent 86865223d2
commit d91c7dd912
5 changed files with 61 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
autotests/read/dds/rgba_f16.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
autotests/read/dds/rgba_f32.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
autotests/write/format/dds/Format_CMYK8888.dds
View File

Binary file not shown.

BIN
autotests/write/format/dds/Format_RGBA16FPx4.dds
View File

Binary file not shown.

104
src/imageformats/dds.cpp
View File

@ -11,6 +11,7 @@
#include "dds_p.h" #include "dds_p.h"
#include "util_p.h" #include "util_p.h"
#include <QColorSpace>
#include <QDataStream> #include <QDataStream>
#include <QDebug> #include <QDebug>
@ -826,19 +827,15 @@ static QImage readUnsignedImage(QDataStream &s, const DDSHeader &dds, quint32 wi
return image; return image;
} }
static double readFloat16(QDataStream &s) static qfloat16 readFloat16(QDataStream &s)
{ {
quint16 value; qfloat16 f16;
s >> value;
double sign = (value & 0x8000) == 0x8000 ? -1.0 : 1.0; quint16 rawData;
qint8 exp = (value & 0x7C00) >> 10; s >> rawData;
quint16 fraction = value & 0x3FF; memcpy(&f16, &rawData, sizeof(rawData));
if (exp == 0) return f16;
return sign * std::pow(2.0, -14.0) * fraction / 1024.0;
else
return sign * std::pow(2.0, exp - 15) * (1 + fraction / 1024.0);
} }
static inline float readFloat32(QDataStream &s) static inline float readFloat32(QDataStream &s)
@ -855,128 +852,139 @@ static inline float readFloat32(QDataStream &s)
static QImage readR16F(QDataStream &s, const quint32 width, const quint32 height) static QImage readR16F(QDataStream &s, const quint32 width, const quint32 height)
{ {
QImage image = imageAlloc(width, height, QImage::Format_RGB32); QImage image = imageAlloc(width, height, QImage::Format_RGBX16FPx4);
if (image.isNull()) { if (image.isNull()) {
return image; return image;
} }
for (quint32 y = 0; y < height; y++) { for (quint32 y = 0; y < height; y++) {
QRgb *line = reinterpret_cast<QRgb *>(image.scanLine(y)); qfloat16 *line = reinterpret_cast<qfloat16 *>(image.scanLine(y));
for (quint32 x = 0; x < width; x++) { for (quint32 x = 0; x < width; x++) {
quint8 r = readFloat16(s) * 255; line[x * 4] = readFloat16(s);
line[x] = qRgba(r, 0, 0, 0); line[x * 4 + 1] = 0;
line[x * 4 + 2] = 0;
line[x * 4 + 3] = 1;
if (s.status() != QDataStream::Ok) if (s.status() != QDataStream::Ok)
return QImage(); return QImage();
} }
} }
image.setColorSpace(QColorSpace(QColorSpace::SRgbLinear));
return image; return image;
} }
static QImage readRG16F(QDataStream &s, const quint32 width, const quint32 height) static QImage readRG16F(QDataStream &s, const quint32 width, const quint32 height)
{ {
QImage image = imageAlloc(width, height, QImage::Format_RGB32); QImage image = imageAlloc(width, height, QImage::Format_RGBX16FPx4);
if (image.isNull()) { if (image.isNull()) {
return image; return image;
} }
for (quint32 y = 0; y < height; y++) { for (quint32 y = 0; y < height; y++) {
QRgb *line = reinterpret_cast<QRgb *>(image.scanLine(y)); qfloat16 *line = reinterpret_cast<qfloat16 *>(image.scanLine(y));
for (quint32 x = 0; x < width; x++) { for (quint32 x = 0; x < width; x++) {
quint8 r = readFloat16(s) * 255; line[x * 4] = readFloat16(s);
quint8 g = readFloat16(s) * 255; line[x * 4 + 1] = readFloat16(s);
line[x] = qRgba(r, g, 0, 0); line[x * 4 + 2] = 0;
line[x * 4 + 3] = 1;
if (s.status() != QDataStream::Ok) if (s.status() != QDataStream::Ok)
return QImage(); return QImage();
} }
} }
image.setColorSpace(QColorSpace(QColorSpace::SRgbLinear));
return image; return image;
} }
static QImage readARGB16F(QDataStream &s, const quint32 width, const quint32 height) static QImage readARGB16F(QDataStream &s, const quint32 width, const quint32 height)
{ {
QImage image = imageAlloc(width, height, QImage::Format_ARGB32); QImage image = imageAlloc(width, height, QImage::Format_RGBA16FPx4);
if (image.isNull()) { if (image.isNull()) {
return image; return image;
} }
for (quint32 y = 0; y < height; y++) { for (quint32 y = 0; y < height; y++) {
QRgb *line = reinterpret_cast<QRgb *>(image.scanLine(y)); qfloat16 *line = reinterpret_cast<qfloat16 *>(image.scanLine(y));
for (quint32 x = 0; x < width; x++) { for (quint32 x = 0; x < width; x++) {
quint8 colors[ColorCount]; line[x * 4] = readFloat16(s);
for (int c = 0; c < ColorCount; ++c) line[x * 4 + 1] = readFloat16(s);
colors[c] = readFloat16(s) * 255; line[x * 4 + 2] = readFloat16(s);
line[x * 4 + 3] = readFloat16(s);
line[x] = qRgba(colors[Red], colors[Green], colors[Blue], colors[Alpha]);
if (s.status() != QDataStream::Ok) if (s.status() != QDataStream::Ok)
return QImage(); return QImage();
} }
} }
image.setColorSpace(QColorSpace(QColorSpace::SRgbLinear));
return image; return image;
} }
static QImage readR32F(QDataStream &s, const quint32 width, const quint32 height) static QImage readR32F(QDataStream &s, const quint32 width, const quint32 height)
{ {
QImage image = imageAlloc(width, height, QImage::Format_RGB32); QImage image = imageAlloc(width, height, QImage::Format_RGBX32FPx4);
if (image.isNull()) { if (image.isNull()) {
return image; return image;
} }
for (quint32 y = 0; y < height; y++) { for (quint32 y = 0; y < height; y++) {
QRgb *line = reinterpret_cast<QRgb *>(image.scanLine(y)); float *line = reinterpret_cast<float *>(image.scanLine(y));
for (quint32 x = 0; x < width; x++) { for (quint32 x = 0; x < width; x++) {
quint8 r = readFloat32(s) * 255; line[x * 4] = readFloat32(s);
line[x] = qRgba(r, 0, 0, 0); line[x * 4 + 1] = 0;
line[x * 4 + 2] = 0;
line[x * 4 + 3] = 1;
if (s.status() != QDataStream::Ok) if (s.status() != QDataStream::Ok)
return QImage(); return QImage();
} }
} }
image.setColorSpace(QColorSpace(QColorSpace::SRgbLinear));
return image; return image;
} }
static QImage readRG32F(QDataStream &s, const quint32 width, const quint32 height) static QImage readRG32F(QDataStream &s, const quint32 width, const quint32 height)
{ {
QImage image = imageAlloc(width, height, QImage::Format_RGB32); QImage image = imageAlloc(width, height, QImage::Format_RGBX32FPx4);
if (image.isNull()) { if (image.isNull()) {
return image; return image;
} }
for (quint32 y = 0; y < height; y++) { for (quint32 y = 0; y < height; y++) {
QRgb *line = reinterpret_cast<QRgb *>(image.scanLine(y)); float *line = reinterpret_cast<float *>(image.scanLine(y));
for (quint32 x = 0; x < width; x++) { for (quint32 x = 0; x < width; x++) {
quint8 r = readFloat32(s) * 255; line[x * 4] = readFloat32(s);
quint8 g = readFloat32(s) * 255; line[x * 4 + 1] = readFloat32(s);
line[x] = qRgba(r, g, 0, 0); line[x * 4 + 2] = 0;
line[x * 4 + 3] = 1;
if (s.status() != QDataStream::Ok) if (s.status() != QDataStream::Ok)
return QImage(); return QImage();
} }
} }
image.setColorSpace(QColorSpace(QColorSpace::SRgbLinear));
return image; return image;
} }
static QImage readARGB32F(QDataStream &s, const quint32 width, const quint32 height) static QImage readARGB32F(QDataStream &s, const quint32 width, const quint32 height)
{ {
QImage image = imageAlloc(width, height, QImage::Format_ARGB32); QImage image = imageAlloc(width, height, QImage::Format_RGBA32FPx4);
if (image.isNull()) { if (image.isNull()) {
return image; return image;
} }
for (quint32 y = 0; y < height; y++) { for (quint32 y = 0; y < height; y++) {
QRgb *line = reinterpret_cast<QRgb *>(image.scanLine(y)); float *line = reinterpret_cast<float *>(image.scanLine(y));
for (quint32 x = 0; x < width; x++) { for (quint32 x = 0; x < width; x++) {
quint8 colors[ColorCount]; line[x * 4] = readFloat32(s);
for (int c = 0; c < ColorCount; ++c) line[x * 4 + 1] = readFloat32(s);
colors[c] = readFloat32(s) * 255; line[x * 4 + 2] = readFloat32(s);
line[x] = qRgba(colors[Red], colors[Green], colors[Blue], colors[Alpha]); line[x * 4 + 3] = readFloat32(s);
if (s.status() != QDataStream::Ok) if (s.status() != QDataStream::Ok)
return QImage(); return QImage();
} }
} }
image.setColorSpace(QColorSpace(QColorSpace::SRgbLinear));
return image; return image;
} }
@ -1627,10 +1635,17 @@ static QImage readCubeMap(QDataStream &s, const DDSHeader &dds, const int fmt)
if (!(dds.caps2 & faceFlags[i])) if (!(dds.caps2 & faceFlags[i]))
continue; // Skip face. continue; // Skip face.
const QImage face = readLayer(s, dds, fmt, dds.width, dds.height); QImage face = readLayer(s, dds, fmt, dds.width, dds.height);
if (face.isNull()) { if (face.isNull()) {
return {}; return {};
} }
face.convertTo(format);
if (face.isNull()) {
return {};
}
if (face.colorSpace().isValid()) {
image.setColorSpace(face.colorSpace());
}
// Compute face offsets. // Compute face offsets.
int offset_x = faceOffsets[i].x * dds.width; int offset_x = faceOffsets[i].x * dds.width;
@ -1728,7 +1743,10 @@ bool QDDSHandler::write(const QImage &outImage)
return false; return false;
} }
const QImage image = outImage.convertToFormat(QImage::Format_ARGB32); QImage image = outImage;
if(image.colorSpace().isValid())
image = image.convertedToColorSpace(QColorSpace(QColorSpace::SRgb));
image.convertTo(QImage::Format_ARGB32);
if (image.isNull()) { if (image.isNull()) {
return false; return false;
} }