GIT_SILENT Upgrade ECM and KF version requirements for 5.99.0 release.

We need QIODevice::pos() to work in QDataStream &operator>>.

BUG: 459541

.gitattributes

@@ -0,0 +1 @@
+autotests/read/raw/RAW_KODAK_C330_FORMAT_NONE_YRGB.raw binary

.gitlab-ci.yml

@@ -3,7 +3,12 @@
 
 include:
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-static.yml
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android.yml
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android-qt6.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows-static.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd-qt6.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows-qt6.yml

.kde-ci.yml

@@ -6,3 +6,4 @@ Dependencies:
 
 Options:
   test-before-installing: True
+  require-passing-tests-on: [ 'Linux', 'FreeBSD', 'Windows' ]

CMakeLists.txt

@@ -3,19 +3,19 @@ cmake_minimum_required(VERSION 3.16)
 project(KImageFormats)
 
 include(FeatureSummary)
-find_package(ECM 5.93.0  NO_MODULE)
+find_package(ECM 5.99.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)
 
 
-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
+set(CMAKE_MODULE_PATH ${KImageFormats_SOURCE_DIR}/cmake/find-modules ${ECM_MODULE_PATH})
 
 include(KDEInstallDirs)
 include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
 include(KDECMakeSettings)
+
 include(KDEGitCommitHooks)
-
-
+include(ECMDeprecationSettings)
 include(CheckIncludeFiles)
 include(FindPkgConfig)
 
@@ -70,8 +70,18 @@ if(KIMAGEFORMATS_JXL)
 endif()
 add_feature_info(LibJXL LibJXL_FOUND "required for the QImage plugin for JPEG XL images")
 
-add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02)
-add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055900)
+# note: module FindLibRaw missing from https://invent.kde.org/frameworks/extra-cmake-modules
+find_package(LibRaw 0.20.2)
+set_package_properties(LibRaw PROPERTIES
+    TYPE OPTIONAL
+    PURPOSE "Required for the QImage plugin for RAW images"
+)
+
+ecm_set_disabled_deprecation_versions(
+    QT 5.15.2
+    KF 5.95
+)
+
 add_subdirectory(src)
 if (BUILD_TESTING)
     add_subdirectory(autotests)

README.md

@@ -16,8 +16,9 @@ The following image formats have read-only support:
 - Animated Windows cursors (ani)
 - Gimp (xcf)
 - OpenEXR (exr)
-- Photoshop documents (psd)
+- Photoshop documents (psd, psb, pdd, psdt)
 - Sun Raster (ras)
+- Camera RAW images (arw, cr2, cr3, dcs, dng, ...)
 
 The following image formats have read and write support:
 

autotests/CMakeLists.txt

@@ -86,8 +86,7 @@ if (TARGET avif)
     kimageformats_read_tests(
         avif
     )
-    # because the plug-ins use RGB->YUV conversion which sometimes results in 1 value difference.
-    kimageformats_write_tests(FUZZ 1
+    kimageformats_write_tests(
         avif-nodatacheck-lossless
     )
 endif()
@@ -140,6 +139,12 @@ if (OpenEXR_FOUND)
     # FIXME: OpenEXR tests
 endif()
 
+if (LibRaw_FOUND)
+    kimageformats_read_tests(
+        raw
+    )
+endif()
+
 find_package(Qt${QT_MAJOR_VERSION}Test ${REQUIRED_QT_VERSION} CONFIG QUIET)
 
 if(NOT TARGET Qt${QT_MAJOR_VERSION}::Test)

autotests/readtest.cpp

@@ -94,7 +94,6 @@ int main(int argc, char **argv)
     QByteArray format = suffix.toLatin1();
 
     QDir imgdir(QLatin1String(IMAGEDIR "/") + suffix);
-    imgdir.setNameFilters(QStringList(QLatin1String("*.") + suffix));
     imgdir.setFilter(QDir::Files);
 
     int passed = 0;
@@ -113,6 +112,9 @@ int main(int argc, char **argv)
 
     const QFileInfoList lstImgDir = imgdir.entryInfoList();
     for (const QFileInfo &fi : lstImgDir) {
+        if (!fi.suffix().compare("png", Qt::CaseInsensitive)) {
+            continue;
+        }
         int suffixPos = fi.filePath().count() - suffix.count();
         QString inputfile = fi.filePath();
         QString expfile = fi.filePath().replace(suffixPos, suffix.count(), QStringLiteral("png"));

cmake/find-modules/FindLibRaw.cmake

@@ -0,0 +1,87 @@
+# - Find LibRaw
+# Find the LibRaw library <https://www.libraw.org>
+# This module defines
+#  LibRaw_VERSION, the version string of LibRaw
+#  LibRaw_INCLUDE_DIR, where to find libraw.h
+#  LibRaw_LIBRARIES, the libraries needed to use LibRaw (non-thread-safe)
+#  LibRaw_r_LIBRARIES, the libraries needed to use LibRaw (thread-safe)
+#  LibRaw_DEFINITIONS, the definitions needed to use LibRaw (non-thread-safe)
+#  LibRaw_r_DEFINITIONS, the definitions needed to use LibRaw (thread-safe)
+#
+# SPDX-FileCopyrightText: 2013 Pino Toscano <pino at kde dot org>
+# SPDX-FileCopyrightText: 2013 Gilles Caulier <caulier dot gilles at gmail dot com>
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
+FIND_PACKAGE(PkgConfig)
+
+IF(PKG_CONFIG_FOUND)
+   PKG_CHECK_MODULES(PC_LIBRAW libraw)
+   SET(LibRaw_DEFINITIONS ${PC_LIBRAW_CFLAGS_OTHER})
+
+   PKG_CHECK_MODULES(PC_LIBRAW_R libraw_r)
+   SET(LibRaw_r_DEFINITIONS ${PC_LIBRAW_R_CFLAGS_OTHER})   
+ENDIF()
+
+FIND_PATH(LibRaw_INCLUDE_DIR libraw.h
+          HINTS
+          ${PC_LIBRAW_INCLUDEDIR}
+          ${PC_LibRaw_INCLUDE_DIRS}
+          PATH_SUFFIXES libraw
+         )
+
+FIND_LIBRARY(LibRaw_LIBRARIES NAMES raw
+             HINTS
+             ${PC_LIBRAW_LIBDIR}
+             ${PC_LIBRAW_LIBRARY_DIRS}
+            )
+
+FIND_LIBRARY(LibRaw_r_LIBRARIES NAMES raw_r
+             HINTS
+             ${PC_LIBRAW_R_LIBDIR}
+             ${PC_LIBRAW_R_LIBRARY_DIRS}
+            )
+
+IF(LibRaw_INCLUDE_DIR)
+   FILE(READ ${LibRaw_INCLUDE_DIR}/libraw_version.h _libraw_version_content)
+   
+   STRING(REGEX MATCH "#define LIBRAW_MAJOR_VERSION[ \t]*([0-9]*)\n" _version_major_match ${_libraw_version_content})
+   SET(_libraw_version_major "${CMAKE_MATCH_1}")
+   
+   STRING(REGEX MATCH "#define LIBRAW_MINOR_VERSION[ \t]*([0-9]*)\n" _version_minor_match ${_libraw_version_content})
+   SET(_libraw_version_minor "${CMAKE_MATCH_1}")
+   
+   STRING(REGEX MATCH "#define LIBRAW_PATCH_VERSION[ \t]*([0-9]*)\n" _version_patch_match ${_libraw_version_content})
+   SET(_libraw_version_patch "${CMAKE_MATCH_1}")
+   
+   IF(_version_major_match AND _version_minor_match AND _version_patch_match)
+      SET(LibRaw_VERSION "${_libraw_version_major}.${_libraw_version_minor}.${_libraw_version_patch}")
+   ELSE()
+      IF(NOT LibRaw_FIND_QUIETLY)
+         MESSAGE(STATUS "Failed to get version information from ${LibRaw_INCLUDE_DIR}/libraw_version.h")
+      ENDIF()
+   ENDIF()
+ENDIF()
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibRaw
+                                  REQUIRED_VARS LibRaw_LIBRARIES LibRaw_INCLUDE_DIR
+                                  VERSION_VAR LibRaw_VERSION
+                                 )
+
+MARK_AS_ADVANCED(LibRaw_VERSION
+                 LibRaw_INCLUDE_DIR
+                 LibRaw_LIBRARIES
+                 LibRaw_r_LIBRARIES
+                 LibRaw_DEFINITIONS
+                 LibRaw_r_DEFINITIONS
+                 )
+
+if(LibRaw_FOUND AND NOT TARGET LibRaw::LibRaw)
+    add_library(LibRaw::LibRaw UNKNOWN IMPORTED)
+    set_target_properties(LibRaw::LibRaw PROPERTIES
+        IMPORTED_LOCATION "${LibRaw_LIBRARIES}"
+        INTERFACE_COMPILE_OPTIONS "${LibRaw_DEFINITIONS}"
+        INTERFACE_INCLUDE_DIRECTORIES "${LibRaw_INCLUDE_DIR}"
+    )
+endif()

src/imageformats/CMakeLists.txt

@@ -4,6 +4,7 @@
 
 function(kimageformats_add_plugin plugin)
     set(options)
+    set(oneValueArgs)
     set(multiValueArgs SOURCES)
     cmake_parse_arguments(KIF_ADD_PLUGIN "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
     if(NOT KIF_ADD_PLUGIN_SOURCES)
@@ -86,6 +87,9 @@ endif()
 if (LibJXL_FOUND AND LibJXLThreads_FOUND)
     kimageformats_add_plugin(kimg_jxl SOURCES jxl.cpp)
     target_link_libraries(kimg_jxl PkgConfig::LibJXL PkgConfig::LibJXLThreads)
+    if (LibJXL_VERSION VERSION_GREATER_EQUAL "0.7.0")
+        target_compile_definitions(kimg_jxl PRIVATE KIMG_JXL_API_VERSION=70)
+    endif()
     install(FILES jxl.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR}/qimageioplugins/)
 endif()
 
@@ -126,6 +130,15 @@ install(FILES xcf.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR}/qimageioplugin
 
 ##################################
 
+if (LibRaw_FOUND)
+    kimageformats_add_plugin(kimg_raw SOURCES raw.cpp)
+    kde_enable_exceptions()
+    target_link_libraries(kimg_raw LibRaw::LibRaw)
+    install(FILES raw.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR}/qimageioplugins/)
+endif()
+
+##################################
+
 if (KF5Archive_FOUND)
 
     kimageformats_add_plugin(kimg_kra SOURCES kra.cpp)

src/imageformats/avif.cpp

@@ -12,6 +12,8 @@
 #include <QColorSpace>
 
 #include "avif_p.h"
+#include "util_p.h"
+
 #include <cfloat>
 
 QAVIFHandler::QAVIFHandler()
@@ -67,7 +69,7 @@ bool QAVIFHandler::canRead(QIODevice *device)
 
 bool QAVIFHandler::ensureParsed() const
 {
-    if (m_parseState == ParseAvifSuccess) {
+    if (m_parseState == ParseAvifSuccess || m_parseState == ParseAvifMetadata) {
         return true;
     }
     if (m_parseState == ParseAvifError) {
@@ -79,6 +81,28 @@ bool QAVIFHandler::ensureParsed() const
     return that->ensureDecoder();
 }
 
+bool QAVIFHandler::ensureOpened() const
+{
+    if (m_parseState == ParseAvifSuccess) {
+        return true;
+    }
+    if (m_parseState == ParseAvifError) {
+        return false;
+    }
+
+    QAVIFHandler *that = const_cast<QAVIFHandler *>(this);
+    if (ensureParsed()) {
+        if (m_parseState == ParseAvifMetadata) {
+            bool success = that->jumpToNextImage();
+            that->m_parseState = success ? ParseAvifSuccess : ParseAvifError;
+            return success;
+        }
+    }
+
+    that->m_parseState = ParseAvifError;
+    return false;
+}
+
 bool QAVIFHandler::ensureDecoder()
 {
     if (m_decoder) {
@@ -97,6 +121,9 @@ bool QAVIFHandler::ensureDecoder()
 
     m_decoder = avifDecoderCreate();
 
+    m_decoder->ignoreExif = AVIF_TRUE;
+    m_decoder->ignoreXMP = AVIF_TRUE;
+
 #if AVIF_VERSION >= 80400
     m_decoder->maxThreads = qBound(1, QThread::idealThreadCount(), 64);
 #endif
@@ -127,9 +154,6 @@ bool QAVIFHandler::ensureDecoder()
         return false;
     }
 
-    decodeResult = avifDecoderNextImage(m_decoder);
-
-    if (decodeResult == AVIF_RESULT_OK) {
     m_container_width = m_decoder->image->width;
     m_container_height = m_decoder->image->height;
 
@@ -151,21 +175,37 @@ bool QAVIFHandler::ensureDecoder()
         return false;
     }
 
-        m_parseState = ParseAvifSuccess;
-        if (decode_one_frame()) {
-            return true;
-        } else {
-            m_parseState = ParseAvifError;
-            return false;
+    // calculate final dimensions with crop and rotate operations applied
+    int new_width = m_container_width;
+    int new_height = m_container_height;
+
+    if (m_decoder->image->transformFlags & AVIF_TRANSFORM_CLAP) {
+        if ((m_decoder->image->clap.widthD > 0) && (m_decoder->image->clap.heightD > 0) && (m_decoder->image->clap.horizOffD > 0)
+            && (m_decoder->image->clap.vertOffD > 0)) {
+            int crop_width = (int)((double)(m_decoder->image->clap.widthN) / (m_decoder->image->clap.widthD) + 0.5);
+            if (crop_width < new_width && crop_width > 0) {
+                new_width = crop_width;
+            }
+            int crop_height = (int)((double)(m_decoder->image->clap.heightN) / (m_decoder->image->clap.heightD) + 0.5);
+            if (crop_height < new_height && crop_height > 0) {
+                new_height = crop_height;
+            }
         }
-    } else {
-        qWarning("ERROR: Failed to decode image: %s", avifResultToString(decodeResult));
     }
 
-    avifDecoderDestroy(m_decoder);
-    m_decoder = nullptr;
-    m_parseState = ParseAvifError;
-    return false;
+    if (m_decoder->image->transformFlags & AVIF_TRANSFORM_IROT) {
+        if (m_decoder->image->irot.angle == 1 || m_decoder->image->irot.angle == 3) {
+            int tmp = new_width;
+            new_width = new_height;
+            new_height = tmp;
+        }
+    }
+
+    m_estimated_dimensions.setWidth(new_width);
+    m_estimated_dimensions.setHeight(new_height);
+
+    m_parseState = ParseAvifMetadata;
+    return true;
 }
 
 bool QAVIFHandler::decode_one_frame()
@@ -192,13 +232,13 @@ bool QAVIFHandler::decode_one_frame()
         }
     } else {
         if (loadalpha) {
-            resultformat = QImage::Format_RGBA8888;
+            resultformat = QImage::Format_ARGB32;
         } else {
-            resultformat = QImage::Format_RGBX8888;
+            resultformat = QImage::Format_RGB32;
         }
     }
-    QImage result(m_decoder->image->width, m_decoder->image->height, resultformat);
 
+    QImage result = imageAlloc(m_decoder->image->width, m_decoder->image->height, resultformat);
     if (result.isNull()) {
         qWarning("Memory cannot be allocated");
         return false;
@@ -285,37 +325,38 @@ bool QAVIFHandler::decode_one_frame()
         rgb.depth = 16;
         rgb.format = AVIF_RGB_FORMAT_RGBA;
 
-        if (!loadalpha) {
-            if (m_decoder->image->yuvFormat == AVIF_PIXEL_FORMAT_YUV400) {
+        if (!loadalpha && (m_decoder->image->yuvFormat == AVIF_PIXEL_FORMAT_YUV400)) {
             resultformat = QImage::Format_Grayscale16;
         }
-        }
     } else {
         rgb.depth = 8;
-        rgb.format = AVIF_RGB_FORMAT_RGBA;
+#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
+        rgb.format = AVIF_RGB_FORMAT_BGRA;
+#else
+        rgb.format = AVIF_RGB_FORMAT_ARGB;
+#endif
 
-#if AVIF_VERSION >= 80400
+#if (AVIF_VERSION >= 80400) && (AVIF_VERSION <= 100100)
         if (m_decoder->imageCount > 1) {
             /* accelerate animated AVIF */
             rgb.chromaUpsampling = AVIF_CHROMA_UPSAMPLING_FASTEST;
         }
 #endif
 
-        if (loadalpha) {
-            resultformat = QImage::Format_ARGB32;
-        } else {
-            if (m_decoder->image->yuvFormat == AVIF_PIXEL_FORMAT_YUV400) {
+        if (!loadalpha && (m_decoder->image->yuvFormat == AVIF_PIXEL_FORMAT_YUV400)) {
             resultformat = QImage::Format_Grayscale8;
-            } else {
-                resultformat = QImage::Format_RGB32;
-            }
         }
     }
 
     rgb.rowBytes = result.bytesPerLine();
     rgb.pixels = result.bits();
 
+#if AVIF_VERSION >= 100101
+    // use faster decoding for animations
+    avifResult res = avifImageYUVToRGB(m_decoder->image, &rgb, (m_decoder->imageCount > 1) ? AVIF_CHROMA_UPSAMPLING_NEAREST : AVIF_YUV_TO_RGB_DEFAULT);
+#else
     avifResult res = avifImageYUVToRGB(m_decoder->image, &rgb);
+#endif
     if (res != AVIF_RESULT_OK) {
         qWarning("ERROR in avifImageYUVToRGB: %s", avifResultToString(res));
         return false;
@@ -399,13 +440,15 @@ bool QAVIFHandler::decode_one_frame()
         m_current_image = result.convertToFormat(resultformat);
     }
 
+    m_estimated_dimensions = m_current_image.size();
+
     m_must_jump_to_next_image = false;
     return true;
 }
 
 bool QAVIFHandler::read(QImage *image)
 {
-    if (!ensureParsed()) {
+    if (!ensureOpened()) {
         return false;
     }
 
@@ -452,8 +495,13 @@ bool QAVIFHandler::write(const QImage &image)
         return false;
     }
 
-    if (m_quality >= 100 && !avifCodecName(AVIF_CODEC_CHOICE_AOM, AVIF_CODEC_FLAG_CAN_ENCODE)) {
-        qWarning("You are using %s encoder. It is recommended to enable libAOM encoder in libavif for better near-lossless compression.", encoder_name);
+    bool lossless = false;
+    if (m_quality >= 100) {
+        if (avifCodecName(AVIF_CODEC_CHOICE_AOM, AVIF_CODEC_FLAG_CAN_ENCODE)) {
+            lossless = true;
+        } else {
+            qWarning("You are using %s encoder. It is recommended to enable libAOM encoder in libavif to use lossless compression.", encoder_name);
+        }
     }
 
     int maxQuantizer = AVIF_QUANTIZER_WORST_QUALITY * (100 - qBound(0, m_quality, 100)) / 100;
@@ -648,6 +696,9 @@ bool QAVIFHandler::write(const QImage &image)
 
             // in case primaries or trc were not identified
             if ((primaries_to_save == 2) || (transfer_to_save == 2)) {
+                if (lossless) {
+                    iccprofile = tmpcolorimage.colorSpace().iccProfile();
+                } else {
                     // upgrade image to higher bit depth
                     if (save_depth == 8) {
                         save_depth = 10;
@@ -687,6 +738,7 @@ bool QAVIFHandler::write(const QImage &image)
                         tmpcolorimage.convertToColorSpace(QColorSpace(QColorSpace::Primaries::SRgb, QColorSpace::TransferFunction::SRgb));
                     }
                 }
+            }
         } else { // profile is unsupported by Qt
             iccprofile = tmpcolorimage.colorSpace().iccProfile();
             if (iccprofile.size() > 0) {
@@ -694,6 +746,9 @@ bool QAVIFHandler::write(const QImage &image)
             }
         }
 
+        if (lossless && pixel_format == AVIF_PIXEL_FORMAT_YUV444) {
+            matrix_to_save = (avifMatrixCoefficients)0;
+        }
         avif = avifImageCreate(tmpcolorimage.width(), tmpcolorimage.height(), save_depth, pixel_format);
         avif->matrixCoefficients = matrix_to_save;
 
@@ -712,9 +767,7 @@ bool QAVIFHandler::write(const QImage &image)
         if (save_depth > 8) { // 10bit depth
             rgb.depth = 16;
 
-            if (tmpcolorimage.hasAlphaChannel()) {
-                avif->alphaRange = AVIF_RANGE_FULL;
-            } else {
+            if (!tmpcolorimage.hasAlphaChannel()) {
                 rgb.ignoreAlpha = AVIF_TRUE;
             }
 
@@ -724,13 +777,16 @@ bool QAVIFHandler::write(const QImage &image)
 
             if (tmpcolorimage.hasAlphaChannel()) {
                 rgb.format = AVIF_RGB_FORMAT_RGBA;
-                avif->alphaRange = AVIF_RANGE_FULL;
             } else {
                 rgb.format = AVIF_RGB_FORMAT_RGB;
             }
         }
 
+#if AVIF_VERSION >= 100101
+        res = avifImageRGBToYUV(avif, &rgb, AVIF_RGB_TO_YUV_DEFAULT);
+#else
         res = avifImageRGBToYUV(avif, &rgb);
+#endif
         if (res != AVIF_RESULT_OK) {
             qWarning("ERROR in avifImageRGBToYUV: %s", avifResultToString(res));
             return false;
@@ -755,7 +811,7 @@ bool QAVIFHandler::write(const QImage &image)
     avifImageDestroy(avif);
 
     if (res == AVIF_RESULT_OK) {
-        qint64 status = device()->write((const char *)raw.data, raw.size);
+        qint64 status = device()->write(reinterpret_cast<const char *>(raw.data), raw.size);
         avifRWDataFree(&raw);
 
         if (status > 0) {
@@ -783,7 +839,7 @@ QVariant QAVIFHandler::option(ImageOption option) const
 
     switch (option) {
     case Size:
-        return m_current_image.size();
+        return m_estimated_dimensions;
     case Animation:
         if (imageCount() >= 2) {
             return true;
@@ -839,6 +895,14 @@ int QAVIFHandler::currentImageNumber() const
         return 0;
     }
 
+    if (m_parseState == ParseAvifMetadata) {
+        if (m_decoder->imageCount >= 2) {
+            return -1;
+        } else {
+            return 0;
+        }
+    }
+
     return m_decoder->imageIndex;
 }
 
@@ -848,6 +912,7 @@ bool QAVIFHandler::jumpToNextImage()
         return false;
     }
 
+    if (m_decoder->imageIndex >= 0) {
         if (m_decoder->imageCount < 2) {
             return true;
         }
@@ -855,6 +920,7 @@ bool QAVIFHandler::jumpToNextImage()
         if (m_decoder->imageIndex >= m_decoder->imageCount - 1) { // start from beginning
             avifDecoderReset(m_decoder);
         }
+    }
 
     avifResult decodeResult = avifDecoderNextImage(m_decoder);
 
@@ -876,6 +942,7 @@ bool QAVIFHandler::jumpToNextImage()
     }
 
     if (decode_one_frame()) {
+        m_parseState = ParseAvifSuccess;
         return true;
     } else {
         m_parseState = ParseAvifError;
@@ -891,7 +958,7 @@ bool QAVIFHandler::jumpToImage(int imageNumber)
 
     if (m_decoder->imageCount < 2) { // not an animation
         if (imageNumber == 0) {
-            return true;
+            return ensureOpened();
         } else {
             return false;
         }
@@ -926,6 +993,7 @@ bool QAVIFHandler::jumpToImage(int imageNumber)
     }
 
     if (decode_one_frame()) {
+        m_parseState = ParseAvifSuccess;
         return true;
     } else {
         m_parseState = ParseAvifError;
@@ -935,7 +1003,7 @@ bool QAVIFHandler::jumpToImage(int imageNumber)
 
 int QAVIFHandler::nextImageDelay() const
 {
-    if (!ensureParsed()) {
+    if (!ensureOpened()) {
         return 0;
     }
 

src/imageformats/avif_p.h

@@ -13,6 +13,7 @@
 #include <QImage>
 #include <QImageIOPlugin>
 #include <QPointF>
+#include <QSize>
 #include <QVariant>
 #include <avif/avif.h>
 #include <qimageiohandler.h>
@@ -45,6 +46,7 @@ public:
 private:
     static QPointF CompatibleChromacity(qreal chrX, qreal chrY);
     bool ensureParsed() const;
+    bool ensureOpened() const;
     bool ensureDecoder();
     bool decode_one_frame();
 
@@ -52,6 +54,7 @@ private:
         ParseAvifError = -1,
         ParseAvifNotParsed = 0,
         ParseAvifSuccess = 1,
+        ParseAvifMetadata = 2,
     };
 
     ParseAvifState m_parseState;
@@ -59,6 +62,7 @@ private:
 
     uint32_t m_container_width;
     uint32_t m_container_height;
+    QSize m_estimated_dimensions;
 
     QByteArray m_rawData;
     avifROData m_rawAvifData;

src/imageformats/exr.cpp

@@ -8,6 +8,7 @@
 */
 
 #include "exr_p.h"
+#include "util_p.h"
 
 #include <IexThrowErrnoExc.h>
 #include <ImathBox.h>
@@ -191,7 +192,7 @@ bool EXRHandler::read(QImage *outImage)
         width = dw.max.x - dw.min.x + 1;
         height = dw.max.y - dw.min.y + 1;
 
-        QImage image(width, height, QImage::Format_RGB32);
+        QImage image = imageAlloc(width, height, QImage::Format_RGB32);
         if (image.isNull()) {
             qWarning() << "Failed to allocate image, invalid size?" << QSize(width, height);
             return false;

src/imageformats/hdr.cpp

@@ -7,6 +7,7 @@
 */
 
 #include "hdr_p.h"
+#include "util_p.h"
 
 #include <QDataStream>
 #include <QImage>
@@ -93,7 +94,7 @@ static bool LoadHDR(QDataStream &s, const int width, const int height, QImage &i
     uchar code;
 
     // Create dst image.
-    img = QImage(width, height, QImage::Format_RGB32);
+    img = imageAlloc(width, height, QImage::Format_RGB32);
     if (img.isNull()) {
         qCDebug(HDRPLUGIN) << "Couldn't create image with size" << width << height << "and format RGB32";
         return false;

src/imageformats/heif.cpp

@@ -9,6 +9,7 @@
 
 #include "heif_p.h"
 #include "libheif/heif_cxx.h"
+#include "util_p.h"
 
 #include <QColorSpace>
 #include <QDebug>
@@ -432,7 +433,7 @@ bool HEIFHandler::ensureDecoder()
             return false;
         }
 
-        m_current_image = QImage(imageSize, target_image_format);
+        m_current_image = imageAlloc(imageSize, target_image_format);
         if (m_current_image.isNull()) {
             m_parseState = ParseHeicError;
             qWarning() << "Unable to allocate memory!";

src/imageformats/jxl.cpp

@@ -10,6 +10,8 @@
 #include <QtGlobal>
 
 #include "jxl_p.h"
+#include "util_p.h"
+
 #include <jxl/encode.h>
 #include <jxl/thread_parallel_runner.h>
 #include <string.h>
@@ -143,6 +145,10 @@ bool QJpegXLHandler::ensureDecoder()
         return false;
     }
 
+#ifdef KIMG_JXL_API_VERSION
+    JxlDecoderCloseInput(m_decoder);
+#endif
+
     JxlDecoderStatus status = JxlDecoderSubscribeEvents(m_decoder, JXL_DEC_BASIC_INFO | JXL_DEC_COLOR_ENCODING | JXL_DEC_FRAME);
     if (status == JXL_DEC_ERROR) {
         qWarning("ERROR: JxlDecoderSubscribeEvents failed");
@@ -355,7 +361,7 @@ bool QJpegXLHandler::decode_one_frame()
         return false;
     }
 
-    m_current_image = QImage(m_basicinfo.xsize, m_basicinfo.ysize, m_input_image_format);
+    m_current_image = imageAlloc(m_basicinfo.xsize, m_basicinfo.ysize, m_input_image_format);
     if (m_current_image.isNull()) {
         qWarning("Memory cannot be allocated");
         m_parseState = ParseJpegXLError;
@@ -482,37 +488,15 @@ bool QJpegXLHandler::write(const QImage &image)
         return false;
     }
 
-    void *runner = nullptr;
-    int num_worker_threads = qBound(1, QThread::idealThreadCount(), 64);
-
-    if (num_worker_threads > 1) {
-        runner = JxlThreadParallelRunnerCreate(nullptr, num_worker_threads);
-        if (JxlEncoderSetParallelRunner(encoder, JxlThreadParallelRunner, runner) != JXL_ENC_SUCCESS) {
-            qWarning("JxlEncoderSetParallelRunner failed");
-            JxlThreadParallelRunnerDestroy(runner);
-            JxlEncoderDestroy(encoder);
-            return false;
-        }
-    }
-
-    JxlEncoderOptions *encoder_options = JxlEncoderOptionsCreate(encoder, nullptr);
-
     if (m_quality > 100) {
         m_quality = 100;
     } else if (m_quality < 0) {
         m_quality = 90;
     }
 
-    JxlEncoderOptionsSetDistance(encoder_options, (100.0f - m_quality) / 10.0f);
-
-    JxlEncoderOptionsSetLossless(encoder_options, (m_quality == 100) ? JXL_TRUE : JXL_FALSE);
-
     JxlBasicInfo output_info;
     JxlEncoderInitBasicInfo(&output_info);
 
-    JxlColorEncoding color_profile;
-    JxlColorEncodingSetToSRGB(&color_profile, JXL_FALSE);
-
     bool convert_color_profile;
     QByteArray iccprofile;
 
@@ -526,7 +510,28 @@ bool QJpegXLHandler::write(const QImage &image)
         convert_color_profile = false;
         iccprofile = image.colorSpace().iccProfile();
         if (iccprofile.size() > 0 || m_quality == 100) {
-            output_info.uses_original_profile = 1;
+            output_info.uses_original_profile = JXL_TRUE;
+        }
+    }
+
+    if (save_depth == 16 && (image.hasAlphaChannel() || output_info.uses_original_profile)) {
+        output_info.have_container = JXL_TRUE;
+        JxlEncoderUseContainer(encoder, JXL_TRUE);
+#ifdef KIMG_JXL_API_VERSION
+        JxlEncoderSetCodestreamLevel(encoder, 10);
+#endif
+    }
+
+    void *runner = nullptr;
+    int num_worker_threads = qBound(1, QThread::idealThreadCount(), 64);
+
+    if (num_worker_threads > 1) {
+        runner = JxlThreadParallelRunnerCreate(nullptr, num_worker_threads);
+        if (JxlEncoderSetParallelRunner(encoder, JxlThreadParallelRunner, runner) != JXL_ENC_SUCCESS) {
+            qWarning("JxlEncoderSetParallelRunner failed");
+            JxlThreadParallelRunnerDestroy(runner);
+            JxlEncoderDestroy(encoder);
+            return false;
         }
     }
 
@@ -537,7 +542,6 @@ bool QJpegXLHandler::write(const QImage &image)
     pixel_format.endianness = JXL_NATIVE_ENDIAN;
     pixel_format.align = 0;
 
-    output_info.intensity_target = 255.0f;
     output_info.orientation = JXL_ORIENT_IDENTITY;
     output_info.num_color_channels = 3;
     output_info.animation.tps_numerator = 10;
@@ -615,6 +619,9 @@ bool QJpegXLHandler::write(const QImage &image)
             return false;
         }
     } else {
+        JxlColorEncoding color_profile;
+        JxlColorEncodingSetToSRGB(&color_profile, JXL_FALSE);
+
         status = JxlEncoderSetColorEncoding(encoder, &color_profile);
         if (status != JXL_ENC_SUCCESS) {
             qWarning("JxlEncoderSetColorEncoding failed!");
@@ -626,6 +633,20 @@ bool QJpegXLHandler::write(const QImage &image)
         }
     }
 
+#ifdef KIMG_JXL_API_VERSION
+    JxlEncoderFrameSettings *encoder_options = JxlEncoderFrameSettingsCreate(encoder, nullptr);
+
+    JxlEncoderSetFrameDistance(encoder_options, (100.0f - m_quality) / 10.0f);
+
+    JxlEncoderSetFrameLossless(encoder_options, (m_quality == 100) ? JXL_TRUE : JXL_FALSE);
+#else
+    JxlEncoderOptions *encoder_options = JxlEncoderOptionsCreate(encoder, nullptr);
+
+    JxlEncoderOptionsSetDistance(encoder_options, (100.0f - m_quality) / 10.0f);
+
+    JxlEncoderOptionsSetLossless(encoder_options, (m_quality == 100) ? JXL_TRUE : JXL_FALSE);
+#endif
+
     if (image.hasAlphaChannel() || ((save_depth == 8) && (xsize % 4 == 0))) {
         status = JxlEncoderAddImageFrame(encoder_options, &pixel_format, (void *)tmpimage.constBits(), buffer_size);
     } else {
@@ -724,7 +745,7 @@ bool QJpegXLHandler::write(const QImage &image)
     compressed.resize(next_out - compressed.data());
 
     if (compressed.size() > 0) {
-        qint64 write_status = device()->write((const char *)compressed.data(), compressed.size());
+        qint64 write_status = device()->write(reinterpret_cast<const char *>(compressed.data()), compressed.size());
 
         if (write_status > 0) {
             return true;
@@ -915,6 +936,10 @@ bool QJpegXLHandler::rewind()
         return false;
     }
 
+#ifdef KIMG_JXL_API_VERSION
+    JxlDecoderCloseInput(m_decoder);
+#endif
+
     if (m_basicinfo.uses_original_profile) {
         if (JxlDecoderSubscribeEvents(m_decoder, JXL_DEC_FULL_IMAGE) != JXL_DEC_SUCCESS) {
             qWarning("ERROR: JxlDecoderSubscribeEvents failed");

src/imageformats/pcx.cpp

@@ -6,6 +6,7 @@
 */
 
 #include "pcx_p.h"
+#include "util_p.h"
 
 #include <QColor>
 #include <QDataStream>
@@ -262,7 +263,7 @@ static void readImage1(QImage &img, QDataStream &s, const PCXHEADER &header)
 {
     QByteArray buf(header.BytesPerLine, 0);
 
-    img = QImage(header.width(), header.height(), QImage::Format_Mono);
+    img = imageAlloc(header.width(), header.height(), QImage::Format_Mono);
     img.setColorCount(2);
 
     if (img.isNull()) {
@@ -294,7 +295,7 @@ static void readImage4(QImage &img, QDataStream &s, const PCXHEADER &header)
     QByteArray buf(header.BytesPerLine * 4, 0);
     QByteArray pixbuf(header.width(), 0);
 
-    img = QImage(header.width(), header.height(), QImage::Format_Indexed8);
+    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());
@@ -338,7 +339,7 @@ static void readImage8(QImage &img, QDataStream &s, const PCXHEADER &header)
 {
     QByteArray buf(header.BytesPerLine, 0);
 
-    img = QImage(header.width(), header.height(), QImage::Format_Indexed8);
+    img = imageAlloc(header.width(), header.height(), QImage::Format_Indexed8);
     img.setColorCount(256);
 
     if (img.isNull()) {
@@ -388,7 +389,7 @@ static void readImage24(QImage &img, QDataStream &s, const PCXHEADER &header)
     QByteArray g_buf(header.BytesPerLine, 0);
     QByteArray b_buf(header.BytesPerLine, 0);
 
-    img = QImage(header.width(), header.height(), QImage::Format_RGB32);
+    img = imageAlloc(header.width(), header.height(), QImage::Format_RGB32);
 
     if (img.isNull()) {
         qWarning() << "Failed to allocate image, invalid dimensions?" << QSize(header.width(), header.height());
@@ -683,6 +684,12 @@ bool PCXHandler::canRead(QIODevice *device)
         return false;
     }
 
+    // We do not support sequential images
+    // We need to know the current position to properly read the header
+    if (device->isSequential()) {
+        return false;
+    }
+
     qint64 oldPos = device->pos();
 
     char head[1];

src/imageformats/pic.cpp

@@ -14,8 +14,8 @@
  */
 
 #include "pic_p.h"
-
 #include "rle_p.h"
+#include "util_p.h"
 
 #include <QDataStream>
 #include <QDebug>
@@ -238,7 +238,7 @@ bool SoftimagePICHandler::read(QImage *image)
         }
     }
 
-    QImage img(m_header.width, m_header.height, fmt);
+    QImage img = imageAlloc(m_header.width, m_header.height, fmt);
     if (img.isNull()) {
         qDebug() << "Failed to allocate image, invalid dimensions?" << QSize(m_header.width, m_header.height) << fmt;
         return false;

src/imageformats/psd.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 X-KDE-ServiceTypes=QImageIOPlugins
-X-KDE-ImageFormat=psd
+X-KDE-ImageFormat=psd,psb,pdd,psdt
 X-KDE-MimeType=image/vnd.adobe.photoshop
 X-KDE-Read=true
 X-KDE-Write=false

src/imageformats/psd.json

@@ -1,4 +1,4 @@
 {
-    "Keys": [ "psd" ],
-    "MimeTypes": [ "image/vnd.adobe.photoshop" ]
+    "Keys": [ "psd", "psb", "pdd", "psdt" ],
+    "MimeTypes": [ "image/vnd.adobe.photoshop", "image/vnd.adobe.photoshop", "image/vnd.adobe.photoshop", "image/vnd.adobe.photoshop" ]
 }

src/imageformats/psd_p.h

@@ -18,6 +18,9 @@ public:
     bool canRead() const override;
     bool read(QImage *image) override;
 
+    bool supportsOption(QImageIOHandler::ImageOption option) const override;
+    QVariant option(QImageIOHandler::ImageOption option) const override;
+
     static bool canRead(QIODevice *device);
 };
 

src/imageformats/ras.cpp

@@ -8,6 +8,7 @@
 */
 
 #include "ras_p.h"
+#include "util_p.h"
 
 #include <QDataStream>
 #include <QDebug>
@@ -102,8 +103,7 @@ static bool LoadRAS(QDataStream &s, const RasHeader &ras, QImage &img)
 {
     s.device()->seek(RasHeader::SIZE);
 
-    // QVector uses some extra space for stuff, hence the 32 here suggested by thiago
-    if (ras.ColorMapLength > std::numeric_limits<int>::max() - 32) {
+    if (ras.ColorMapLength > kMaxQVectorSize) {
         qWarning() << "LoadRAS() unsupported image color map length in file header" << ras.ColorMapLength;
         return false;
     }
@@ -127,8 +127,7 @@ static bool LoadRAS(QDataStream &s, const RasHeader &ras, QImage &img)
         qWarning() << "LoadRAS() mistmatch between height and width" << ras.Width << ras.Height << ras.Length << ras.Depth;
         return false;
     }
-    // QVector uses some extra space for stuff, hence the 32 here suggested by thiago
-    if (ras.Length > std::numeric_limits<int>::max() - 32) {
+    if (ras.Length > kMaxQVectorSize) {
         qWarning() << "LoadRAS() unsupported image length in file header" << ras.Length;
         return false;
     }
@@ -152,8 +151,7 @@ static bool LoadRAS(QDataStream &s, const RasHeader &ras, QImage &img)
     }
 
     // Allocate image
-    img = QImage(ras.Width, ras.Height, QImage::Format_ARGB32);
-
+    img = imageAlloc(ras.Width, ras.Height, QImage::Format_ARGB32);
     if (img.isNull()) {
         return false;
     }

src/imageformats/raw.cpp

@@ -0,0 +1,899 @@
+/*
+    RAW support for QImage.
+
+    SPDX-FileCopyrightText: 2022 Mirco Miranda <mircomir@outlook.com>
+
+    SPDX-License-Identifier: LGPL-2.0-or-later
+*/
+
+#include "raw_p.h"
+#include "util_p.h"
+
+#include <QColorSpace>
+#include <QDateTime>
+#include <QDebug>
+#include <QImage>
+#include <QSet>
+
+#if defined(Q_OS_WINDOWS) && !defined(NOMINMAX)
+#define NOMINMAX
+#endif
+
+#if defined(Q_OS_WINDOWS)
+#include <libraw.h>
+#else
+#include <libraw/libraw.h>
+#endif
+
+#ifdef QT_DEBUG
+// This should be used to exclude the local QIODevice wrapper of the LibRaw_abstract_datastream interface.
+// If the result changes then the problem is in the local wrapper and must be corrected.
+// WARNING: using the LibRaw's streams instead of the local wrapper from a Qt program falls in the LOCALE
+//          bug when the RAW file needs the scanf_one() function (e.g. *.MOS files). See also raw_scanf_one().
+//#define EXCLUDE_LibRaw_QIODevice // Uncomment this code if you think that the problem is LibRaw_QIODevice (default commented)
+#endif
+
+namespace // Private.
+{
+
+// smart pointer for processed image
+using pi_unique_ptr = std::unique_ptr<libraw_processed_image_t, std::function<void(libraw_processed_image_t *)>>;
+
+// clang-format off
+// Known formats supported by LibRaw (in alphabetical order and lower case)
+const auto supported_formats = QSet<QByteArray>{
+    "3fr",
+    "arw", "arq",
+    "bay", "bmq",
+    "cr2", "cr3", "cap", "cine", "cs1", "crw",
+    "dcs", "dc2", "dcr", "dng", "drf", "dxo",
+    "eip", "erf",
+    "fff",
+    "hdr",
+    "iiq",
+    "k25", "kc2", "kdc",
+    "mdc", "mef", "mfw", "mos", "mrw",
+    "nef", "nrw",
+    "obm", "orf", "ori",
+    "pef", "ptx", "pxn",
+    "qtk",
+    "r3d", "raf", "raw", "rdc", "rw2", "rwl", "rwz",
+    "sr2", "srf", "srw", "sti",
+    "x3f"
+};
+// clang-format on
+
+inline int raw_scanf_one(const QByteArray &ba, const char *fmt, void *val)
+{
+    // WARNING: Here it would be nice to use sscanf like LibRaw does but there
+    //          is a Big Trouble: THE LOCALE! LibRaw is also affected by the
+    //          issue if used in a Qt program:
+    //          If you use sscanf here the conversion is wrong when performed
+    //          with Italian locale (where the decimal separator is the comma).
+    // The solution should be to use std::locale::global() but it's global!
+    // I don't want to do it. So, don't use code like that:
+    // return sscanf(QByteArray(ba).append('\0').data(), fmt, val);
+
+    // LibRaw is asking only "%d" and "%f" for now. This code is not affected
+    // by the LOCALE bug.
+    auto s = QString::fromLatin1(ba);
+    if (strcmp(fmt, "%d") == 0) {
+        auto ok = false;
+        auto d = QLocale::c().toInt(s, &ok);
+        if (!ok) {
+            return EOF;
+        }
+        *(static_cast<int *>(val)) = d;
+    } else {
+        auto ok = false;
+        auto f = QLocale::c().toFloat(s, &ok);
+        if (!ok) {
+            return EOF;
+        }
+        *(static_cast<float *>(val)) = f;
+    }
+    return 1;
+}
+
+/**
+ * @brief The LibRaw_QIODevice class
+ * Implementation of the LibRaw stream interface over a QIODevice.
+ */
+class LibRaw_QIODevice : public LibRaw_abstract_datastream
+{
+public:
+    explicit LibRaw_QIODevice(QIODevice *device)
+    {
+        m_device = device;
+    }
+    virtual ~LibRaw_QIODevice() override
+    {
+    }
+    virtual int valid() override
+    {
+        return m_device != nullptr;
+    }
+    virtual int read(void *ptr, size_t sz, size_t nmemb) override
+    {
+        auto read = m_device->read(reinterpret_cast<char *>(ptr), sz * nmemb);
+        if (read < 1) {
+            return 0;
+        }
+        if (auto o = read % sz) {
+            seek(-(sz - o), SEEK_CUR);
+        }
+        return read / sz;
+    }
+    virtual int eof() override
+    {
+        return m_device->atEnd() ? 1 : 0;
+    }
+    virtual int seek(INT64 o, int whence) override
+    {
+        auto pos = o;
+        auto size = m_device->size();
+        if (whence == SEEK_CUR) {
+            pos = m_device->pos() + o;
+        }
+        if (whence == SEEK_END) {
+            pos = size + o;
+        }
+        if (pos < 0 || pos > size || m_device->isSequential()) {
+            return -1;
+        }
+        return m_device->seek(pos) ? 0 : -1;
+    }
+    virtual INT64 tell() override
+    {
+        return m_device->pos();
+    }
+    virtual INT64 size() override
+    {
+        return m_device->size();
+    }
+    virtual char *gets(char *s, int sz) override
+    {
+        if (m_device->readLine(s, sz) > 0) {
+            return s;
+        }
+        return nullptr;
+    }
+    virtual int scanf_one(const char *fmt, void *val) override
+    {
+        QByteArray ba;
+        for (int xcnt = 0; xcnt < 24 && !m_device->atEnd(); ++xcnt) {
+            char c;
+            if (!m_device->getChar(&c)) {
+                return EOF;
+            }
+            if (ba.isEmpty() && (c == ' ' || c == '\t')) {
+                continue;
+            }
+            if (c == '\0' || c == ' ' || c == '\t' || c == '\n') {
+                break;
+            }
+            ba.append(c);
+        }
+        return raw_scanf_one(ba, fmt, val);
+    }
+    virtual int get_char() override
+    {
+        unsigned char c;
+        if (!m_device->getChar(reinterpret_cast<char *>(&c))) {
+            return EOF;
+        }
+        return int(c);
+    }
+#if (LIBRAW_VERSION < LIBRAW_MAKE_VERSION(0, 21, 0)) || defined(LIBRAW_OLD_VIDEO_SUPPORT)
+    virtual void *make_jas_stream() override
+    {
+        return nullptr;
+    }
+#endif
+
+private:
+    QIODevice *m_device;
+};
+
+bool addTag(const QString &tag, QStringList &lines)
+{
+    auto ok = !tag.isEmpty();
+    if (ok) {
+        lines << tag;
+    }
+    return ok;
+}
+
+QString createTag(QString value, const char *tag)
+{
+    if (!value.isEmpty()) {
+        value = QStringLiteral("<%1>%2</%1>").arg(QString::fromLatin1(tag), value);
+    }
+    return value;
+}
+
+QString createTag(char *asciiz, const char *tag)
+{
+    auto value = QString::fromUtf8(asciiz);
+    return createTag(value, tag);
+}
+
+QString createTimeTag(time_t time, const char *tag)
+{
+    auto value = QDateTime::fromSecsSinceEpoch(time, Qt::UTC);
+    if (value.isValid() && time > 0) {
+        return createTag(value.toString(Qt::ISODate), tag);
+    }
+    return QString();
+}
+
+QString createFlashTag(short flash, const char *tag)
+{
+    QStringList l;
+    auto lc = QLocale::c();
+    // EXIF specifications
+    auto t = QStringLiteral("true");
+    auto f = QStringLiteral("false");
+    l << QStringLiteral("<exif:Fired>%1</exif:Fired>").arg((flash & 1) ? t : f);
+    l << QStringLiteral("<exif:Function>%1</exif:Function>").arg((flash & (1 << 5)) ? t : f);
+    l << QStringLiteral("<exif:RedEyeMode>%1</exif:RedEyeMode>").arg((flash & (1 << 6)) ? t : f);
+    l << QStringLiteral("<exif:Mode>%1</exif:Mode>").arg(lc.toString((int(flash) >> 3) & 3));
+    l << QStringLiteral("<exif:Return>%1</exif:Return>").arg(lc.toString((int(flash) >> 1) & 3));
+    return createTag(l.join(QChar()), tag);
+}
+
+QString createTag(quint64 n, const char *tag, quint64 invalid = 0)
+{
+    if (n != invalid) {
+        return createTag(QLocale::c().toString(n), tag);
+    }
+    return QString();
+}
+
+QString createTag(qint16 n, const char *tag, qint16 invalid = 0)
+{
+    if (n != invalid) {
+        return createTag(QLocale::c().toString(n), tag);
+    }
+    return QString();
+}
+
+QString createTag(quint16 n, const char *tag, quint16 invalid = 0)
+{
+    if (n != invalid) {
+        return createTag(QLocale::c().toString(n), tag);
+    }
+    return QString();
+}
+
+QString createTag(float f, const char *tag, qint32 mul = 1)
+{
+    if (f != 0) {
+        if (mul > 1)
+            return QStringLiteral("<%1>%2/%3</%1>").arg(QString::fromLatin1(tag), QLocale::c().toString(int(f * mul))).arg(mul);
+        return QStringLiteral("<%1>%2</%1>").arg(QString::fromLatin1(tag), QLocale::c().toString(f));
+    }
+    return QString();
+}
+
+QString createTag(libraw_gps_info_t gps, const char *tag)
+{
+    auto tmp = QString::fromLatin1(tag);
+    if (tmp.contains(QStringLiteral("Latitude"), Qt::CaseInsensitive)) {
+        if (gps.latref != '\0') {
+            auto lc = QLocale::c();
+            auto value = QStringLiteral("%1,%2%3")
+                             .arg(lc.toString(gps.latitude[0], 'f', 0))
+                             .arg(lc.toString(gps.latitude[1] + gps.latitude[2] / 60, 'f', 4))
+                             .arg(QChar::fromLatin1(gps.latref));
+            return createTag(value, tag);
+        }
+    }
+    if (tmp.contains(QStringLiteral("Longitude"), Qt::CaseInsensitive)) {
+        if (gps.longref != '\0') {
+            auto lc = QLocale::c();
+            auto value = QStringLiteral("%1,%2%3")
+                             .arg(lc.toString(gps.longitude[0], 'f', 0))
+                             .arg(lc.toString(gps.longitude[1] + gps.longitude[2] / 60, 'f', 4))
+                             .arg(QChar::fromLatin1(gps.longref));
+            return createTag(value, tag);
+        }
+    }
+    if (tmp.contains(QStringLiteral("Altitude"), Qt::CaseInsensitive)) {
+        if (gps.altitude != 0) {
+            return createTag(gps.altitude, tag, 1000);
+        }
+    }
+    return QString();
+}
+
+QString createXmpPacket()
+{
+    QStringList lines;
+    lines << QStringLiteral("<?xpacket begin=\"\" id=\"W5M0MpCehiHzreSzNTczkc9d\"?>");
+    lines << QStringLiteral("<x:xmpmeta xmlns:x=\"adobe:ns:meta/\" x:xmptk=\"KIMG RAW Plugin\">");
+    lines << QStringLiteral("<rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">");
+    lines << QStringLiteral("</rdf:RDF>");
+    lines << QStringLiteral("</x:xmpmeta>");
+    for (auto i = 30; i > 0; --i)
+        lines << QString::fromLatin1(QByteArray(80, ' '));
+    lines << QStringLiteral("<?xpacket end=\"w\"?>");
+    return lines.join(QChar::fromLatin1('\n'));
+}
+
+QString updateXmpPacket(const QString &xmpPacket, LibRaw *rawProcessor)
+{
+    auto rdfEnd = xmpPacket.indexOf(QStringLiteral("</rdf:RDF>"), Qt::CaseInsensitive);
+    if (rdfEnd < 0) {
+        return updateXmpPacket(createXmpPacket(), rawProcessor);
+    }
+
+    auto lines = QStringList() << xmpPacket.left(rdfEnd);
+    lines << QStringLiteral("<rdf:Description rdf:about=\"\"");
+    lines << QStringLiteral("      xmlns:xmp=\"http://ns.adobe.com/xap/1.0/\"");
+    lines << QStringLiteral("      xmlns:dc=\"http://purl.org/dc/elements/1.1/\"");
+    lines << QStringLiteral("      xmlns:aux=\"http://ns.adobe.com/exif/1.0/aux/\"");
+    lines << QStringLiteral("      xmlns:xmpMM=\"http://ns.adobe.com/xap/1.0/mm/\"");
+    lines << QStringLiteral("      xmlns:stEvt=\"http://ns.adobe.com/xap/1.0/sType/ResourceEvent#\"");
+    lines << QStringLiteral("      xmlns:stRef=\"http://ns.adobe.com/xap/1.0/sType/ResourceRef#\"");
+    lines << QStringLiteral("      xmlns:tiff=\"http://ns.adobe.com/tiff/1.0/\"");
+    lines << QStringLiteral("      xmlns:exif=\"http://ns.adobe.com/exif/1.0/\"");
+    lines << QStringLiteral("      xmlns:xmpRights=\"http://ns.adobe.com/xap/1.0/rights/\">");
+    lines << QStringLiteral("<xmpMM:History>");
+    lines << QStringLiteral("<rdf:Seq>");
+    lines << QStringLiteral("<rdf:li rdf:parseType=\"Resource\">");
+    lines << QStringLiteral("<stEvt:action>converted</stEvt:action>");
+    lines << QStringLiteral("<stEvt:parameters>Converted from RAW to Qt Image using KIMG RAW plugin</stEvt:parameters>");
+    lines << QStringLiteral("<stEvt:softwareAgent>LibRaw %1</stEvt:softwareAgent>").arg(QString::fromLatin1(LibRaw::version()));
+    lines << QStringLiteral("<stEvt:when>%1</stEvt:when>").arg(QDateTime::currentDateTimeUtc().toString(Qt::ISODate));
+    lines << QStringLiteral("</rdf:li>");
+    lines << QStringLiteral("</rdf:Seq>");
+    lines << QStringLiteral("</xmpMM:History>");
+
+    auto &&iparams = rawProcessor->imgdata.idata;
+    addTag(createTag(iparams.normalized_model, "tiff:Model"), lines);
+    addTag(createTag(iparams.normalized_make, "tiff:Make"), lines);
+    addTag(createTag(iparams.software, "xmp:CreatorTool"), lines);
+
+    auto &&iother = rawProcessor->imgdata.other;
+    addTag(createTag(createTag(createTag(iother.desc, "rdf:li"), "rdf:Alt"), "dc:description"), lines);
+    addTag(createTag(createTag(createTag(iother.artist, "rdf:li"), "rdf:Seq"), "dc:creator"), lines);
+    addTag(createTag(createTag(createTag(iother.iso_speed, "rdf:li"), "rdf:Seq"), "exif:ISOSpeedRatings"), lines);
+    addTag(createTag(iother.shutter, "exif:ExposureTime", 1000), lines);
+    addTag(createTag(iother.aperture, "exif:ApertureValue", 1000), lines);
+    addTag(createTag(iother.focal_len, "exif:FocalLength", 1000), lines);
+    addTag(createTimeTag(iother.timestamp, "xmp:CreateDate"), lines);
+    addTag(createTag(iother.parsed_gps, "exif:GPSLatitude"), lines);
+    addTag(createTag(iother.parsed_gps, "exif:GPSLongitude"), lines);
+    addTag(createTag(iother.parsed_gps, "exif:GPSAltitude"), lines);
+
+    auto &&shotinfo = rawProcessor->imgdata.shootinginfo;
+    addTag(createTag(shotinfo.ExposureMode, "exif:ExposureMode", short(-1)), lines);
+    addTag(createTag(shotinfo.MeteringMode, "exif:MeteringMode", short(-1)), lines);
+    addTag(createTag(shotinfo.BodySerial, "aux:SerialNumber"), lines);
+
+    auto &&color = rawProcessor->imgdata.color;
+    addTag(createFlashTag(color.flash_used, "exif:Flash"), lines);
+
+    auto &&lens = rawProcessor->imgdata.lens;
+    addTag(createTag(lens.FocalLengthIn35mmFormat, "exif:FocalLengthIn35mmFilm"), lines);
+    addTag(createTag(lens.Lens, "aux:Lens"), lines);
+    addTag(createTag(lens.LensSerial, "aux:LensSerialNumber"), lines);
+    addTag(createTag(lens.nikon.LensIDNumber ? quint64(lens.nikon.LensIDNumber) : lens.makernotes.LensID, "aux:LensID"), lines);
+
+    auto &&makernotes = rawProcessor->imgdata.makernotes;
+    addTag(createTag(makernotes.common.firmware, "aux:Firmware"), lines);
+
+    lines << QStringLiteral("</rdf:Description>");
+    lines << xmpPacket.mid(rdfEnd);
+
+    return lines.join(QChar::fromLatin1('\n'));
+}
+
+template<class T>
+inline void rgbToRgbX(uchar *target, const uchar *source, qint32 targetSize, qint32 sourceSize)
+{
+    auto s = reinterpret_cast<const T *>(source);
+    auto t = reinterpret_cast<T *>(target);
+    auto width = std::min(targetSize / 4, sourceSize / 3) / qint32(sizeof(T));
+    for (qint32 x = 0; x < width; ++x) {
+        t[x * 4 + 0] = s[x * 3 + 0];
+        t[x * 4 + 1] = s[x * 3 + 1];
+        t[x * 4 + 2] = s[x * 3 + 2];
+        t[x * 4 + 3] = std::numeric_limits<T>::max();
+    }
+}
+
+// clang-format off
+#define C_IQ(a) (((a) & 0xF) << 4)
+#define C_OC(a) (((a) & 0xF) << 8)
+#define C_CW(a) (((a) & 0x1) << 12)
+#define C_AW(a) (((a) & 0x1) << 13)
+#define C_BT(a) (((a) & 0x1) << 14)
+#define C_HS(a) (((a) & 0x1) << 15)
+#define C_CE(a) (((a) & 0x1) << 16)
+#define C_NR(a) (((a) & 0x3) << 17)
+#define C_FC(a) (((a) & 0x1) << 19)
+#define C_SR(a) (((a) & 0x1) << 20)
+#define C_PRESET(a) ((a) & 0xF)
+
+#define T_IQ(a) (((a) >> 4) & 0xF)
+#define T_OC(a) (((a) >> 8) & 0xF)
+#define T_CW(a) (((a) >> 12) & 0x1)
+#define T_AW(a) (((a) >> 13) & 0x1)
+#define T_BT(a) (((a) >> 14) & 0x1)
+#define T_HS(a) (((a) >> 15) & 0x1)
+#define T_CE(a) (((a) >> 16) & 0x1)
+#define T_NR(a) (((a) >> 17) & 0x3)
+#define T_FC(a) (((a) >> 19) & 0x1)
+#define T_SR(a) (((a) >> 20) & 0x1)
+#define T_PRESET(a) ((a) & 0xF)
+// clang-format on
+
+#define DEFAULT_QUALITY (C_IQ(3) | C_OC(1) | C_CW(1) | C_AW(1) | C_BT(1) | C_HS(0))
+
+void setParams(QImageIOHandler *handler, LibRaw *rawProcessor)
+{
+    // *** Set raw params
+#if (LIBRAW_VERSION < LIBRAW_MAKE_VERSION(0, 21, 0))
+    auto &&rawparams = rawProcessor->imgdata.params;
+#else
+    auto &&rawparams = rawProcessor->imgdata.rawparams;
+#endif
+    // Select one raw image from input file (0 - first, ...)
+    rawparams.shot_select = handler->currentImageNumber();
+
+    // *** Set processing parameters
+
+    // NOTE: The default value set below are the ones that gave the best results
+    // on a large sample of images (https://raw.pixls.us/data/)
+
+    /**
+     * @brief quality
+     * Plugin quality option.
+     */
+    qint32 quality = -1;
+    if (handler->supportsOption(QImageIOHandler::Quality)) {
+        quality = handler->option(QImageIOHandler::Quality).toInt();
+    }
+    if (quality < 0) {
+        quality = DEFAULT_QUALITY;
+    }
+
+    switch (T_PRESET(quality)) {
+    case 0:
+        break;
+    case 1:
+        quality = C_IQ(0) | C_OC(1) | C_CW(1) | C_AW(1) | C_BT(0) | C_HS(1);
+        break;
+    case 2:
+        quality = C_IQ(0) | C_OC(1) | C_CW(1) | C_AW(1) | C_BT(0) | C_HS(0);
+        break;
+    case 3:
+        quality = C_IQ(3) | C_OC(1) | C_CW(1) | C_AW(1) | C_BT(0) | C_HS(0);
+        break;
+    case 4:
+        quality = C_IQ(3) | C_OC(1) | C_CW(1) | C_AW(1) | C_BT(1) | C_HS(0);
+        break;
+    case 5:
+        quality = C_IQ(3) | C_OC(2) | C_CW(1) | C_AW(1) | C_BT(1) | C_HS(0);
+        break;
+    case 6:
+        quality = C_IQ(3) | C_OC(4) | C_CW(1) | C_AW(1) | C_BT(1) | C_HS(0);
+        break;
+    case 7:
+        quality = C_IQ(11) | C_OC(1) | C_CW(1) | C_AW(1) | C_BT(0) | C_HS(0);
+        break;
+    case 8:
+        quality = C_IQ(11) | C_OC(1) | C_CW(1) | C_AW(1) | C_BT(1) | C_HS(0);
+        break;
+    case 9:
+        quality = C_IQ(11) | C_OC(2) | C_CW(1) | C_AW(1) | C_BT(1) | C_HS(0);
+        break;
+    case 10:
+        quality = C_IQ(11) | C_OC(4) | C_CW(1) | C_AW(1) | C_BT(1) | C_HS(0);
+        break;
+    default:
+        quality = DEFAULT_QUALITY;
+        break;
+    }
+
+    auto &&params = rawProcessor->imgdata.params;
+
+    /**
+     * @brief use_camera_wb
+     * Use camera white balance, if possible (0 - off, 1 - on)
+     *
+     * This should to be set. Alternatively, a calibrated white balance should be set on each camera.
+     */
+    params.use_camera_wb = T_CW(quality);
+
+    /*!
+     * \brief use_auto_wb
+     * Average the whole image for white balance (0 - off, 1 - on)
+     *
+     * This is usefull if no camera white balance is available.
+     */
+    params.use_auto_wb = T_AW(quality);
+
+    /**
+     * @brief output_bps
+     * Bits per pixel (8 or 16)
+     *
+     * Professional cameras (and even some smartphones) generate images at 10 or more bits per sample.
+     * When using 16-bit images, the highest quality should be maintained.
+     */
+    params.output_bps = T_BT(quality) ? 16 : 8;
+
+    /**
+     * @brief output_color
+     * Output colorspace (0 - raw, 1 - sRGB, 2 - Adobe, 3 - Wide, 4 - ProPhoto, 5 - XYZ, 6 - ACES, 7 - DCI-P3, 8 - Rec2020)
+     *
+     * sRGB allows you to view images correctly on programs that do not support ICC profiles. When most
+     * Programs will support icc profiles, ProPhoto may be a better choice.
+     * @note sRgb is the LibRaw default: if grayscale image is loaded, LibRaw switches to 0 (Raw) automatically.
+     */
+    params.output_color = T_OC(quality);
+
+    /**
+     * @brief user_qual
+     * Interpolation quality (0 - linear, 1 - VNG, 2 - PPG, 3 - AHD, 4 - DCB, 11 - DHT, 12 - AAHD)
+     *
+     * DHT seems the best option - See In-Depth Demosaicing Algorithm Analysis (https://www.libraw.org/node/2306)
+     * but, when used, some FUJI RAF files of my library are poorly rendered (e.g. completely green). This is the
+     * why I used AHD: a good compromise between quality and performance with no rendering errors.
+     */
+    params.user_qual = T_IQ(quality);
+
+    /**
+     * @brief half_size
+     * Generate an half-size image (0 - off, 1 - on)
+     *
+     * Very fast and useful for generating previews.
+     */
+    params.half_size = T_HS(quality);
+
+    /**
+     * @dcb_enhance_fl
+     * DCB color enhance filter (0 - off, 1 - on)
+     */
+    params.dcb_enhance_fl = T_CE(quality);
+
+    /**
+     * @fbdd_noiserd
+     * FBDD noise reduction (0 - off, 1 - light, 2 - full)
+     */
+    params.fbdd_noiserd = std::min(2, T_NR(quality));
+
+    /**
+     * @four_color_rgb
+     * Interpolate RGGB as four colors (0 - off, 1 - on)
+     */
+    params.four_color_rgb = T_FC(quality);
+
+    /**
+     * @use_fuji_rotate
+     * Don't stretch or rotate raw pixels (0 - off, 1 - on)
+     */
+    params.use_fuji_rotate = T_SR(quality) ? 0 : 1;
+}
+
+bool LoadRAW(QImageIOHandler *handler, QImage &img)
+{
+    std::unique_ptr<LibRaw> rawProcessor(new LibRaw);
+
+    // *** Set parameters
+    setParams(handler, rawProcessor.get());
+
+    // *** Open the stream
+    auto device = handler->device();
+#ifndef EXCLUDE_LibRaw_QIODevice
+    LibRaw_QIODevice stream(device);
+    if (rawProcessor->open_datastream(&stream) != LIBRAW_SUCCESS) {
+        return false;
+    }
+#else
+    auto ba = device->readAll();
+    if (rawProcessor->open_buffer(ba.data(), ba.size()) != LIBRAW_SUCCESS) {
+        return false;
+    }
+#endif
+
+    // *** Unpacking selected image
+    if (rawProcessor->unpack() != LIBRAW_SUCCESS) {
+        return false;
+    }
+
+    // *** Process selected image
+    if (rawProcessor->dcraw_process() != LIBRAW_SUCCESS) {
+        return false;
+    }
+
+    // *** Convert to QImage
+    pi_unique_ptr processedImage(rawProcessor->dcraw_make_mem_image(), LibRaw::dcraw_clear_mem);
+    if (processedImage == nullptr) {
+        return false;
+    }
+
+    // clang-format off
+    if ((processedImage->type != LIBRAW_IMAGE_BITMAP) ||
+        (processedImage->colors != 1 && processedImage->colors != 3 && processedImage->colors != 4) ||
+        (processedImage->bits != 8 && processedImage->bits != 16)) {
+        return false;
+    }
+    // clang-format on
+
+    auto format = QImage::Format_Invalid;
+    switch (processedImage->colors) {
+    case 1: // Gray images (tested with image attached on https://bugs.kde.org/show_bug.cgi?id=401371)
+        format = processedImage->bits == 8 ? QImage::Format_Grayscale8 : QImage::Format_Grayscale16;
+        break;
+    case 3: // Images with R G B components
+        format = processedImage->bits == 8 ? QImage::Format_RGB888 : QImage::Format_RGBX64;
+        break;
+    case 4: // Images with R G B components + Alpha (never seen)
+        format = processedImage->bits == 8 ? QImage::Format_RGBA8888 : QImage::Format_RGBA64;
+        break;
+    }
+
+    if (format == QImage::Format_Invalid) {
+        return false;
+    }
+
+    img = imageAlloc(processedImage->width, processedImage->height, format);
+    if (img.isNull()) {
+        return false;
+    }
+
+    auto rawBytesPerLine = qint32(processedImage->width * processedImage->bits * processedImage->colors + 7) / 8;
+    auto lineSize = std::min(qint32(img.bytesPerLine()), rawBytesPerLine);
+    for (int y = 0, h = img.height(); y < h; ++y) {
+        auto scanline = img.scanLine(y);
+        if (format == QImage::Format_RGBX64)
+            rgbToRgbX<quint16>(scanline, processedImage->data + rawBytesPerLine * y, img.bytesPerLine(), rawBytesPerLine);
+        else
+            memcpy(scanline, processedImage->data + rawBytesPerLine * y, lineSize);
+    }
+
+    // *** Set the color space
+    auto &&params = rawProcessor->imgdata.params;
+    if (params.output_color == 0) {
+        auto &&color = rawProcessor->imgdata.color;
+        if (auto profile = reinterpret_cast<char *>(color.profile)) {
+            img.setColorSpace(QColorSpace::fromIccProfile(QByteArray(profile, color.profile_length)));
+        }
+    }
+    if (processedImage->colors >= 3) {
+        if (params.output_color == 1) {
+            img.setColorSpace(QColorSpace(QColorSpace::SRgb));
+        }
+        if (params.output_color == 2) {
+            img.setColorSpace(QColorSpace(QColorSpace::AdobeRgb));
+        }
+        if (params.output_color == 4) {
+            img.setColorSpace(QColorSpace(QColorSpace::ProPhotoRgb));
+        }
+    }
+
+    // *** Set the metadata
+    auto &&iparams = rawProcessor->imgdata.idata;
+
+    auto xmpPacket = QString();
+    if (auto xmpdata = iparams.xmpdata) {
+        if (auto xmplen = iparams.xmplen)
+            xmpPacket = QString::fromUtf8(xmpdata, xmplen);
+    }
+    // Add info from LibRAW structs (e.g. GPS position, info about lens, info about shot and flash, etc...)
+    img.setText(QStringLiteral("XML:com.adobe.xmp"), updateXmpPacket(xmpPacket, rawProcessor.get()));
+
+    auto model = QString::fromUtf8(iparams.normalized_model);
+    if (!model.isEmpty()) {
+        img.setText(QStringLiteral("Model"), model);
+    }
+    auto manufacturer = QString::fromUtf8(iparams.normalized_make);
+    if (!manufacturer.isEmpty()) {
+        img.setText(QStringLiteral("Manufacturer"), manufacturer);
+    }
+    auto software = QString::fromUtf8(iparams.software);
+    if (!software.isEmpty()) {
+        img.setText(QStringLiteral("Software"), software);
+    }
+
+    auto &&iother = rawProcessor->imgdata.other;
+    auto description = QString::fromUtf8(iother.desc);
+    if (!description.isEmpty()) {
+        img.setText(QStringLiteral("Description"), description);
+    }
+    auto artist = QString::fromUtf8(iother.artist);
+    if (!artist.isEmpty()) {
+        img.setText(QStringLiteral("Author"), artist);
+    }
+
+    return true;
+}
+
+} // Private
+
+RAWHandler::RAWHandler()
+    : m_imageNumber(0)
+    , m_imageCount(0)
+    , m_quality(-1)
+{
+}
+
+bool RAWHandler::canRead() const
+{
+    if (canRead(device())) {
+        setFormat("raw");
+        return true;
+    }
+    return false;
+}
+
+bool RAWHandler::read(QImage *image)
+{
+    auto dev = device();
+
+    // Check image file format.
+    if (dev->atEnd()) {
+        return false;
+    }
+
+    QImage img;
+    if (!LoadRAW(this, img)) {
+        return false;
+    }
+
+    *image = img;
+    return true;
+}
+
+void RAWHandler::setOption(ImageOption option, const QVariant &value)
+{
+    if (option == QImageIOHandler::Quality) {
+        bool ok = false;
+        auto q = value.toInt(&ok);
+        if (ok) {
+            m_quality = q;
+        }
+    }
+}
+
+bool RAWHandler::supportsOption(ImageOption option) const
+{
+#ifndef EXCLUDE_LibRaw_QIODevice
+    if (option == QImageIOHandler::Size) {
+        return true;
+    }
+#endif
+
+    if (option == QImageIOHandler::Quality) {
+        return true;
+    }
+
+    return false;
+}
+
+QVariant RAWHandler::option(ImageOption option) const
+{
+    QVariant v;
+
+#ifndef EXCLUDE_LibRaw_QIODevice
+    if (option == QImageIOHandler::Size) {
+        auto d = device();
+        d->startTransaction();
+        std::unique_ptr<LibRaw> rawProcessor(new LibRaw);
+        LibRaw_QIODevice stream(d);
+#if (LIBRAW_VERSION < LIBRAW_MAKE_VERSION(0, 21, 0))
+        rawProcessor->imgdata.params.shot_select = currentImageNumber();
+#else
+        rawProcessor->imgdata.rawparams.shot_select = currentImageNumber();
+#endif
+        if (rawProcessor->open_datastream(&stream) == LIBRAW_SUCCESS) {
+            if (rawProcessor->unpack() == LIBRAW_SUCCESS) {
+                auto w = libraw_get_iwidth(&rawProcessor->imgdata);
+                auto h = libraw_get_iheight(&rawProcessor->imgdata);
+                // flip & 4: taken from LibRaw code
+                v = (rawProcessor->imgdata.sizes.flip & 4) ? QSize(h, w) : QSize(w, h);
+            }
+        }
+        d->rollbackTransaction();
+    }
+#endif
+
+    if (option == QImageIOHandler::Quality) {
+        v = m_quality;
+    }
+
+    return v;
+}
+
+bool RAWHandler::jumpToNextImage()
+{
+    return jumpToImage(m_imageNumber + 1);
+}
+
+bool RAWHandler::jumpToImage(int imageNumber)
+{
+    if (imageNumber >= imageCount()) {
+        return false;
+    }
+    m_imageNumber = imageNumber;
+    return true;
+}
+
+int RAWHandler::imageCount() const
+{
+    // NOTE: image count is cached for performance reason
+    auto &&count = m_imageCount;
+    if (count > 0) {
+        return count;
+    }
+
+    count = QImageIOHandler::imageCount();
+
+#ifndef EXCLUDE_LibRaw_QIODevice
+    auto d = device();
+    d->startTransaction();
+
+    std::unique_ptr<LibRaw> rawProcessor(new LibRaw);
+    LibRaw_QIODevice stream(d);
+    if (rawProcessor->open_datastream(&stream) == LIBRAW_SUCCESS) {
+        count = rawProcessor->imgdata.rawdata.iparams.raw_count;
+    }
+
+    d->rollbackTransaction();
+#endif
+
+    return count;
+}
+
+int RAWHandler::currentImageNumber() const
+{
+    return m_imageNumber;
+}
+
+bool RAWHandler::canRead(QIODevice *device)
+{
+    device->startTransaction();
+
+    std::unique_ptr<LibRaw> rawProcessor(new LibRaw);
+
+#ifndef EXCLUDE_LibRaw_QIODevice
+    LibRaw_QIODevice stream(device);
+    auto ok = rawProcessor->open_datastream(&stream) == LIBRAW_SUCCESS;
+#else
+    auto ba = device->readAll();
+    auto ok = rawProcessor->open_buffer(ba.data(), ba.size()) == LIBRAW_SUCCESS;
+#endif
+
+    device->rollbackTransaction();
+    return ok;
+}
+
+QImageIOPlugin::Capabilities RAWPlugin::capabilities(QIODevice *device, const QByteArray &format) const
+{
+    if (supported_formats.contains(QByteArray(format).toLower())) {
+        return Capabilities(CanRead);
+    }
+    if (!format.isEmpty()) {
+        return {};
+    }
+    if (!device->isOpen()) {
+        return {};
+    }
+
+    Capabilities cap;
+    if (device->isReadable() && RAWHandler::canRead(device)) {
+        cap |= CanRead;
+    }
+    return cap;
+}
+
+QImageIOHandler *RAWPlugin::create(QIODevice *device, const QByteArray &format) const
+{
+    QImageIOHandler *handler = new RAWHandler;
+    handler->setDevice(device);
+    handler->setFormat(format);
+    return handler;
+}

src/imageformats/raw.desktop

@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Service
+X-KDE-ServiceTypes=QImageIOPlugins
+X-KDE-ImageFormat=3fr,arw,arq,bay,bmq,crw,cr2,cr3,cap,cine,cs1,dcs,dc2,dcr,dng,drf,dxo,eip,erf,fff,hdr,iiq,k25,kdc,kc2,mdc,mef,mfw,mos,mrw,nef,nrw,obm,orf,ori,pef,ptx,pxn,qtk,r3d,raf,raw,rdc,rwl,rw2,rwz,sr2,srf,srw,sti,x3f
+X-KDE-MimeType=image/x-hasselblad-3fr,image/x-sony-arw,image/x-arq,image/x-bay,image/x-bmq,image/x-canon-crw,image/x-canon-cr2,image/x-canon-cr3,image/x-cap,image/x-cine,image/x-cs1,image/x-kodak-dcs,image/x-dc2,image/x-kodak-dcr,image/x-adobe-dng,image/x-drf,image/x-dxo,image/x-epson-eip,image/x-epson-erf,image/x-fff,image/x-hdr,image/x-iiq,image/x-kodak-k25,image/x-kodak-kdc,image/x-kodak-kc2,image/x-minolta-mdc,image/x-mamiya-mef,image/x-mfw,image/x-aptus-mos,image/x-minolta-mrw,image/x-nikon-nef,image/x-nikon-nrw,image/x-obm,image/x-olympus-orf,image/x-ori,image/x-pentax-pef,image/x-ptx,image/x-pxn,image/x-qtk,image/x-r3d,image/x-fuji-raf,image/x-raw,image/x-rdc,image/x-rwl,image/x-panasonic-rw2,image/x-rwz,image/x-sony-sr2,image/x-sony-srf,image/x-samsung-srw,image/x-sti,image/x-sigma-x3f
+X-KDE-Read=true
+X-KDE-Write=false

src/imageformats/raw.json

@@ -0,0 +1,42 @@
+{
+    "Keys": [
+        "3fr",
+        "arw", "arq",
+        "bay", "bmq",
+        "crw", "cr2", "cr3", "cap", "cine", "cs1",
+        "dcs", "dc2", "dcr", "dng", "drf", "dxo",
+        "eip", "erf",
+        "fff",
+        "hdr",
+        "iiq",
+        "k25", "kdc", "kc2",
+        "mdc", "mef", "mfw", "mos", "mrw",
+        "nef", "nrw",
+        "obm", "orf", "ori",
+        "pef", "ptx", "pxn",
+        "qtk",
+        "r3d", "raf", "raw", "rdc", "rwl", "rw2", "rwz",
+        "sr2", "srf", "srw", "sti",
+        "x3f"
+    ],
+    "MimeTypes": [
+        "image/x-hasselblad-3fr",
+        "image/x-sony-arw", "image/x-arq",
+        "image/x-bay", "image/x-bmq",
+        "image/x-canon-crw", "image/x-canon-cr2", "image/x-canon-cr3", "image/x-cap", "image/x-cine", "image/x-cs1",
+        "image/x-kodak-dcs", "image/x-dc2", "image/x-kodak-dcr", "image/x-adobe-dng", "image/x-drf", "image/x-dxo",
+        "image/x-epson-eip", "image/x-epson-erf",
+        "image/x-fff",
+        "image/x-hdr",
+        "image/x-iiq",
+        "image/x-kodak-k25", "image/x-kodak-kdc", "image/x-kodak-kc2",
+        "image/x-minolta-mdc", "image/x-mamiya-mef", "image/x-mfw", "image/x-aptus-mos", "image/x-minolta-mrw",
+        "image/x-nikon-nef", "image/x-nikon-nrw",
+        "image/x-obm", "image/x-olympus-orf", "image/x-ori",
+        "image/x-pentax-pef", "image/x-ptx", "image/x-pxn",
+        "image/x-qtk",
+        "image/x-r3d", "image/x-fuji-raf", "image/x-raw", "image/x-rdc", "image/x-rwl", "image/x-panasonic-rw2", "image/x-rwz",
+        "image/x-sony-sr2", "image/x-sony-srf", "image/x-samsung-srw", "image/x-sti",
+        "image/x-sigma-x3f"
+    ]
+}

src/imageformats/raw_p.h

@@ -0,0 +1,93 @@
+/*
+    This file is part of the KDE project
+
+    SPDX-FileCopyrightText: 2022 Mirco Miranda <mircomir@outlook.com>
+
+    SPDX-License-Identifier: LGPL-2.0-or-later
+*/
+
+#ifndef KIMG_RAW_P_H
+#define KIMG_RAW_P_H
+
+#include <QImageIOPlugin>
+
+class RAWHandler : public QImageIOHandler
+{
+public:
+    RAWHandler();
+
+    bool canRead() const override;
+    bool read(QImage *image) override;
+
+    void setOption(ImageOption option, const QVariant &value) override;
+    bool supportsOption(QImageIOHandler::ImageOption option) const override;
+    QVariant option(QImageIOHandler::ImageOption option) const override;
+
+    bool jumpToNextImage() override;
+    bool jumpToImage(int imageNumber) override;
+    int imageCount() const override;
+    int currentImageNumber() const override;
+
+    static bool canRead(QIODevice *device);
+
+private:
+    qint32 m_imageNumber;
+
+    mutable qint32 m_imageCount;
+
+    /**
+     * @brief m_quality
+     * Change the quality of the conversion. If -1, default quality is used.
+     * @note Verify that the quality change support has been compiled with supportsOption()
+     *
+     *   3                   2                 1           0
+     * 1 0 9 8 7 6 5 4 3 2 1 0 9 87 6 5 4 3 2 1098 7654 3210
+     * _ _ _ _ _ _ _ _ _ _ _ S F NN E H B A W CCCC IIII PPPP
+     *
+     * Where:
+     *
+     * _: reserved
+     * P: preset values: *** if set, other flags are ignored! ***
+     * -  0: Use other flags (no preset)
+     * -  1: I =  0, C = 1, B = 0, W = 1, A = 1, H = 1 (Linear, sRGB, 8-bits, Camera White, Auto White, Half-size)
+     * -  2: I =  0, C = 1, B = 0, W = 1, A = 1, H = 0 (Linear, sRGB, 8-bits, Camera White, Auto White)
+     * -  3: I =  3, C = 1, B = 0, W = 1, A = 1, H = 0 (AHD, sRGB, 8-bits, Camera White, Auto White)
+     * -  4: I =  3, C = 1, B = 1, W = 1, A = 1, H = 0 (AHD, sRGB, 16-bits, Camera White, Auto White)
+     * -  5: I =  3, C = 2, B = 1, W = 1, A = 1, H = 0 (AHD, Adobe, 16-bits, Camera White, Auto White)
+     * -  6: I =  3, C = 4, B = 1, W = 1, A = 1, H = 0 (AHD, ProPhoto, 16-bits, Camera White, Auto White)
+     * -  7: I = 11, C = 1, B = 0, W = 1, A = 1, H = 0 (DHT, sRGB, 8-bits, Camera White, Auto White)
+     * -  8: I = 11, C = 1, B = 1, W = 1, A = 1, H = 0 (DHT, sRGB, 16-bits, Camera White, Auto White)
+     * -  9: I = 11, C = 2, B = 1, W = 1, A = 1, H = 0 (DHT, Adobe, 16-bits, Camera White, Auto White)
+     * - 10: I = 11, C = 4, B = 1, W = 1, A = 1, H = 0 (DHT, ProPhoto, 16-bits, Camera White, Auto White)
+     * - 11: reserved
+     * - 12: reserved
+     * - 13: reserved
+     * - 14: reserved
+     * - 15: reserved
+     * I: interpolation quality (0 - linear, 1 - VNG, 2 - PPG, 3 - AHD, 4 - DCB, 11 - DHT, 12 - AAHD)
+     * C: output colorspace (0 - raw, 1 - sRGB, 2 - Adobe, 3 - Wide, 4 - ProPhoto, 5 - XYZ, 6 - ACES, 7 - DCI-P3, 8 - Rec2020)
+     * W: use camera white balace (0 - off, 1 - on)
+     * A: use auto white balance (0 - off, 1 - on)
+     * B: output bit per sample (0 - 8-bits, 1 - 16-bits)
+     * H: half size image (0 - off, 1 - on)
+     * E: DCB color enhance (0 - off, 1 - on)
+     * N: FBDD noise reduction (0 - off, 1 - light, 2 - full)
+     * F: Interpolate RGGB as four colors (0 - off, 1 - on)
+     * S: Don't stretch or rotate raw pixels (0 - rotate and stretch, 1 - don't rotate and stretch)
+     *
+     * @note It is safe to set both W and A: W is used if camera white balance is found, otherwise A is used.
+     */
+    qint32 m_quality;
+};
+
+class RAWPlugin : public QImageIOPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "raw.json")
+
+public:
+    Capabilities capabilities(QIODevice *device, const QByteArray &format) const override;
+    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override;
+};
+
+#endif // KIMG_RAW_P_H

src/imageformats/rgb.cpp

@@ -20,6 +20,7 @@
  */
 
 #include "rgb_p.h"
+#include "util_p.h"
 
 #include <QMap>
 #include <QVector>
@@ -324,7 +325,7 @@ bool SGIImage::readImage(QImage &img)
         return false;
     }
 
-    img = QImage(_xsize, _ysize, QImage::Format_RGB32);
+    img = imageAlloc(_xsize, _ysize, QImage::Format_RGB32);
     if (img.isNull()) {
         qWarning() << "Failed to allocate image, invalid dimensions?" << QSize(_xsize, _ysize);
         return false;

src/imageformats/tga.cpp

@@ -17,6 +17,7 @@
  */
 
 #include "tga_p.h"
+#include "util_p.h"
 
 #include <assert.h>
 
@@ -172,7 +173,7 @@ struct TgaHeaderInfo {
 static bool LoadTGA(QDataStream &s, const TgaHeader &tga, QImage &img)
 {
     // Create image.
-    img = QImage(tga.width, tga.height, QImage::Format_RGB32);
+    img = imageAlloc(tga.width, tga.height, QImage::Format_RGB32);
     if (img.isNull()) {
         qWarning() << "Failed to allocate image, invalid dimensions?" << QSize(tga.width, tga.height);
         return false;
@@ -184,7 +185,7 @@ static bool LoadTGA(QDataStream &s, const TgaHeader &tga, QImage &img)
     const int numAlphaBits = tga.flags & 0xf;
     // However alpha exists only in the 32 bit format.
     if ((tga.pixel_size == 32) && (tga.flags & 0xf)) {
-        img = QImage(tga.width, tga.height, QImage::Format_ARGB32);
+        img = imageAlloc(tga.width, tga.height, QImage::Format_ARGB32);
         if (img.isNull()) {
             qWarning() << "Failed to allocate image, invalid dimensions?" << QSize(tga.width, tga.height);
             return false;

src/imageformats/util_p.h

@@ -0,0 +1,42 @@
+/*
+    SPDX-FileCopyrightText: 2022 Albert Astals Cid <aacid@kde.org>
+    SPDX-FileCopyrightText: 2022 Mirco Miranda <mircomir@outlook.com>
+
+    SPDX-License-Identifier: LGPL-2.0-or-later
+*/
+
+#ifndef UTIL_P_H
+#define UTIL_P_H
+
+#include <limits>
+
+#include <QImage>
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <QImageIOHandler>
+#endif
+
+// QVector uses some extra space for stuff, hence the 32 here suggested by Thiago Macieira
+static constexpr int kMaxQVectorSize = std::numeric_limits<int>::max() - 32;
+
+// On Qt 6 to make the plugins fail to allocate if the image size is greater than QImageReader::allocationLimit()
+// it is necessary to allocate the image with QImageIOHandler::allocateImage().
+inline QImage imageAlloc(const QSize &size, const QImage::Format &format)
+{
+    QImage img;
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    img = QImage(size, format);
+#else
+    if (!QImageIOHandler::allocateImage(size, format, &img)) {
+        img = QImage(); // paranoia
+    }
+#endif
+    return img;
+}
+
+inline QImage imageAlloc(qint32 width, qint32 height, const QImage::Format &format)
+{
+    return imageAlloc(QSize(width, height), format);
+}
+
+#endif // UTIL_P_H

src/imageformats/xcf.cpp

@@ -6,6 +6,7 @@
     SPDX-License-Identifier: LGPL-2.1-or-later
 */
 
+#include "util_p.h"
 #include "xcf_p.h"
 
 #include <QDebug>
@@ -17,6 +18,9 @@
 #include <QVector>
 #include <QtEndian>
 #include <QColorSpace>
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <QImageReader>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
@@ -135,7 +139,7 @@ public:
         PROP_SAMPLE_POINTS = 39,
         MAX_SUPPORTED_PROPTYPE, // should always be at the end so its value is last + 1
     };
-    Q_ENUM(PropType);
+    Q_ENUM(PropType)
 
     //! Compression type used in layer tiles.
     enum XcfCompressionType {
@@ -145,7 +149,7 @@ public:
         COMPRESS_ZLIB = 2, /* unused */
         COMPRESS_FRACTAL = 3, /* unused */
     };
-    Q_ENUM(XcfCompressionType);
+    Q_ENUM(XcfCompressionType)
 
     enum LayerModeType {
         GIMP_LAYER_MODE_NORMAL_LEGACY,
@@ -212,7 +216,7 @@ public:
         GIMP_LAYER_MODE_PASS_THROUGH,
         GIMP_LAYER_MODE_COUNT,
     };
-    Q_ENUM(LayerModeType);
+    Q_ENUM(LayerModeType)
 
     //! Type of individual layers in an XCF file.
     enum GimpImageType {
@@ -223,7 +227,7 @@ public:
         INDEXED_GIMAGE,
         INDEXEDA_GIMAGE,
     };
-    Q_ENUM(GimpImageType);
+    Q_ENUM(GimpImageType)
 
     //! Type of individual layers in an XCF file.
     enum GimpColorSpace {
@@ -1093,12 +1097,27 @@ bool XCFImageFormat::composeTiles(XCFImage &xcf_image)
     qCDebug(XCFPLUGIN) << "LAYER: height=" << layer.height << ", width=" << layer.width;
     qCDebug(XCFPLUGIN) << "LAYER: rows=" << layer.nrows << ", columns=" << layer.ncols;
 
+    // NOTE: starting from GIMP 2.10, images can be very large. The 32K limit for width and height is obsolete
+    //       and it was changed to 300000 (the same as Photoshop Big image). This plugin was able to open an RGB
+    //       image of 108000x40000 pixels saved with GIMP 2.10
     // SANITY CHECK: Catch corrupted XCF image file where the width or height
     // of a tile is reported are bogus. See Bug# 234030.
-    if (layer.width > 32767 || layer.height > 32767 || (sizeof(void *) == 4 && layer.width * layer.height > 16384 * 16384)) {
+    if (layer.width > 300000 || layer.height > 300000 || (sizeof(void *) == 4 && layer.width * layer.height > 16384 * 16384)) {
         return false;
     }
 
+    // Qt 6 image allocation limit calculation: we have to check the limit here because the image is splitted in
+    // tiles of 64x64 pixels. The required memory to build the image is at least doubled because tiles are loaded
+    // and then the final image is created by copying the tiles inside it.
+    // NOTE: on Windows to open a 10GiB image the plugin uses 28GiB of RAM
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    qint64 channels = 1 + (layer.type == RGB_GIMAGE ? 2 : 0) + (layer.type == RGBA_GIMAGE ? 3 : 0);
+    if (qint64(layer.width) * qint64(layer.height) * channels * 2ll / 1024ll / 1024ll > QImageReader::allocationLimit()) {
+        qCDebug(XCFPLUGIN) << "Rejecting image as it exceeds the current allocation limit of" << QImageReader::allocationLimit() << "megabytes";
+        return false;
+    }
+#endif
+
     layer.image_tiles.resize(layer.nrows);
 
     if (layer.type == GRAYA_GIMAGE || layer.type == INDEXEDA_GIMAGE) {
@@ -1251,7 +1270,7 @@ void XCFImageFormat::setImageParasites(const XCFImage &xcf_image, QImage &image)
 {
     auto&& p = xcf_image.parasites;
     auto keys = p.keys();
-    for (auto&& key : qAsConst(keys)) {
+    for (auto &&key : std::as_const(keys)) {
         auto value = p.value(key);
         if(value.isEmpty())
             continue;
@@ -1917,7 +1936,7 @@ bool XCFImageFormat::initializeImage(XCFImage &xcf_image)
     switch (layer.type) {
     case RGB_GIMAGE:
         if (layer.opacity == OPAQUE_OPACITY) {
-            image = QImage(xcf_image.width, xcf_image.height, QImage::Format_RGB32);
+            image = imageAlloc(xcf_image.width, xcf_image.height, QImage::Format_RGB32);
             if (image.isNull()) {
                 return false;
             }
@@ -1926,7 +1945,7 @@ bool XCFImageFormat::initializeImage(XCFImage &xcf_image)
         } // else, fall through to 32-bit representation
         Q_FALLTHROUGH();
     case RGBA_GIMAGE:
-        image = QImage(xcf_image.width, xcf_image.height, QImage::Format_ARGB32);
+        image = imageAlloc(xcf_image.width, xcf_image.height, QImage::Format_ARGB32);
         if (image.isNull()) {
             return false;
         }
@@ -1935,7 +1954,7 @@ bool XCFImageFormat::initializeImage(XCFImage &xcf_image)
 
     case GRAY_GIMAGE:
         if (layer.opacity == OPAQUE_OPACITY) {
-            image = QImage(xcf_image.width, xcf_image.height, QImage::Format_Indexed8);
+            image = imageAlloc(xcf_image.width, xcf_image.height, QImage::Format_Indexed8);
             image.setColorCount(256);
             if (image.isNull()) {
                 return false;
@@ -1946,7 +1965,7 @@ bool XCFImageFormat::initializeImage(XCFImage &xcf_image)
         } // else, fall through to 32-bit representation
         Q_FALLTHROUGH();
     case GRAYA_GIMAGE:
-        image = QImage(xcf_image.width, xcf_image.height, QImage::Format_ARGB32);
+        image = imageAlloc(xcf_image.width, xcf_image.height, QImage::Format_ARGB32);
         if (image.isNull()) {
             return false;
         }
@@ -1967,7 +1986,7 @@ bool XCFImageFormat::initializeImage(XCFImage &xcf_image)
         // or two-color palette. Have to ask about this...
 
         if (xcf_image.num_colors <= 2) {
-            image = QImage(xcf_image.width, xcf_image.height, QImage::Format_MonoLSB);
+            image = imageAlloc(xcf_image.width, xcf_image.height, QImage::Format_MonoLSB);
             image.setColorCount(xcf_image.num_colors);
             if (image.isNull()) {
                 return false;
@@ -1975,7 +1994,7 @@ bool XCFImageFormat::initializeImage(XCFImage &xcf_image)
             image.fill(0);
             setPalette(xcf_image, image);
         } else if (xcf_image.num_colors <= 256) {
-            image = QImage(xcf_image.width, xcf_image.height, QImage::Format_Indexed8);
+            image = imageAlloc(xcf_image.width, xcf_image.height, QImage::Format_Indexed8);
             image.setColorCount(xcf_image.num_colors);
             if (image.isNull()) {
                 return false;
@@ -1993,7 +2012,7 @@ bool XCFImageFormat::initializeImage(XCFImage &xcf_image)
             xcf_image.palette[1] = xcf_image.palette[0];
             xcf_image.palette[0] = qRgba(255, 255, 255, 0);
 
-            image = QImage(xcf_image.width, xcf_image.height, QImage::Format_MonoLSB);
+            image = imageAlloc(xcf_image.width, xcf_image.height, QImage::Format_MonoLSB);
             image.setColorCount(xcf_image.num_colors);
             if (image.isNull()) {
                 return false;
@@ -2009,7 +2028,7 @@ bool XCFImageFormat::initializeImage(XCFImage &xcf_image)
             }
 
             xcf_image.palette[0] = qRgba(255, 255, 255, 0);
-            image = QImage(xcf_image.width, xcf_image.height, QImage::Format_Indexed8);
+            image = imageAlloc(xcf_image.width, xcf_image.height, QImage::Format_Indexed8);
             image.setColorCount(xcf_image.num_colors);
             if (image.isNull()) {
                 return false;
@@ -2020,7 +2039,7 @@ bool XCFImageFormat::initializeImage(XCFImage &xcf_image)
             // No room for a transparent color, so this has to be promoted to
             // true color. (There is no equivalent PNG representation output
             // from The GIMP as of v1.2.)
-            image = QImage(xcf_image.width, xcf_image.height, QImage::Format_ARGB32);
+            image = imageAlloc(xcf_image.width, xcf_image.height, QImage::Format_ARGB32);
             if (image.isNull()) {
                 return false;
             }
@@ -2031,11 +2050,11 @@ bool XCFImageFormat::initializeImage(XCFImage &xcf_image)
 
     if (xcf_image.x_resolution > 0 && xcf_image.y_resolution > 0) {
         const float dpmx = xcf_image.x_resolution * INCHESPERMETER;
-        if (dpmx > std::numeric_limits<int>::max()) {
+        if (dpmx > float(std::numeric_limits<int>::max())) {
             return false;
         }
         const float dpmy = xcf_image.y_resolution * INCHESPERMETER;
-        if (dpmy > std::numeric_limits<int>::max()) {
+        if (dpmy > float(std::numeric_limits<int>::max())) {
             return false;
         }
         image.setDotsPerMeterX((int)dpmx);
@@ -3270,6 +3289,52 @@ bool XCFHandler::write(const QImage &)
     return false;
 }
 
+bool XCFHandler::supportsOption(ImageOption option) const
+{
+    if (option == QImageIOHandler::Size)
+        return true;
+    return false;
+}
+
+QVariant XCFHandler::option(ImageOption option) const
+{
+    QVariant v;
+
+    if (option == QImageIOHandler::Size) {
+        /*
+         * The image structure always starts at offset 0 in the XCF file.
+         * byte[9]     "gimp xcf " File type identification
+         * byte[4]     version     XCF version
+         *                          "file": version 0
+         *                          "v001": version 1
+         *                          "v002": version 2
+         *                          "v003": version 3
+         * byte        0            Zero marks the end of the version tag.
+         * uint32      width        Width of canvas
+         * uint32      height       Height of canvas
+         */
+        if (auto d = device()) {
+            // transactions works on both random and sequential devices
+            d->startTransaction();
+            auto ba9 = d->read(9);      // "gimp xcf "
+            auto ba5 = d->read(4+1);    // version + null terminator
+            auto ba = d->read(8);       // width and height
+            d->rollbackTransaction();
+            if (ba9 == QByteArray("gimp xcf ") && ba5.size() == 5) {
+                QDataStream ds(ba);
+                quint32 width;
+                ds >> width;
+                quint32 height;
+                ds >> height;
+                if (ds.status() == QDataStream::Ok)
+                    v = QVariant::fromValue(QSize(width, height));
+            }
+        }
+    }
+
+    return v;
+}
+
 bool XCFHandler::canRead(QIODevice *device)
 {
     if (!device) {

src/imageformats/xcf_p.h

@@ -20,6 +20,9 @@ public:
     bool read(QImage *image) override;
     bool write(const QImage &image) override;
 
+    bool supportsOption(QImageIOHandler::ImageOption option) const override;
+    QVariant option(QImageIOHandler::ImageOption option) const override;
+
     static bool canRead(QIODevice *device);
 };