Full range HDR support

EXR, HDR, JXR and PFM formats support High Dynamic Range images (FP values grater than 1).

In summary, here is the list of changes:

    EXR, HDR, JXR and PFM: When working with FP formats, the clamp between 0 and 1 ​​is no longer done.
    EXR: Removed old SDR code and conversions. Due to the lack of a QImage Gray FP format, Gray images are output as RGB FP (recently added code for Qt 6.8 has been removed).
    PFM: Due to the lack of a QImage Gray FP format, Gray images are output as RGB FP.
    HDR: Added rotation and exposure support.

With this patch, EXR, JXR, HDR, PFM behave like Qt's TIFF plugin when working with FP images.

CMakeLists.txt

@@ -1,11 +1,11 @@
 cmake_minimum_required(VERSION 3.16)
 
-set(KF_VERSION "6.5.0") # handled by release scripts
-set(KF_DEP_VERSION "6.5.0") # handled by release scripts
+set(KF_VERSION "6.4.0") # handled by release scripts
+set(KF_DEP_VERSION "6.4.0") # handled by release scripts
 project(KImageFormats VERSION ${KF_VERSION})
 
 include(FeatureSummary)
-find_package(ECM 6.5.0  NO_MODULE)
+find_package(ECM 6.4.0  NO_MODULE)
 set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules")
 feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)
 

autotests/read/jxl/orientation6_notranfs.jxl.json

@@ -1,19 +0,0 @@
-[
-    {
-        "minQtVersion" : "6.5.7",
-        "maxQtVersion" : "6.5.99",
-        "disableAutoTransform": true,
-        "fileName" : "orientation6_notranfs.png",
-        "comment" : "Test with automatic transformation disabled."
-    },
-    {
-        "minQtVersion" : "6.7.3",
-        "disableAutoTransform": true,
-        "fileName" : "orientation6_notranfs.png",
-        "comment" : "Test with automatic transformation disabled."
-    },
-    {
-        "unsupportedFormat" : true,
-        "comment" : "It is not possible to disable the transformation with the current version of the plugin."
-    }
-]

autotests/readtest.cpp

@@ -267,13 +267,10 @@ int main(int argc, char **argv)
                 continue;
             }
 
-            TemplateImage::TestFlags flags = TemplateImage::None;
-            QString comment;
-            QFileInfo expFileInfo = timg.compareImage(flags, comment);
-            if ((flags & TemplateImage::SkipTest) == TemplateImage::SkipTest) {
-                if(comment.isEmpty())
-                    comment = QStringLiteral("image format not supported by current Qt version!");
-                QTextStream(stdout) << "SKIP : " << fi.fileName() << QStringLiteral(": %1\n").arg(comment);
+            bool skipTest = false;
+            QFileInfo expFileInfo = timg.compareImage(skipTest);
+            if (skipTest) {
+                QTextStream(stdout) << "SKIP : " << fi.fileName() << ": image format not supported by current Qt version!\n";
                 ++skipped;
                 continue;
             }
@@ -294,7 +291,7 @@ int main(int argc, char **argv)
             QImage expImage;
 
             // inputImage is auto-rotated to final orientation
-            inputReader.setAutoTransform((flags & TemplateImage::DisableAutotransform) != TemplateImage::DisableAutotransform);
+            inputReader.setAutoTransform(true);
 
             if (!expReader.read(&expImage)) {
                 QTextStream(stdout) << "ERROR: " << fi.fileName() << ": could not load " << expfilename << ": " << expReader.errorString() << "\n";

autotests/templateimage.cpp

@@ -28,10 +28,10 @@ bool TemplateImage::isTemplate() const
     return false;
 }
 
-QFileInfo TemplateImage::compareImage(TestFlags &flags, QString& comment) const
+QFileInfo TemplateImage::compareImage(bool &skipTest) const
 {
-    auto fi = jsonImage(flags, comment);
-    if ((flags & TestFlag::SkipTest) == TestFlag::SkipTest) {
+    auto fi = jsonImage(skipTest);
+    if (skipTest) {
         return {};
     }
     if (fi.exists()) {
@@ -58,9 +58,8 @@ QFileInfo TemplateImage::legacyImage() const
     return {};
 }
 
-QFileInfo TemplateImage::jsonImage(TestFlags &flags, QString& comment) const
+QFileInfo TemplateImage::jsonImage(bool &skipTest) const
 {
-    flags = TestFlag::None;
     auto fi = QFileInfo(QStringLiteral("%1.json").arg(m_fi.filePath()));
     if (!fi.exists()) {
         return {};
@@ -87,10 +86,6 @@ QFileInfo TemplateImage::jsonImage(TestFlags &flags, QString& comment) const
         auto maxQt = QVersionNumber::fromString(obj.value("maxQtVersion").toString());
         auto name = obj.value("fileName").toString();
         auto unsupportedFormat = obj.value("unsupportedFormat").toBool();
-        comment = obj.value("comment").toString();
-
-        if(obj.value("disableAutoTransform").toBool())
-            flags |= TestFlag::DisableAutotransform;
 
         // filter
         if (name.isEmpty() && !unsupportedFormat)
@@ -100,7 +95,7 @@ QFileInfo TemplateImage::jsonImage(TestFlags &flags, QString& comment) const
         if (!maxQt.isNull() && currentQt > maxQt)
             continue;
         if (unsupportedFormat) {
-            flags |= TestFlag::SkipTest;
+            skipTest = true;
             break;
         }
         return QFileInfo(QStringLiteral("%1/%2").arg(fi.path(), name));

autotests/templateimage.h

@@ -16,13 +16,6 @@
 class TemplateImage
 {
 public:
-    enum TestFlag {
-        None = 0x0,
-        SkipTest = 0x1,
-        DisableAutotransform = 0x2
-    };
-    Q_DECLARE_FLAGS(TestFlags, TestFlag)
-
     /*!
      * \brief TemplateImage
      * \param fi The image to test.
@@ -49,10 +42,10 @@ public:
 
     /*!
      * \brief compareImage
-     * \param flags Flags for modifying test behavior (e.g. image format not supported by current Qt version).
+     * \param skipTest True if the test should be skipped (e.g. image format not supported by current Qt version).
      * \return The template image to use for the comparison.
      */
-    QFileInfo compareImage(TestFlags &flags, QString& comment) const;
+    QFileInfo compareImage(bool &skipTest) const;
 
     /*!
      * \brief suffixes
@@ -69,15 +62,13 @@ private:
 
     /*!
      * \brief jsonImage
-     * \param flags Flags for modifying test behavior.
+     * \param skipTest True if the test should be skipped (not supported).
      * \return The template image read from the corresponding JSON.
      */
-    QFileInfo jsonImage(TestFlags &flags, QString& comment) const;
+    QFileInfo jsonImage(bool &skipTest) const;
 
 private:
     QFileInfo m_fi;
 };
 
-Q_DECLARE_OPERATORS_FOR_FLAGS(TemplateImage::TestFlags)
-
 #endif // TEMPLATEIMAGE_H

src/imageformats/avif.cpp

@@ -619,15 +619,7 @@ bool QAVIFHandler::write(const QImage &image)
         QImage tmpgrayimage = image.convertToFormat(tmpformat);
 
         avif = avifImageCreate(tmpgrayimage.width(), tmpgrayimage.height(), save_depth, AVIF_PIXEL_FORMAT_YUV400);
-#if AVIF_VERSION >= 110000
-        res = avifImageAllocatePlanes(avif, AVIF_PLANES_YUV);
-        if (res != AVIF_RESULT_OK) {
-            qWarning("ERROR in avifImageAllocatePlanes: %s", avifResultToString(res));
-            return false;
-        }
-#else
         avifImageAllocatePlanes(avif, AVIF_PLANES_YUV);
-#endif
 
         if (tmpgrayimage.colorSpace().isValid()) {
             avif->colorPrimaries = (avifColorPrimaries)1;
@@ -814,15 +806,7 @@ bool QAVIFHandler::write(const QImage &image)
         avif->transferCharacteristics = transfer_to_save;
 
         if (iccprofile.size() > 0) {
-#if AVIF_VERSION >= 1000000
-            res = avifImageSetProfileICC(avif, reinterpret_cast<const uint8_t *>(iccprofile.constData()), iccprofile.size());
-            if (res != AVIF_RESULT_OK) {
-                qWarning("ERROR in avifImageSetProfileICC: %s", avifResultToString(res));
-                return false;
-            }
-#else
             avifImageSetProfileICC(avif, reinterpret_cast<const uint8_t *>(iccprofile.constData()), iccprofile.size());
-#endif
         }
 
         avifRGBImage rgb;
@@ -987,8 +971,6 @@ bool QAVIFHandler::jumpToNextImage()
         return false;
     }
 
-    avifResult decodeResult;
-
     if (m_decoder->imageIndex >= 0) {
         if (m_decoder->imageCount < 2) {
             m_parseState = ParseAvifSuccess;
@@ -996,16 +978,11 @@ bool QAVIFHandler::jumpToNextImage()
         }
 
         if (m_decoder->imageIndex >= m_decoder->imageCount - 1) { // start from beginning
-            decodeResult = avifDecoderReset(m_decoder);
-            if (decodeResult != AVIF_RESULT_OK) {
-                qWarning("ERROR in avifDecoderReset: %s", avifResultToString(decodeResult));
-                m_parseState = ParseAvifError;
-                return false;
-            }
+            avifDecoderReset(m_decoder);
         }
     }
 
-    decodeResult = avifDecoderNextImage(m_decoder);
+    avifResult decodeResult = avifDecoderNextImage(m_decoder);
 
     if (decodeResult != AVIF_RESULT_OK) {
         qWarning("ERROR: Failed to decode Next image in sequence: %s", avifResultToString(decodeResult));

src/imageformats/exr.cpp

@@ -297,27 +297,23 @@ static void readMetadata(const Imf::Header &header, QImage &image)
         image.setText(QStringLiteral(META_KEY_XMP_ADOBE), QString::fromStdString(xmp->value()));
     }
 
-    // camera metadata
-    if (auto manufacturer = header.findTypedAttribute<Imf::StringAttribute>("cameraMake")) {
-        image.setText(QStringLiteral(META_KEY_MANUFACTURER), QString::fromStdString(manufacturer->value()));
-    }
-    if (auto model = header.findTypedAttribute<Imf::StringAttribute>("cameraModel")) {
-        image.setText(QStringLiteral(META_KEY_MODEL), QString::fromStdString(model->value()));
-    }
-    if (auto serial = header.findTypedAttribute<Imf::StringAttribute>("cameraSerialNumber")) {
-        image.setText(QStringLiteral(META_KEY_SERIALNUMBER), QString::fromStdString(serial->value()));
-    }
-
-    // lens metadata
-    if (auto manufacturer = header.findTypedAttribute<Imf::StringAttribute>("lensMake")) {
-        image.setText(QStringLiteral(META_KEY_LENS_MANUFACTURER), QString::fromStdString(manufacturer->value()));
-    }
-    if (auto model = header.findTypedAttribute<Imf::StringAttribute>("lensModel")) {
-        image.setText(QStringLiteral(META_KEY_LENS_MODEL), QString::fromStdString(model->value()));
-    }
-    if (auto serial = header.findTypedAttribute<Imf::StringAttribute>("lensSerialNumber")) {
-        image.setText(QStringLiteral(META_KEY_LENS_SERIALNUMBER), QString::fromStdString(serial->value()));
-    }
+    /* TODO: OpenEXR 3.2 metadata
+     *
+     * New Optional Standard Attributes:
+     * - Support automated editorial workflow:
+     *   reelName, imageCounter, ascFramingDecisionList
+     *
+     * - Support forensics (“which other shots used that camera and lens before the camera firmware was updated?”):
+     *   cameraMake, cameraModel, cameraSerialNumber, cameraFirmware, cameraUuid, cameraLabel, lensMake, lensModel,
+     *   lensSerialNumber, lensFirmware, cameraColorBalance
+     *
+     * -Support pickup shots (reproduce critical camera settings):
+     *   shutterAngle, cameraCCTSetting, cameraTintSetting
+     *
+     * - Support metadata-driven match move:
+     *   sensorCenterOffset, sensorOverallDimensions, sensorPhotositePitch, sensorAcquisitionRectanglenominalFocalLength,
+     *   effectiveFocalLength, pinholeFocalLength, entrancePupilOffset, tStop(complementing existing 'aperture')
+     */
 }
 
 /*!
@@ -507,26 +503,6 @@ static void setMetadata(const QImage &image, Imf::Header &header)
             header.insert("xmp", Imf::StringAttribute(text.toStdString()));
         }
 #endif
-
-        if (!key.compare(QStringLiteral(META_KEY_MANUFACTURER), Qt::CaseInsensitive)) {
-            header.insert("cameraMake", Imf::StringAttribute(text.toStdString()));
-        }
-        if (!key.compare(QStringLiteral(META_KEY_MODEL), Qt::CaseInsensitive)) {
-            header.insert("cameraModel", Imf::StringAttribute(text.toStdString()));
-        }
-        if (!key.compare(QStringLiteral(META_KEY_SERIALNUMBER), Qt::CaseInsensitive)) {
-            header.insert("cameraSerialNumber", Imf::StringAttribute(text.toStdString()));
-        }
-
-        if (!key.compare(QStringLiteral(META_KEY_LENS_MANUFACTURER), Qt::CaseInsensitive)) {
-            header.insert("lensMake", Imf::StringAttribute(text.toStdString()));
-        }
-        if (!key.compare(QStringLiteral(META_KEY_LENS_MODEL), Qt::CaseInsensitive)) {
-            header.insert("lensModel", Imf::StringAttribute(text.toStdString()));
-        }
-        if (!key.compare(QStringLiteral(META_KEY_LENS_SERIALNUMBER), Qt::CaseInsensitive)) {
-            header.insert("lensSerialNumber", Imf::StringAttribute(text.toStdString()));
-        }
     }
     if (dateTime.isValid()) {
         header.insert("capDate", Imf::StringAttribute(dateTime.toString(QStringLiteral("yyyy:MM:dd HH:mm:ss")).toStdString()));
@@ -543,6 +519,8 @@ static void setMetadata(const QImage &image, Imf::Header &header)
     // If a file doesn’t have a chromaticities attribute, display software should assume that the
     // file’s primaries and the white point match Rec. ITU-R BT.709-3.
     // header.insert("chromaticities", Imf::ChromaticitiesAttribute(Imf::Chromaticities()));
+
+    // TODO: EXR 3.2 attributes (see readMetadata())
 }
 
 bool EXRHandler::write(const QImage &image)

src/imageformats/jxl.cpp

@@ -16,19 +16,11 @@
 #include <jxl/thread_parallel_runner.h>
 #include <string.h>
 
-// Avoid rotation on buggy Qts (see also https://bugreports.qt.io/browse/QTBUG-126575)
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 7) && QT_VERSION < QT_VERSION_CHECK(6, 6, 0)) || (QT_VERSION >= QT_VERSION_CHECK(6, 7, 3))
-#ifndef JXL_QT_AUTOTRANSFORM
-#define JXL_QT_AUTOTRANSFORM
-#endif
-#endif
-
 QJpegXLHandler::QJpegXLHandler()
     : m_parseState(ParseJpegXLNotParsed)
     , m_quality(90)
     , m_currentimage_index(0)
     , m_previousimage_index(-1)
-    , m_transformations(QImageIOHandler::TransformationNone)
     , m_decoder(nullptr)
     , m_runner(nullptr)
     , m_next_image_delay(0)
@@ -137,11 +129,6 @@ bool QJpegXLHandler::ensureDecoder()
         return false;
     }
 
-#ifdef JXL_QT_AUTOTRANSFORM
-    // Let Qt handle the orientation.
-    JxlDecoderSetKeepOrientation(m_decoder, true);
-#endif
-
     int num_worker_threads = QThread::idealThreadCount();
     if (!m_runner && num_worker_threads >= 4) {
         /* use half of the threads because plug-in is usually used in environment
@@ -581,25 +568,10 @@ bool QJpegXLHandler::write(const QImage &image)
     pixel_format.endianness = JXL_NATIVE_ENDIAN;
     pixel_format.align = 0;
 
+    output_info.orientation = JXL_ORIENT_IDENTITY;
     output_info.num_color_channels = 3;
     output_info.animation.tps_numerator = 10;
     output_info.animation.tps_denominator = 1;
-    output_info.orientation = JXL_ORIENT_IDENTITY;
-    if (m_transformations == QImageIOHandler::TransformationMirror) {
-        output_info.orientation = JXL_ORIENT_FLIP_HORIZONTAL;
-    } else if (m_transformations == QImageIOHandler::TransformationRotate180) {
-        output_info.orientation = JXL_ORIENT_ROTATE_180;
-    } else if (m_transformations == QImageIOHandler::TransformationFlip) {
-        output_info.orientation = JXL_ORIENT_FLIP_VERTICAL;
-    } else if (m_transformations == QImageIOHandler::TransformationFlipAndRotate90) {
-        output_info.orientation = JXL_ORIENT_TRANSPOSE;
-    } else if (m_transformations == QImageIOHandler::TransformationRotate90) {
-        output_info.orientation = JXL_ORIENT_ROTATE_90_CW;
-    } else if (m_transformations == QImageIOHandler::TransformationMirrorAndRotate90) {
-        output_info.orientation = JXL_ORIENT_ANTI_TRANSPOSE;
-    } else if (m_transformations == QImageIOHandler::TransformationRotate270) {
-        output_info.orientation = JXL_ORIENT_ROTATE_90_CCW;
-    }
 
     if (save_depth > 8) { // 16bit depth
         pixel_format.data_type = JXL_TYPE_UINT16;
@@ -805,24 +777,14 @@ bool QJpegXLHandler::write(const QImage &image)
 
 QVariant QJpegXLHandler::option(ImageOption option) const
 {
-    if (!supportsOption(option)) {
-        return QVariant();
-    }
-
     if (option == Quality) {
         return m_quality;
     }
 
-    if (!ensureParsed()) {
-#ifdef JXL_QT_AUTOTRANSFORM
-        if (option == ImageTransformation) {
-            return int(m_transformations);
-        }
-#endif
+    if (!supportsOption(option) || !ensureParsed()) {
         return QVariant();
     }
 
-
     switch (option) {
     case Size:
         return QSize(m_basicinfo.xsize, m_basicinfo.ysize);
@@ -832,31 +794,9 @@ QVariant QJpegXLHandler::option(ImageOption option) const
         } else {
             return false;
         }
-#ifdef JXL_QT_AUTOTRANSFORM
-    case ImageTransformation:
-        if (m_basicinfo.orientation == JXL_ORIENT_IDENTITY) {
-            return int(QImageIOHandler::TransformationNone);
-        } else if (m_basicinfo.orientation == JXL_ORIENT_FLIP_HORIZONTAL) {
-            return int(QImageIOHandler::TransformationMirror);
-        } else if (m_basicinfo.orientation == JXL_ORIENT_ROTATE_180) {
-            return int(QImageIOHandler::TransformationRotate180);
-        } else if (m_basicinfo.orientation == JXL_ORIENT_FLIP_VERTICAL) {
-            return int(QImageIOHandler::TransformationFlip);
-        } else if (m_basicinfo.orientation == JXL_ORIENT_TRANSPOSE) {
-            return int(QImageIOHandler::TransformationFlipAndRotate90);
-        } else if (m_basicinfo.orientation == JXL_ORIENT_ROTATE_90_CW) {
-            return int(QImageIOHandler::TransformationRotate90);
-        } else if (m_basicinfo.orientation == JXL_ORIENT_ANTI_TRANSPOSE) {
-            return int(QImageIOHandler::TransformationMirrorAndRotate90);
-        } else if (m_basicinfo.orientation == JXL_ORIENT_ROTATE_90_CCW) {
-            return int(QImageIOHandler::TransformationRotate270);
-        }
-#endif
     default:
         return QVariant();
     }
-
-    return QVariant();
 }
 
 void QJpegXLHandler::setOption(ImageOption option, const QVariant &value)
@@ -870,14 +810,6 @@ void QJpegXLHandler::setOption(ImageOption option, const QVariant &value)
             m_quality = 90;
         }
         return;
-#ifdef JXL_QT_AUTOTRANSFORM
-    case ImageTransformation:
-        if (auto t = value.toInt()) {
-            if (t > 0 && t < 8)
-                m_transformations = QImageIOHandler::Transformations(t);
-        }
-        break;
-#endif
     default:
         break;
     }
@@ -886,11 +818,7 @@ void QJpegXLHandler::setOption(ImageOption option, const QVariant &value)
 
 bool QJpegXLHandler::supportsOption(ImageOption option) const
 {
-    auto supported = option == Quality || option == Size || option == Animation;
-#ifdef JXL_QT_AUTOTRANSFORM
-    supported = supported || option == ImageTransformation;
-#endif
-    return supported;
+    return option == Quality || option == Size || option == Animation;
 }
 
 int QJpegXLHandler::imageCount() const

src/imageformats/jxl_p.h

@@ -64,7 +64,6 @@ private:
     int m_quality;
     int m_currentimage_index;
     int m_previousimage_index;
-    QImageIOHandler::Transformations m_transformations;
 
     QByteArray m_rawData;
 

src/imageformats/pcx.cpp

@@ -308,11 +308,6 @@ static bool readImage4(QImage &img, QDataStream &s, const PCXHEADER &header)
         return false;
     }
 
-    if (header.BytesPerLine < (header.width() / 8)) {
-        qWarning() << "PCX image has invalid BytesPerLine value";
-        return false;
-    }
-
     for (int y = 0; y < header.height(); ++y) {
         if (s.atEnd()) {
             return false;
@@ -349,47 +344,6 @@ static bool readImage4(QImage &img, QDataStream &s, const PCXHEADER &header)
     return true;
 }
 
-static bool readImage4v2(QImage &img, QDataStream &s, const PCXHEADER &header)
-{
-    QByteArray buf(header.BytesPerLine, 0);
-
-    img = imageAlloc(header.width(), header.height(), QImage::Format_Indexed8);
-    img.setColorCount(16);
-
-    if (img.isNull()) {
-        qWarning() << "Failed to allocate image, invalid dimensions?" << QSize(header.width(), header.height());
-        return false;
-    }
-
-    for (int y = 0; y < header.height(); ++y) {
-        if (s.atEnd()) {
-            return false;
-        }
-
-        if (!readLine(s, buf, header)) {
-            return false;
-        }
-
-        uchar *p = img.scanLine(y);
-        if (!p) {
-            return false;
-        }
-
-        const unsigned int bpl = std::min(header.BytesPerLine, static_cast<quint16>(header.width() / 2));
-        for (unsigned int x = 0; x < bpl; ++x) {
-            p[x * 2] = (buf[x] & 240) >> 4;
-            p[x * 2 + 1] = buf[x] & 15;
-        }
-    }
-
-    // Read the palette
-    for (int i = 0; i < 16; ++i) {
-        img.setColor(i, header.ColorMap.color(i));
-    }
-
-    return (s.status() == QDataStream::Ok);
-}
-
 static bool readImage8(QImage &img, QDataStream &s, const PCXHEADER &header)
 {
     QByteArray buf(header.BytesPerLine, 0);
@@ -464,8 +418,6 @@ static bool readImage24(QImage &img, QDataStream &s, const PCXHEADER &header)
         return false;
     }
 
-    const unsigned int bpl = std::min(header.BytesPerLine, static_cast<quint16>(header.width()));
-
     for (int y = 0; y < header.height(); ++y) {
         if (s.atEnd()) {
             return false;
@@ -482,8 +434,7 @@ static bool readImage24(QImage &img, QDataStream &s, const PCXHEADER &header)
         }
 
         uint *p = (uint *)img.scanLine(y);
-
-        for (unsigned int x = 0; x < bpl; ++x) {
+        for (int x = 0; x < header.width(); ++x) {
             p[x] = qRgb(r_buf[x], g_buf[x], b_buf[x]);
         }
     }
@@ -721,8 +672,6 @@ bool PCXHandler::read(QImage *outImage)
         ok = readImage1(img, s, header);
     } else if (header.Bpp == 1 && header.NPlanes == 4) {
         ok = readImage4(img, s, header);
-    } else if (header.Bpp == 4 && header.NPlanes == 1) {
-        ok = readImage4v2(img, s, header);
     } else if (header.Bpp == 8 && header.NPlanes == 1) {
         ok = readImage8(img, s, header);
     } else if (header.Bpp == 8 && header.NPlanes == 3) {

src/imageformats/raw.cpp

@@ -433,7 +433,7 @@ inline void rgbToRgbX(uchar *target, const uchar *source, qint32 targetSize, qin
 #define T_FLAGS(a) (((a) >> 31) & 0x1)
 // clang-format on
 
-#define DEFAULT_IMAGE_QUALITY (C_IQ(3) | C_OC(1) | C_CW(1) | C_AW(1) | C_BT(1) | C_HS(0) | C_FLAGS(1))
+#define DEFAULT_QUALITY (C_IQ(3) | C_OC(1) | C_CW(1) | C_AW(1) | C_BT(1) | C_HS(0) | C_FLAGS(1))
 
 void setParams(QImageIOHandler *handler, LibRaw *rawProcessor)
 {
@@ -497,7 +497,7 @@ void setParams(QImageIOHandler *handler, LibRaw *rawProcessor)
         quality |= C_FLAGS(1);
     }
     if (quality == -1) {
-        quality = DEFAULT_IMAGE_QUALITY;
+        quality = DEFAULT_QUALITY;
     }
     Q_ASSERT(T_FLAGS(quality));
 

src/imageformats/util_p.h

@@ -24,22 +24,15 @@
 #define META_KEY_HOSTCOMPUTER "HostComputer"
 #define META_KEY_LATITUDE "Latitude"
 #define META_KEY_LONGITUDE "Longitude"
+#define META_KEY_HOSTCOMPUTER "HostComputer"
+#define META_KEY_MANUFACTURER "Manufacturer"
+#define META_KEY_MODEL "Model"
 #define META_KEY_OWNER "Owner"
 #define META_KEY_SOFTWARE "Software"
 #define META_KEY_TITLE "Title"
 #define META_KEY_XML_GIMP "XML:org.gimp.xml"
 #define META_KEY_XMP_ADOBE "XML:com.adobe.xmp"
 
-// Camera info metadata keys
-#define META_KEY_MANUFACTURER "Manufacturer"
-#define META_KEY_MODEL "Model"
-#define META_KEY_SERIALNUMBER "SerialNumber"
-
-// Lens info metadata keys
-#define META_KEY_LENS_MANUFACTURER "LensManufacturer"
-#define META_KEY_LENS_MODEL "LensModel"
-#define META_KEY_LENS_SERIALNUMBER "LensSerialNumber"
-
 // QList uses some extra space for stuff, hence the 32 here suggested by Thiago Macieira
 static constexpr int kMaxQVectorSize = std::numeric_limits<int>::max() - 32;
 

src/imageformats/xcf.cpp

@@ -1672,12 +1672,8 @@ bool XCFImageFormat::assignImageBytes(Layer &layer, uint i, uint j, const GimpPr
         for (int y = 0; y < height; y++) {
             uchar *dataPtr = bits + y * bytesPerLine;
             uchar *alphaPtr = nullptr;
-            if (layer.alpha_tiles.size() > j && layer.alpha_tiles.at(j).size() > i) {
-                QImage &alphaTile = layer.alpha_tiles[j][i];
-                if (alphaTile.width() >= width && alphaTile.height() > y) {
-                    alphaPtr = alphaTile.scanLine(y);
-                }
-            }
+            if (!layer.alpha_tiles.isEmpty())
+                alphaPtr = layer.alpha_tiles[j][i].scanLine(y);
             if (bpc == 4) {
 #ifdef USE_FLOAT_IMAGES
                 if (precision < GimpPrecision::GIMP_PRECISION_HALF_LINEAR) {