update version for new release

This avoids a feature summary in the middle of the cmake configuration
when this module is used as a git submodule.

GIT_SILENT

.gitlab-ci.yml

@@ -2,9 +2,9 @@
 # SPDX-License-Identifier: CC0-1.0
 
 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/windows.yml
-  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows-static.yml
+  - project: sysadmin/ci-utilities
+    file:
+      - /gitlab-templates/linux-qt6.yml
+      - /gitlab-templates/android-qt6.yml
+      - /gitlab-templates/freebsd-qt6.yml
+      - /gitlab-templates/windows-qt6.yml

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.16)
 project(KImageFormats)
 
 include(FeatureSummary)
-find_package(ECM 5.111.0  NO_MODULE)
+find_package(ECM 6.0.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)
 
@@ -19,11 +19,11 @@ include(ECMDeprecationSettings)
 include(CheckIncludeFiles)
 include(FindPkgConfig)
 
-set(REQUIRED_QT_VERSION 5.15.2)
-find_package(Qt${QT_MAJOR_VERSION}Gui ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
+set(REQUIRED_QT_VERSION 6.5.0)
+find_package(Qt6Gui ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
 
-find_package(KF5Archive)
-set_package_properties(KF5Archive PROPERTIES
+find_package(KF6Archive)
+set_package_properties(KF6Archive PROPERTIES
     TYPE OPTIONAL
     PURPOSE "Required for the QImage plugin for Krita and OpenRaster images"
 )
@@ -32,12 +32,12 @@ set_package_properties(KF5Archive PROPERTIES
 # this available in PATH
 set(BUILD_EPS_PLUGIN FALSE)
 if (UNIX)
-    find_package(Qt${QT_MAJOR_VERSION}PrintSupport ${REQUIRED_QT_VERSION} NO_MODULE)
-    set_package_properties(Qt${QT_MAJOR_VERSION}PrintSupport PROPERTIES
+    find_package(Qt6PrintSupport ${REQUIRED_QT_VERSION} NO_MODULE)
+    set_package_properties(Qt6PrintSupport PROPERTIES
         PURPOSE "Required for the QImage plugin for EPS images"
         TYPE OPTIONAL
     )
-    if (TARGET Qt${QT_MAJOR_VERSION}::PrintSupport)
+    if (TARGET Qt6::PrintSupport)
         set(BUILD_EPS_PLUGIN TRUE)
     endif()
 endif()
@@ -81,8 +81,8 @@ set_package_properties(LibRaw PROPERTIES
 )
 
 ecm_set_disabled_deprecation_versions(
-    QT 5.15.2
-    KF 5.95
+    QT 6.5
+    KF 5.102
 )
 
 add_subdirectory(src)
@@ -91,6 +91,7 @@ if (BUILD_TESTING)
     add_subdirectory(tests)
 endif()
 
-feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+include(ECMFeatureSummary)
+ecm_feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
 kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT)

LICENSES/BSD-2-Clause.txt

@@ -0,0 +1,9 @@
+Copyright (c) <year> <owner> 
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

LICENSES/BSD-3-Clause.txt

@@ -0,0 +1,11 @@
+Copyright (c) <year> <owner>. 
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -16,22 +16,24 @@ The following image formats have read-only support:
 - Animated Windows cursors (ani)
 - Camera RAW images (arw, cr2, cr3, dcs, dng, ...)
 - Gimp (xcf)
-- OpenEXR (exr)
+- Krita (kra)
+- OpenRaster (ora)
 - Photoshop documents (psd, psb, pdd, psdt)
 - Radiance HDR (hdr)
-- Sun Raster (ras)
+- Sun Raster (im1, im8, im24, im32, ras, sun)
 
 The following image formats have read and write support:
 
 - AV1 Image File Format (AVIF)
 - Encapsulated PostScript (eps)
+- High Efficiency Image File Format (heif). Can be enabled with the KIMAGEFORMATS_HEIF build option.
 - JPEG XL (jxl)
+- OpenEXR (exr)
 - Personal Computer Exchange (pcx)
 - Quite OK Image format (qoi)
 - SGI images (rgb, rgba, sgi, bw)
 - Softimage PIC (pic)
 - Targa (tga): supports more formats than Qt's version
-- XView (xv)
 
 ## Contributing
 
@@ -43,10 +45,6 @@ of Qt is the license.  As such, if you write an imageformat plugin and
 you are willing to sign the Qt Project contributor agreement, it may be
 better to submit the plugin directly to the Qt Project.
 
-Note that the imageformat plugins provided by this module also provide a
-desktop file.  This is for the benefit of KImageIO in the KDE4 Support
-framework.
-
 ## Duplicated Plugins
 
 The TGA plugin supports more formats than Qt's own TGA plugin;

autotests/CMakeLists.txt

@@ -1,5 +1,3 @@
-#find_package(Qt5Test ${REQUIRED_QT_VERSION} NO_MODULE)
-
 include(ECMMarkAsTest)
 
 add_definitions(-DPLUGIN_DIR="${CMAKE_CURRENT_BINARY_DIR}/../bin")
@@ -14,7 +12,7 @@ macro(kimageformats_read_tests)
 
     if (NOT TARGET readtest)
         add_executable(readtest readtest.cpp)
-        target_link_libraries(readtest Qt${QT_MAJOR_VERSION}::Gui)
+        target_link_libraries(readtest Qt6::Gui)
         target_compile_definitions(readtest
             PRIVATE IMAGEDIR="${CMAKE_CURRENT_SOURCE_DIR}/read")
         ecm_mark_as_test(readtest)
@@ -37,7 +35,7 @@ macro(kimageformats_write_tests)
 
     if (NOT TARGET writetest)
         add_executable(writetest writetest.cpp)
-        target_link_libraries(writetest Qt${QT_MAJOR_VERSION}::Gui)
+        target_link_libraries(writetest Qt6::Gui)
         target_compile_definitions(writetest
             PRIVATE IMAGEDIR="${CMAKE_CURRENT_SOURCE_DIR}/write")
         ecm_mark_as_test(writetest)
@@ -75,7 +73,7 @@ kimageformats_read_tests(
     tga
 )
 
-if (KF5Archive_FOUND)
+if (KF6Archive_FOUND)
     kimageformats_read_tests(
         kra
         ora
@@ -99,6 +97,12 @@ if (LibHeif_FOUND)
     kimageformats_write_tests(FUZZ 1
         heif-nodatacheck-lossless
     )
+
+    if (LibHeif_VERSION VERSION_GREATER_EQUAL "1.17.0")
+        kimageformats_read_tests(FUZZ 1
+            hej2
+        )
+    endif()
 endif()
 
 if (LibJXL_FOUND AND LibJXLThreads_FOUND)
@@ -140,6 +144,11 @@ if (OpenEXR_FOUND)
     kimageformats_read_tests(
         exr
     )
+    # Color space conversions from sRGB to linear on saving and
+    # from linear to sRGB on loading result in some rounding errors.
+    kimageformats_write_tests(FUZZ 5
+        exr-nodatacheck-lossless
+    )
 endif()
 
 if (LibRaw_FOUND)
@@ -148,19 +157,19 @@ if (LibRaw_FOUND)
     )
 endif()
 
-find_package(Qt${QT_MAJOR_VERSION}Test ${REQUIRED_QT_VERSION} CONFIG QUIET)
+find_package(Qt6Test ${REQUIRED_QT_VERSION} CONFIG QUIET)
 
-if(NOT TARGET Qt${QT_MAJOR_VERSION}::Test)
-    message(STATUS "Qt${QT_MAJOR_VERSION}Test not found, some autotests will not be built.")
+if(NOT TARGET Qt6::Test)
+    message(STATUS "Qt6Test not found, some autotests will not be built.")
     return()
 endif()
 
 add_executable(pictest pictest.cpp)
-target_link_libraries(pictest Qt${QT_MAJOR_VERSION}::Gui Qt${QT_MAJOR_VERSION}::Test)
+target_link_libraries(pictest Qt6::Gui Qt6::Test)
 ecm_mark_as_test(pictest)
 add_test(NAME kimageformats-pic COMMAND pictest)
 
 add_executable(anitest anitest.cpp)
-target_link_libraries(anitest Qt${QT_MAJOR_VERSION}::Gui Qt${QT_MAJOR_VERSION}::Test)
+target_link_libraries(anitest Qt6::Gui Qt6::Test)
 ecm_mark_as_test(anitest)
 add_test(NAME kimageformats-ani COMMAND anitest)

autotests/readtest.cpp

@@ -162,13 +162,13 @@ int main(int argc, char **argv)
             if (!fi.suffix().compare("png", Qt::CaseInsensitive) || !fi.suffix().compare("tif", Qt::CaseInsensitive)) {
                 continue;
             }
-            int suffixPos = fi.filePath().count() - suffix.count();
+            int suffixPos = fi.filePath().size() - suffix.size();
             QString inputfile = fi.filePath();
             QString fmt = QStringLiteral("png");
-            QString expfile = fi.filePath().replace(suffixPos, suffix.count(), fmt);
+            QString expfile = fi.filePath().replace(suffixPos, suffix.size(), fmt);
             if (!QFile::exists(expfile)) { // try with tiff
                 fmt = QStringLiteral("tif");
-                expfile = fi.filePath().replace(suffixPos, suffix.count(), fmt);
+                expfile = fi.filePath().replace(suffixPos, suffix.size(), fmt);
             }
             QString expfilename = QFileInfo(expfile).fileName();
 

autotests/writetest.cpp

@@ -7,6 +7,7 @@
 #include <stdio.h>
 
 #include <QBuffer>
+#include <QColorSpace>
 #include <QCommandLineParser>
 #include <QCoreApplication>
 #include <QDir>
@@ -23,8 +24,8 @@ int main(int argc, char **argv)
     QCoreApplication app(argc, argv);
     QCoreApplication::removeLibraryPath(QStringLiteral(PLUGIN_DIR));
     QCoreApplication::addLibraryPath(QStringLiteral(PLUGIN_DIR));
-    QCoreApplication::setApplicationName(QStringLiteral("readtest"));
-    QCoreApplication::setApplicationVersion(QStringLiteral("1.0.0"));
+    QCoreApplication::setApplicationName(QStringLiteral("writetest"));
+    QCoreApplication::setApplicationVersion(QStringLiteral("1.1.0"));
 
     QCommandLineParser parser;
     parser.setApplicationDescription(QStringLiteral("Performs basic image conversion checking."));
@@ -85,8 +86,8 @@ int main(int argc, char **argv)
         if (parser.isSet(ignoreDataCheck)) {
             pngfile = fi.filePath();
         } else {
-            int suffixPos = fi.filePath().count() - suffix.count();
-            pngfile = fi.filePath().replace(suffixPos, suffix.count(), QStringLiteral("png"));
+            int suffixPos = fi.filePath().size() - suffix.size();
+            pngfile = fi.filePath().replace(suffixPos, suffix.size(), QStringLiteral("png"));
         }
         QString pngfilename = QFileInfo(pngfile).fileName();
 
@@ -148,6 +149,14 @@ int main(int argc, char **argv)
                 ++failed;
                 continue;
             }
+            if (reReadImage.colorSpace().isValid()) {
+                QColorSpace toColorSpace;
+                if (pngImage.colorSpace().isValid()) {
+                    reReadImage.convertToColorSpace(pngImage.colorSpace());
+                } else {
+                    reReadImage.convertToColorSpace(QColorSpace(QColorSpace::SRgb));
+                }
+            }
             reReadImage = reReadImage.convertToFormat(pngImage.format());
         }
 

src/imageformats/CMakeLists.txt

@@ -11,9 +11,10 @@ function(kimageformats_add_plugin plugin)
         message(FATAL_ERROR "kimageformats_add_plugin called without SOURCES parameter")
     endif()
 
-    add_library(${plugin} MODULE ${KIF_ADD_PLUGIN_SOURCES})
-    set_target_properties(${plugin} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/imageformats")
-    target_link_libraries(${plugin} Qt${QT_MAJOR_VERSION}::Gui)
+    qt_add_plugin(${plugin} PLUGIN_TYPE imageformats)
+    target_sources(${plugin} PRIVATE ${KIF_ADD_PLUGIN_SOURCES})
+    set_target_properties(${plugin} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/imageformats)
+    target_link_libraries(${plugin} PRIVATE Qt6::Gui)
     install(TARGETS ${plugin} DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/imageformats)
 endfunction()
 
@@ -21,176 +22,105 @@ endfunction()
 
 kimageformats_add_plugin(kimg_ani SOURCES ani.cpp)
 
-if (QT_MAJOR_VERSION STREQUAL "5")
-    install(FILES ani.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR}/qimageioplugins/)
-endif()
-
 ##################################
 
 if (TARGET avif)
     kimageformats_add_plugin(kimg_avif SOURCES "avif.cpp")
-    target_link_libraries(kimg_avif "avif")
-    if (QT_MAJOR_VERSION STREQUAL "5")
-        install(FILES avif.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR}/qimageioplugins/)
-    endif()
-endif()
-
-##################################
-
-if (QT_MAJOR_VERSION STREQUAL "5")
-    install(FILES dds-qt.desktop RENAME dds.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR}/qimageioplugins/)
+    target_link_libraries(kimg_avif PRIVATE "avif")
 endif()
 
 ##################################
 
 if (BUILD_EPS_PLUGIN)
-    if (TARGET Qt${QT_MAJOR_VERSION}::PrintSupport)
+    if (TARGET Qt6::PrintSupport)
         kimageformats_add_plugin(kimg_eps SOURCES eps.cpp)
-        target_link_libraries(kimg_eps Qt${QT_MAJOR_VERSION}::PrintSupport)
-        if (QT_MAJOR_VERSION STREQUAL "5")
-            install(FILES eps.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR}/qimageioplugins/)
-        endif()
+        target_link_libraries(kimg_eps PRIVATE Qt6::PrintSupport)
     endif()
 endif()
 
 ##################################
 
-if (QT_MAJOR_VERSION STREQUAL "5")
-    # need this for Qt's version of the plugin
-    install(FILES jp2.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR}/qimageioplugins/)
-endif()
-
-##################################
-
 if(OpenEXR_FOUND)
-    kimageformats_add_plugin(kimg_exr SOURCES exr.cpp)
+    kimageformats_add_plugin(kimg_exr SOURCES exr.cpp scanlineconverter.cpp)
     if(TARGET OpenEXR::OpenEXR)
-        target_link_libraries(kimg_exr OpenEXR::OpenEXR)
+        target_link_libraries(kimg_exr PRIVATE OpenEXR::OpenEXR)
     else()
         if(OpenEXR_VERSION_STRING VERSION_LESS 2.3.0)
             # Older OpenEXR versions use dynamic exception specifications, so
             # cannot use C++17 with them
             set_target_properties(kimg_exr PROPERTIES CXX_STANDARD 14)
         endif()
-        target_link_libraries(kimg_exr OpenEXR::IlmImf)
+        target_link_libraries(kimg_exr PRIVATE OpenEXR::IlmImf)
     endif()
     kde_target_enable_exceptions(kimg_exr PRIVATE)
-
-    if (QT_MAJOR_VERSION STREQUAL "5")
-        install(FILES exr.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR}/qimageioplugins/)
-    endif()
 endif()
 
 ##################################
 
 kimageformats_add_plugin(kimg_hdr SOURCES hdr.cpp)
-if (QT_MAJOR_VERSION STREQUAL "5")
-    install(FILES hdr.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR}/qimageioplugins/)
-endif()
 
 ##################################
 
 if (LibHeif_FOUND)
     kimageformats_add_plugin(kimg_heif SOURCES heif.cpp)
-    target_link_libraries(kimg_heif PkgConfig::LibHeif)
-
-    if (QT_MAJOR_VERSION STREQUAL "5")
-        install(FILES heif.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR}/qimageioplugins/)
-    endif()
+    target_link_libraries(kimg_heif PRIVATE PkgConfig::LibHeif)
 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 (QT_MAJOR_VERSION STREQUAL "5")
-        install(FILES jxl.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR}/qimageioplugins/)
-    endif()
+    target_link_libraries(kimg_jxl PRIVATE PkgConfig::LibJXL PkgConfig::LibJXLThreads)
 endif()
 
 ##################################
 
 kimageformats_add_plugin(kimg_pcx SOURCES pcx.cpp)
-if (QT_MAJOR_VERSION STREQUAL "5")
-    install(FILES pcx.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR}/qimageioplugins/)
-endif()
 
 ##################################
 
 kimageformats_add_plugin(kimg_pic SOURCES pic.cpp)
-if (QT_MAJOR_VERSION STREQUAL "5")
-    install(FILES pic.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR}/qimageioplugins/)
-endif()
 
 ##################################
 
 kimageformats_add_plugin(kimg_psd SOURCES psd.cpp)
-if (QT_MAJOR_VERSION STREQUAL "5")
-    install(FILES psd.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR}/qimageioplugins/)
-endif()
 
 ##################################
 
 kimageformats_add_plugin(kimg_qoi SOURCES qoi.cpp scanlineconverter.cpp)
-if (QT_MAJOR_VERSION STREQUAL "5")
-    install(FILES qoi.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR}/qimageioplugins/)
-endif()
 
 ##################################
 
 kimageformats_add_plugin(kimg_ras SOURCES ras.cpp)
-if (QT_MAJOR_VERSION STREQUAL "5")
-    install(FILES ras.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR}/qimageioplugins/)
-endif()
 
 ##################################
 
 kimageformats_add_plugin(kimg_rgb SOURCES rgb.cpp)
-if (QT_MAJOR_VERSION STREQUAL "5")
-    install(FILES rgb.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR}/qimageioplugins/)
-endif()
 
 ##################################
 
 kimageformats_add_plugin(kimg_tga SOURCES tga.cpp)
-if (QT_MAJOR_VERSION STREQUAL "5")
-    install(FILES tga.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR}/qimageioplugins/)
-endif()
 
 ##################################
 
 kimageformats_add_plugin(kimg_xcf SOURCES xcf.cpp)
-if (QT_MAJOR_VERSION STREQUAL "5")
-    install(FILES xcf.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR}/qimageioplugins/)
-endif()
 
 ##################################
 
 if (LibRaw_FOUND)
     kimageformats_add_plugin(kimg_raw SOURCES raw.cpp)
     kde_enable_exceptions()
-    target_link_libraries(kimg_raw LibRaw::LibRaw)
-    if (QT_MAJOR_VERSION STREQUAL "5")
-        install(FILES raw.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR}/qimageioplugins/)
-    endif()
+    target_link_libraries(kimg_raw PRIVATE LibRaw::LibRaw)
 endif()
 
 ##################################
 
-if (KF5Archive_FOUND)
+if (KF6Archive_FOUND)
 
     kimageformats_add_plugin(kimg_kra SOURCES kra.cpp)
-    target_link_libraries(kimg_kra KF5::Archive)
-    if (QT_MAJOR_VERSION STREQUAL "5")
-        install(FILES kra.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR}/qimageioplugins/)
-    endif()
+    target_link_libraries(kimg_kra PRIVATE KF6::Archive)
 
     kimageformats_add_plugin(kimg_ora SOURCES ora.cpp)
-    target_link_libraries(kimg_ora KF5::Archive)
-    if (QT_MAJOR_VERSION STREQUAL "5")
-        install(FILES ora.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR}/qimageioplugins/)
-    endif()
+    target_link_libraries(kimg_ora PRIVATE KF6::Archive)
 
 endif()

src/imageformats/ani.cpp

@@ -90,7 +90,7 @@ bool ANIHandler::read(QImage *outImage)
     }
 
     const QByteArray frameSizeData = device()->read(sizeof(quint32_le));
-    if (frameSizeData.count() != sizeof(quint32_le)) {
+    if (frameSizeData.size() != sizeof(quint32_le)) {
         return false;
     }
 
@@ -383,8 +383,8 @@ bool ANIHandler::ensureScanned() const
 
             // TODO should we check that the number of rate entries matches nSteps?
             auto *dataPtr = data.data();
-            QVector<int> list;
-            for (int i = 0; i < data.count(); i += sizeof(quint32_le)) {
+            QList<int> list;
+            for (int i = 0; i < data.size(); i += sizeof(quint32_le)) {
                 const auto entry = *(reinterpret_cast<const quint32_le *>(dataPtr + i));
                 list.append(entry);
             }

src/imageformats/ani.desktop

@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Service
-X-KDE-ServiceTypes=QImageIOPlugins
-X-KDE-ImageFormat=ani
-X-KDE-MimeType=application/x-navi-animation
-X-KDE-Read=true
-X-KDE-Write=false

src/imageformats/ani_p.h

@@ -41,14 +41,14 @@ private:
     int m_frameCount = 0; // "physical" frames
     int m_imageCount = 0; // logical images
     // Stores a custom sequence of images
-    QVector<int> m_imageSequence;
+    QList<int> m_imageSequence;
     // and the corresponding offsets where they are
     // since we can't read the image data sequentally in this case then
-    QVector<qint64> m_frameOffsets;
+    QList<qint64> m_frameOffsets;
     qint64 m_firstFrameOffset = 0;
 
     int m_displayRate = 0;
-    QVector<int> m_displayRates;
+    QList<int> m_displayRates;
 
     QString m_name;
     QString m_artist;

src/imageformats/avif.cpp

@@ -16,9 +16,34 @@
 
 #include <cfloat>
 
+/*
+Quality range - compression/subsampling
+100 - lossless RGB compression
+< KIMG_AVIF_QUALITY_BEST, 100 ) - YUV444 color subsampling
+< KIMG_AVIF_QUALITY_HIGH, KIMG_AVIF_QUALITY_BEST ) - YUV422 color subsampling
+< 0, KIMG_AVIF_QUALITY_HIGH ) - YUV420 color subsampling
+< 0, KIMG_AVIF_QUALITY_LOW ) - lossy compression of alpha channel
+*/
+
+#ifndef KIMG_AVIF_DEFAULT_QUALITY
+#define KIMG_AVIF_DEFAULT_QUALITY 68
+#endif
+
+#ifndef KIMG_AVIF_QUALITY_BEST
+#define KIMG_AVIF_QUALITY_BEST 90
+#endif
+
+#ifndef KIMG_AVIF_QUALITY_HIGH
+#define KIMG_AVIF_QUALITY_HIGH 80
+#endif
+
+#ifndef KIMG_AVIF_QUALITY_LOW
+#define KIMG_AVIF_QUALITY_LOW 51
+#endif
+
 QAVIFHandler::QAVIFHandler()
     : m_parseState(ParseAvifNotParsed)
-    , m_quality(52)
+    , m_quality(KIMG_AVIF_DEFAULT_QUALITY)
     , m_container_width(0)
     , m_container_height(0)
     , m_rawAvifData(AVIF_DATA_EMPTY)
@@ -519,9 +544,17 @@ bool QAVIFHandler::write(const QImage &image)
         }
     }
 
+    if (m_quality > 100) {
+        m_quality = 100;
+    } else if (m_quality < 0) {
+        m_quality = KIMG_AVIF_DEFAULT_QUALITY;
+    }
+
+#if AVIF_VERSION < 1000000
     int maxQuantizer = AVIF_QUANTIZER_WORST_QUALITY * (100 - qBound(0, m_quality, 100)) / 100;
     int minQuantizer = 0;
     int maxQuantizerAlpha = 0;
+#endif
     avifResult res;
 
     bool save_grayscale; // true - monochrome, false - colors
@@ -567,13 +600,15 @@ bool QAVIFHandler::write(const QImage &image)
         break;
     }
 
-    // quality settings
+#if AVIF_VERSION < 1000000
+    // deprecated quality settings
     if (maxQuantizer > 20) {
         minQuantizer = maxQuantizer - 20;
         if (maxQuantizer > 40) { // we decrease quality of alpha channel here
             maxQuantizerAlpha = maxQuantizer - 40;
         }
     }
+#endif
 
     if (save_grayscale && !image.hasAlphaChannel()) { // we are going to save grayscale image without alpha channel
         if (save_depth > 8) {
@@ -646,8 +681,8 @@ bool QAVIFHandler::write(const QImage &image)
         QImage tmpcolorimage = image.convertToFormat(tmpformat);
 
         avifPixelFormat pixel_format = AVIF_PIXEL_FORMAT_YUV420;
-        if (maxQuantizer < 20) {
-            if (maxQuantizer < 10) {
+        if (m_quality >= KIMG_AVIF_QUALITY_HIGH) {
+            if (m_quality >= KIMG_AVIF_QUALITY_BEST) {
                 pixel_format = AVIF_PIXEL_FORMAT_YUV444; // best quality
             } else {
                 pixel_format = AVIF_PIXEL_FORMAT_YUV422; // high quality
@@ -807,6 +842,8 @@ bool QAVIFHandler::write(const QImage &image)
     avifRWData raw = AVIF_DATA_EMPTY;
     avifEncoder *encoder = avifEncoderCreate();
     encoder->maxThreads = qBound(1, QThread::idealThreadCount(), 64);
+
+#if AVIF_VERSION < 1000000
     encoder->minQuantizer = minQuantizer;
     encoder->maxQuantizer = maxQuantizer;
 
@@ -814,6 +851,17 @@ bool QAVIFHandler::write(const QImage &image)
         encoder->minQuantizerAlpha = AVIF_QUANTIZER_LOSSLESS;
         encoder->maxQuantizerAlpha = maxQuantizerAlpha;
     }
+#else
+    encoder->quality = m_quality;
+
+    if (image.hasAlphaChannel()) {
+        if (m_quality >= KIMG_AVIF_QUALITY_LOW) {
+            encoder->qualityAlpha = 100;
+        } else {
+            encoder->qualityAlpha = 100 - (KIMG_AVIF_QUALITY_LOW - m_quality) / 2;
+        }
+    }
+#endif
 
     encoder->speed = 6;
 
@@ -870,7 +918,7 @@ void QAVIFHandler::setOption(ImageOption option, const QVariant &value)
         if (m_quality > 100) {
             m_quality = 100;
         } else if (m_quality < 0) {
-            m_quality = 52;
+            m_quality = KIMG_AVIF_DEFAULT_QUALITY;
         }
         return;
     default:

src/imageformats/avif.desktop

@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Service
-X-KDE-ServiceTypes=QImageIOPlugins
-X-KDE-ImageFormat=avif
-X-KDE-MimeType=image/avif
-X-KDE-Read=true
-X-KDE-Write=true

src/imageformats/dds-qt.desktop

@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Service
-X-KDE-ServiceTypes=QImageIOPlugins
-X-KDE-ImageFormat=dds
-X-KDE-MimeType=image/x-dds
-X-KDE-Read=true
-X-KDE-Write=true

src/imageformats/eps.desktop

@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Service
-X-KDE-ServiceTypes=QImageIOPlugins
-X-KDE-ImageFormat=eps,epsi,epsf
-X-KDE-MimeType=image/x-eps
-X-KDE-Read=true
-X-KDE-Write=true

src/imageformats/exr.cpp

@@ -1,6 +1,5 @@
 /*
-    KImageIO Routines to read (and perhaps in the future, write) images
-    in the high dynamic range EXR format.
+    The high dynamic range EXR format support for QImage.
 
     SPDX-FileCopyrightText: 2003 Brad Hards <bradh@frogmouth.net>
     SPDX-FileCopyrightText: 2023 Mirco Miranda <mircomir@outlook.com>
@@ -16,15 +15,52 @@
  */
 //#define EXR_USE_LEGACY_CONVERSIONS // default commented -> you should define it in your cmake file
 
-/* *** EXR_ALLOW_LINEAR_COLORSPACE ***
- * If defined, the linear data is kept and it is the display program that
- * must convert to the monitor profile. Otherwise the data is converted to sRGB
- * to accommodate programs that do not support color profiles.
+/* *** EXR_CONVERT_TO_SRGB ***
+ * If defined, the linear data is converted to sRGB on read to accommodate
+ * programs that do not support color profiles.
+ * Otherwise the data are kept as is and it is the display program that
+ * must convert to the monitor profile.
  * NOTE: If EXR_USE_LEGACY_CONVERSIONS is active, this is ignored.
  */
-//#define EXR_ALLOW_LINEAR_COLORSPACE // default: commented -> you should define it in your cmake file
+//#define EXR_CONVERT_TO_SRGB // default: commented -> you should define it in your cmake file
+
+/* *** EXR_STORE_XMP_ATTRIBUTE ***
+ * If defined, disables the stores XMP values in a non-standard attribute named "xmp".
+ * The QImage metadata used is "XML:com.adobe.xmp".
+ * NOTE: The use of non-standard attributes is possible but discouraged by the specification. However,
+ *       metadata is essential for good image management and programs like darktable also set this
+ *       attribute. Gimp reads the "xmp" attribute and Darktable writes it as well.
+ */
+//#define EXR_DISABLE_XMP_ATTRIBUTE // default: commented -> you should define it in your cmake file
+
+/* *** EXR_MAX_IMAGE_WIDTH and EXR_MAX_IMAGE_HEIGHT ***
+ * The maximum size in pixel allowed by the plugin.
+ */
+#ifndef EXR_MAX_IMAGE_WIDTH
+#define EXR_MAX_IMAGE_WIDTH 300000
+#endif
+#ifndef EXR_MAX_IMAGE_HEIGHT
+#define EXR_MAX_IMAGE_HEIGHT EXR_MAX_IMAGE_WIDTH
+#endif
+
+/* *** EXR_LINES_PER_BLOCK ***
+ * Allows certain compression schemes to work in multithreading
+ * Requires up to "LINES_PER_BLOCK * MAX_IMAGE_WIDTH * 8"
+ * additional RAM (e.g. if 128, up to 307MiB of RAM).
+ * There is a performance gain with the following parameters (based on empirical tests):
+ * - PIZ compression needs 64+ lines
+ * - ZIPS compression needs 8+ lines
+ * - ZIP compression needs 32+ lines
+ * - Others not tested
+ *
+ * NOTE: The OpenEXR documentation states that the higher the better :)
+ */
+#ifndef EXR_LINES_PER_BLOCK
+#define EXR_LINES_PER_BLOCK 128
+#endif
 
 #include "exr_p.h"
+#include "scanlineconverter_p.h"
 #include "util_p.h"
 
 #include <IexThrowErrnoExc.h>
@@ -39,10 +75,9 @@
 #include <ImfInt64.h>
 #include <ImfIntAttribute.h>
 #include <ImfLineOrderAttribute.h>
+#include <ImfPreviewImage.h>
 #include <ImfRgbaFile.h>
 #include <ImfStandardAttributes.h>
-#include <ImfStringAttribute.h>
-#include <ImfVecAttribute.h>
 #include <ImfVersion.h>
 
 #include <iostream>
@@ -53,14 +88,13 @@
 #include <QFloat16>
 #include <QImage>
 #include <QImageIOPlugin>
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#include <QLocale>
+#include <QThread>
 #include <QTimeZone>
-#endif
 
 // Allow the code to works on all QT versions supported by KDE
 // project (Qt 5.15 and Qt 6.x) to easy backports fixes.
-#if (QT_VERSION_MAJOR >= 6) && !defined(EXR_USE_LEGACY_CONVERSIONS)
+#if !defined(EXR_USE_LEGACY_CONVERSIONS)
 // If uncommented, the image is rendered in a float16 format, the result is very precise
 #define EXR_USE_QT6_FLOAT_IMAGE // default uncommented
 #endif
@@ -124,6 +158,57 @@ void K_IStream::clear()
     // TODO
 }
 
+class K_OStream : public Imf::OStream
+{
+public:
+    K_OStream(QIODevice *dev, const QByteArray &fileName)
+        : OStream(fileName.data())
+        , m_dev(dev)
+    {
+    }
+
+    void write(const char c[/*n*/], int n) override;
+#if OPENEXR_VERSION_MAJOR > 2
+    uint64_t tellp() override;
+    void seekp(uint64_t pos) override;
+#else
+    Imf::Int64 tellp() override;
+    void seekp(Imf::Int64 pos) override;
+#endif
+
+private:
+    QIODevice *m_dev;
+};
+
+void K_OStream::write(const char c[], int n)
+{
+    qint64 result = m_dev->write(c, n);
+    if (result > 0) {
+        return;
+    } else { // negative value {
+        Iex::throwErrnoExc("Error in write", result);
+    }
+    return;
+}
+
+#if OPENEXR_VERSION_MAJOR > 2
+uint64_t K_OStream::tellp()
+#else
+Imf::Int64 K_OStream::tellg()
+#endif
+{
+    return m_dev->pos();
+}
+
+#if OPENEXR_VERSION_MAJOR > 2
+void K_OStream::seekp(uint64_t pos)
+#else
+void K_OStream::seekg(Imf::Int64 pos)
+#endif
+{
+    m_dev->seek(pos);
+}
+
 #ifdef EXR_USE_LEGACY_CONVERSIONS
 // source: https://openexr.com/en/latest/ReadingAndWritingImageFiles.html
 inline unsigned char gamma(float x)
@@ -141,7 +226,14 @@ inline QRgb RgbaToQrgba(struct Imf::Rgba &imagePixel)
 #endif
 
 EXRHandler::EXRHandler()
+    : m_compressionRatio(-1)
+    , m_quality(-1)
+    , m_imageNumber(0)
+    , m_imageCount(0)
+    , m_startPos(-1)
 {
+    // Set the number of threads to use (0 is allowed)
+    Imf::setGlobalThreadCount(QThread::idealThreadCount() / 2);
 }
 
 bool EXRHandler::canRead() const
@@ -153,117 +245,574 @@ bool EXRHandler::canRead() const
     return false;
 }
 
+static QImage::Format imageFormat(const Imf::RgbaInputFile &file)
+{
+    auto isRgba = file.channels() & Imf::RgbaChannels::WRITE_A;
+#if defined(EXR_USE_LEGACY_CONVERSIONS)
+    return (isRgba ? QImage::Format_ARGB32 : QImage::Format_RGB32);
+#elif defined(EXR_USE_QT6_FLOAT_IMAGE)
+    return (isRgba ? QImage::Format_RGBA16FPx4 : QImage::Format_RGBX16FPx4);
+#else
+    return (isRgba ? QImage::Format_RGBA64 : QImage::Format_RGBX64);
+#endif
+}
+
+/*!
+ * \brief viewList
+ * \param header
+ * \return The list of available views.
+ */
+static QStringList viewList(const Imf::Header &h)
+{
+    QStringList l;
+    if (auto views = h.findTypedAttribute<Imf::StringVectorAttribute>("multiView")) {
+        for (auto &&v : views->value()) {
+            l << QString::fromStdString(v);
+        }
+    }
+    return l;
+}
+
+#ifdef QT_DEBUG
+void printAttributes(const Imf::Header &h)
+{
+    for (auto i = h.begin(); i != h.end(); ++i) {
+        qDebug() << i.name();
+    }
+}
+#endif
+
+/*!
+ * \brief readMetadata
+ * Reads EXR attributes from the \a header and set its as metadata in the \a image.
+ */
+static void readMetadata(const Imf::Header &header, QImage &image)
+{
+    // set some useful metadata
+    if (auto comments = header.findTypedAttribute<Imf::StringAttribute>("comments")) {
+        image.setText(QStringLiteral("Comment"), QString::fromStdString(comments->value()));
+    }
+
+    if (auto owner = header.findTypedAttribute<Imf::StringAttribute>("owner")) {
+        image.setText(QStringLiteral("Owner"), QString::fromStdString(owner->value()));
+    }
+
+    if (auto lat = header.findTypedAttribute<Imf::FloatAttribute>("latitude")) {
+        image.setText(QStringLiteral("Latitude"), QLocale::c().toString(lat->value()));
+    }
+
+    if (auto lon = header.findTypedAttribute<Imf::FloatAttribute>("longitude")) {
+        image.setText(QStringLiteral("Longitude"), QLocale::c().toString(lon->value()));
+    }
+
+    if (auto alt = header.findTypedAttribute<Imf::FloatAttribute>("altitude")) {
+        image.setText(QStringLiteral("Altitude"), QLocale::c().toString(alt->value()));
+    }
+
+    if (auto capDate = header.findTypedAttribute<Imf::StringAttribute>("capDate")) {
+        float off = 0;
+        if (auto utcOffset = header.findTypedAttribute<Imf::FloatAttribute>("utcOffset")) {
+            off = utcOffset->value();
+        }
+        auto dateTime = QDateTime::fromString(QString::fromStdString(capDate->value()), QStringLiteral("yyyy:MM:dd HH:mm:ss"));
+        if (dateTime.isValid()) {
+            dateTime.setTimeZone(QTimeZone::fromSecondsAheadOfUtc(off));
+            image.setText(QStringLiteral("CreationDate"), dateTime.toString(Qt::ISODate));
+        }
+    }
+
+    if (auto xDensity = header.findTypedAttribute<Imf::FloatAttribute>("xDensity")) {
+        float par = 1;
+        if (auto pixelAspectRatio = header.findTypedAttribute<Imf::FloatAttribute>("pixelAspectRatio")) {
+            par = pixelAspectRatio->value();
+        }
+        image.setDotsPerMeterX(qRound(xDensity->value() * 100.0 / 2.54));
+        image.setDotsPerMeterY(qRound(xDensity->value() * par * 100.0 / 2.54));
+    }
+
+    // Non-standard attribute
+    if (auto xmp = header.findTypedAttribute<Imf::StringAttribute>("xmp")) {
+        image.setText(QStringLiteral("XML:com.adobe.xmp"), QString::fromStdString(xmp->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')
+     */
+}
+
+/*!
+ * \brief readColorSpace
+ * Reads EXR chromaticities from the \a header and set its as color profile in the \a image.
+ */
+static void readColorSpace(const Imf::Header &header, QImage &image)
+{
+    // final color operations
+#ifndef EXR_USE_LEGACY_CONVERSIONS
+
+    QColorSpace cs;
+    if (auto chroma = header.findTypedAttribute<Imf::ChromaticitiesAttribute>("chromaticities")) {
+        auto &&v = chroma->value();
+        cs = QColorSpace(QPointF(v.white.x, v.white.y),
+                         QPointF(v.red.x, v.red.y),
+                         QPointF(v.green.x, v.green.y),
+                         QPointF(v.blue.x, v.blue.y),
+                         QColorSpace::TransferFunction::Linear);
+    }
+    if (!cs.isValid()) {
+        cs = QColorSpace(QColorSpace::SRgbLinear);
+    }
+    image.setColorSpace(cs);
+
+#ifdef EXR_CONVERT_TO_SRGB
+    image.convertToColorSpace(QColorSpace(QColorSpace::SRgb));
+#endif
+
+#endif // !EXR_USE_LEGACY_CONVERSIONS
+}
+
 bool EXRHandler::read(QImage *outImage)
 {
     try {
-        int width;
-        int height;
+        auto d = device();
 
-        K_IStream istr(device(), QByteArray());
+        // set the image position after the first run.
+        if (!d->isSequential()) {
+            if (m_startPos < 0) {
+                m_startPos = d->pos();
+            } else {
+                d->seek(m_startPos);
+            }
+        }
+
+        K_IStream istr(d, QByteArray());
         Imf::RgbaInputFile file(istr);
+        auto &&header = file.header();
+
+        // set the image to load
+        if (m_imageNumber > -1) {
+            auto views = viewList(header);
+            if (m_imageNumber < views.count()) {
+                file.setLayerName(views.at(m_imageNumber).toStdString());
+            }
+        }
+
+        // get image info
         Imath::Box2i dw = file.dataWindow();
-        bool isRgba = file.channels() & Imf::RgbaChannels::WRITE_A;
+        qint32 width = dw.max.x - dw.min.x + 1;
+        qint32 height = dw.max.y - dw.min.y + 1;
 
-        width = dw.max.x - dw.min.x + 1;
-        height = dw.max.y - dw.min.y + 1;
+        // limiting the maximum image size on a reasonable size (as done in other plugins)
+        if (width > EXR_MAX_IMAGE_WIDTH || height > EXR_MAX_IMAGE_HEIGHT) {
+            qWarning() << "The maximum image size is limited to" << EXR_MAX_IMAGE_WIDTH << "x" << EXR_MAX_IMAGE_HEIGHT << "px";
+            return false;
+        }
 
-#if defined(EXR_USE_LEGACY_CONVERSIONS)
-        QImage image = imageAlloc(width, height, isRgba ? QImage::Format_ARGB32 : QImage::Format_RGB32);
-#elif defined(EXR_USE_QT6_FLOAT_IMAGE)
-        QImage image = imageAlloc(width, height, isRgba ? QImage::Format_RGBA16FPx4 : QImage::Format_RGBX16FPx4);
-#else
-        QImage image = imageAlloc(width, height, isRgba ? QImage::Format_RGBA64 : QImage::Format_RGBX64);
-#endif
+        // creating the image
+        QImage image = imageAlloc(width, height, imageFormat(file));
         if (image.isNull()) {
             qWarning() << "Failed to allocate image, invalid size?" << QSize(width, height);
             return false;
         }
 
-        // set some useful metadata
-        auto &&h = file.header();
-        if (auto comments = h.findTypedAttribute<Imf::StringAttribute>("comments")) {
-            image.setText(QStringLiteral("Comment"), QString::fromStdString(comments->value()));
-        }
-        if (auto owner = h.findTypedAttribute<Imf::StringAttribute>("owner")) {
-            image.setText(QStringLiteral("Owner"), QString::fromStdString(owner->value()));
-        }
-        if (auto capDate = h.findTypedAttribute<Imf::StringAttribute>("capDate")) {
-            float off = 0;
-            if (auto utcOffset = h.findTypedAttribute<Imf::FloatAttribute>("utcOffset")) {
-                off = utcOffset->value();
-            }
-            auto dateTime = QDateTime::fromString(QString::fromStdString(capDate->value()), QStringLiteral("yyyy:MM:dd HH:mm:ss"));
-            if (dateTime.isValid()) {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
-                dateTime.setTimeZone(QTimeZone::fromSecondsAheadOfUtc(off));
-#else
-                dateTime.setOffsetFromUtc(off);
-#endif
-                image.setText(QStringLiteral("Date"), dateTime.toString(Qt::ISODate));
-            }
-        }
-        if (auto xDensity = h.findTypedAttribute<Imf::FloatAttribute>("xDensity")) {
-            float par = 1;
-            if (auto pixelAspectRatio = h.findTypedAttribute<Imf::FloatAttribute>("pixelAspectRatio")) {
-                par = pixelAspectRatio->value();
-            }
-            image.setDotsPerMeterX(qRound(xDensity->value() * 100.0 / 2.54));
-            image.setDotsPerMeterY(qRound(xDensity->value() * par * 100.0 / 2.54));
-        }
-
-        Imf::Array<Imf::Rgba> pixels;
-        pixels.resizeErase(width);
+        Imf::Array2D<Imf::Rgba> pixels;
+        pixels.resizeErase(EXR_LINES_PER_BLOCK, width);
+        bool isRgba = image.hasAlphaChannel();
 
         // somehow copy pixels into image
-        for (int y = 0; y < height; ++y) {
+        for (int y = 0, n = 0; y < height; y += n) {
             auto my = dw.min.y + y;
-            if (my <= dw.max.y) { // paranoia check
-                file.setFrameBuffer(&pixels[0] - dw.min.x - qint64(my) * width, 1, width);
-                file.readPixels(my, my);
+            if (my > dw.max.y) { // paranoia check
+                break;
+            }
 
+            file.setFrameBuffer(&pixels[0][0] - dw.min.x - qint64(my) * width, 1, width);
+            file.readPixels(my, std::min(my + EXR_LINES_PER_BLOCK - 1, dw.max.y));
+
+            for (n = 0; n < std::min(EXR_LINES_PER_BLOCK, height - y); ++n) {
 #if defined(EXR_USE_LEGACY_CONVERSIONS)
-                auto scanLine = reinterpret_cast<QRgb *>(image.scanLine(y));
+                Q_UNUSED(isRgba)
+                auto scanLine = reinterpret_cast<QRgb *>(image.scanLine(y + n));
                 for (int x = 0; x < width; ++x) {
-                    *(scanLine + x) = RgbaToQrgba(pixels[x]);
+                    *(scanLine + x) = RgbaToQrgba(pixels[n][x]);
                 }
 #elif defined(EXR_USE_QT6_FLOAT_IMAGE)
-                auto scanLine = reinterpret_cast<qfloat16 *>(image.scanLine(y));
+                auto scanLine = reinterpret_cast<qfloat16 *>(image.scanLine(y + n));
                 for (int x = 0; x < width; ++x) {
                     auto xcs = x * 4;
-                    *(scanLine + xcs) = qfloat16(qBound(0.f, float(pixels[x].r), 1.f));
-                    *(scanLine + xcs + 1) = qfloat16(qBound(0.f, float(pixels[x].g), 1.f));
-                    *(scanLine + xcs + 2) = qfloat16(qBound(0.f, float(pixels[x].b), 1.f));
-                    *(scanLine + xcs + 3) = qfloat16(isRgba ? qBound(0.f, float(pixels[x].a), 1.f) : 1.f);
+                    *(scanLine + xcs) = qfloat16(qBound(0.f, float(pixels[n][x].r), 1.f));
+                    *(scanLine + xcs + 1) = qfloat16(qBound(0.f, float(pixels[n][x].g), 1.f));
+                    *(scanLine + xcs + 2) = qfloat16(qBound(0.f, float(pixels[n][x].b), 1.f));
+                    *(scanLine + xcs + 3) = qfloat16(isRgba ? qBound(0.f, float(pixels[n][x].a), 1.f) : 1.f);
                 }
 #else
-                auto scanLine = reinterpret_cast<QRgba64 *>(image.scanLine(y));
+                auto scanLine = reinterpret_cast<QRgba64 *>(image.scanLine(y + n));
                 for (int x = 0; x < width; ++x) {
-                    *(scanLine + x) = QRgba64::fromRgba64(quint16(qBound(0.f, float(pixels[x].r) * 65535.f + 0.5f, 65535.f)),
-                                                          quint16(qBound(0.f, float(pixels[x].g) * 65535.f + 0.5f, 65535.f)),
-                                                          quint16(qBound(0.f, float(pixels[x].b) * 65535.f + 0.5f, 65535.f)),
-                                                          isRgba ? quint16(qBound(0.f, float(pixels[x].a) * 65535.f + 0.5f, 65535.f)) : quint16(65535));
+                    *(scanLine + x) = QRgba64::fromRgba64(quint16(qBound(0.f, float(pixels[n][x].r) * 65535.f + 0.5f, 65535.f)),
+                                                          quint16(qBound(0.f, float(pixels[n][x].g) * 65535.f + 0.5f, 65535.f)),
+                                                          quint16(qBound(0.f, float(pixels[n][x].b) * 65535.f + 0.5f, 65535.f)),
+                                                          isRgba ? quint16(qBound(0.f, float(pixels[n][x].a) * 65535.f + 0.5f, 65535.f)) : quint16(65535));
                 }
 #endif
             }
         }
 
+        // set some useful metadata
+        readMetadata(header, image);
         // final color operations
-#ifndef EXR_USE_LEGACY_CONVERSIONS
-        image.setColorSpace(QColorSpace(QColorSpace::SRgbLinear));
-#ifndef EXR_ALLOW_LINEAR_COLORSPACE
-        image.convertToColorSpace(QColorSpace(QColorSpace::SRgb));
-#endif // !EXR_ALLOW_LINEAR_COLORSPACE
-#endif // !EXR_USE_LEGACY_CONVERSIONS
+        readColorSpace(header, image);
 
         *outImage = image;
 
         return true;
-    } catch (const std::exception &exc) {
-        //      qDebug() << exc.what();
+    } catch (const std::exception &) {
         return false;
     }
 }
 
+/*!
+ * \brief makePreview
+ * Creates a preview of maximum 256 x 256 pixels from the \a image.
+ */
+bool makePreview(const QImage &image, Imf::Array2D<Imf::PreviewRgba> &pixels)
+{
+    auto w = image.width();
+    auto h = image.height();
+
+    QImage preview;
+    if (w > h) {
+        preview = image.scaledToWidth(256).convertToFormat(QImage::Format_ARGB32);
+    } else {
+        preview = image.scaledToHeight(256).convertToFormat(QImage::Format_ARGB32);
+    }
+    if (preview.isNull()) {
+        return false;
+    }
+
+    w = preview.width();
+    h = preview.height();
+    pixels.resizeErase(h, w);
+    preview.convertToColorSpace(QColorSpace(QColorSpace::SRgb));
+
+    for (int y = 0; y < h; ++y) {
+        auto scanLine = reinterpret_cast<const QRgb *>(preview.constScanLine(y));
+        for (int x = 0; x < w; ++x) {
+            auto &&out = pixels[y][x];
+            out.r = qRed(*(scanLine + x));
+            out.g = qGreen(*(scanLine + x));
+            out.b = qBlue(*(scanLine + x));
+            out.a = qAlpha(*(scanLine + x));
+        }
+    }
+
+    return true;
+}
+
+/*!
+ * \brief setMetadata
+ * Reades the metadata from \a image and set its as attributes in the \a header.
+ */
+static void setMetadata(const QImage &image, Imf::Header &header)
+{
+    auto dateTime = QDateTime::currentDateTime();
+    for (auto &&key : image.textKeys()) {
+        auto text = image.text(key);
+        if (!key.compare(QStringLiteral("Comment"), Qt::CaseInsensitive)) {
+            header.insert("comments", Imf::StringAttribute(text.toStdString()));
+        }
+
+        if (!key.compare(QStringLiteral("Owner"), Qt::CaseInsensitive)) {
+            header.insert("owner", Imf::StringAttribute(text.toStdString()));
+        }
+
+        // clang-format off
+        if (!key.compare(QStringLiteral("Latitude"), Qt::CaseInsensitive) ||
+            !key.compare(QStringLiteral("Longitude"), Qt::CaseInsensitive) ||
+            !key.compare(QStringLiteral("Altitude"), Qt::CaseInsensitive)) {
+            // clang-format on
+            auto ok = false;
+            auto value = QLocale::c().toFloat(text, &ok);
+            if (ok) {
+                header.insert(qPrintable(key.toLower()), Imf::FloatAttribute(value));
+            }
+        }
+
+        if (!key.compare(QStringLiteral("CreationDate"), Qt::CaseInsensitive)) {
+            auto dt = QDateTime::fromString(text, Qt::ISODate);
+            if (dt.isValid()) {
+                dateTime = dt;
+            }
+        }
+
+#ifndef EXR_DISABLE_XMP_ATTRIBUTE // warning: Non-standard attribute!
+        if (!key.compare(QStringLiteral("XML:com.adobe.xmp"), Qt::CaseInsensitive)) {
+            header.insert("xmp", Imf::StringAttribute(text.toStdString()));
+        }
+#endif
+    }
+    if (dateTime.isValid()) {
+        header.insert("capDate", Imf::StringAttribute(dateTime.toString(QStringLiteral("yyyy:MM:dd HH:mm:ss")).toStdString()));
+        header.insert("utcOffset", Imf::FloatAttribute(dateTime.offsetFromUtc()));
+    }
+
+    if (image.dotsPerMeterX() && image.dotsPerMeterY()) {
+        header.insert("xDensity", Imf::FloatAttribute(image.dotsPerMeterX() * 2.54f / 100.f));
+        header.insert("pixelAspectRatio", Imf::FloatAttribute(float(image.dotsPerMeterX()) / float(image.dotsPerMeterY())));
+    }
+
+    // set default chroma (default constructor ITU-R BT.709-3 -> sRGB)
+    // The image is converted to Linear sRGB so, the chroma is the default EXR value.
+    // 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)
+{
+    try {
+        // create EXR header
+        qint32 width = image.width();
+        qint32 height = image.height();
+
+        // limiting the maximum image size on a reasonable size (as done in other plugins)
+        if (width > EXR_MAX_IMAGE_WIDTH || height > EXR_MAX_IMAGE_HEIGHT) {
+            qWarning() << "The maximum image size is limited to" << EXR_MAX_IMAGE_WIDTH << "x" << EXR_MAX_IMAGE_HEIGHT << "px";
+            return false;
+        }
+
+        Imf::Header header(width, height);
+        // set compression scheme (forcing PIZ as default)
+        header.compression() = Imf::Compression::PIZ_COMPRESSION;
+        if (m_compressionRatio >= qint32(Imf::Compression::NO_COMPRESSION) && m_compressionRatio < qint32(Imf::Compression::NUM_COMPRESSION_METHODS)) {
+            header.compression() = Imf::Compression(m_compressionRatio);
+        }
+        // set the DCT quality (used by DCT compressions only)
+        if (m_quality > -1 && m_quality <= 100) {
+            header.dwaCompressionLevel() = float(m_quality);
+        }
+        // make ZIP compression fast (used by ZIP compressions)
+        header.zipCompressionLevel() = 1;
+
+        // set preview (don't set it for small images)
+        if (width > 1024 || height > 1024) {
+            Imf::Array2D<Imf::PreviewRgba> previewPixels;
+            if (makePreview(image, previewPixels)) {
+                header.setPreviewImage(Imf::PreviewImage(previewPixels.width(), previewPixels.height(), &previewPixels[0][0]));
+            }
+        }
+
+        // set metadata (EXR attributes)
+        setMetadata(image, header);
+
+        // write the EXR
+        K_OStream ostr(device(), QByteArray());
+        auto channelsType = image.hasAlphaChannel() ? Imf::RgbaChannels::WRITE_RGBA : Imf::RgbaChannels::WRITE_RGB;
+        if (image.format() == QImage::Format_Mono ||
+            image.format() == QImage::Format_MonoLSB ||
+            image.format() == QImage::Format_Grayscale16 ||
+            image.format() == QImage::Format_Grayscale8) {
+            channelsType = Imf::RgbaChannels::WRITE_Y;
+        }
+        Imf::RgbaOutputFile file(ostr, header, channelsType);
+        Imf::Array2D<Imf::Rgba> pixels;
+        pixels.resizeErase(EXR_LINES_PER_BLOCK, width);
+
+        // convert the image and write into the stream
+#if defined(EXR_USE_QT6_FLOAT_IMAGE)
+        auto convFormat = image.hasAlphaChannel() ? QImage::Format_RGBA16FPx4 : QImage::Format_RGBX16FPx4;
+#else
+        auto convFormat = image.hasAlphaChannel() ? QImage::Format_RGBA64 : QImage::Format_RGBX64;
+#endif
+        ScanLineConverter slc(convFormat);
+        slc.setDefaultSourceColorSpace(QColorSpace(QColorSpace::SRgb));
+        slc.setTargetColorSpace(QColorSpace(QColorSpace::SRgbLinear));
+        for (int y = 0, n = 0; y < height; y += n) {
+            for (n = 0; n < std::min(EXR_LINES_PER_BLOCK, height - y); ++n) {
+#if defined(EXR_USE_QT6_FLOAT_IMAGE)
+                auto scanLine = reinterpret_cast<const qfloat16 *>(slc.convertedScanLine(image, y + n));
+                if (scanLine == nullptr) {
+                    return false;
+                }
+                for (int x = 0; x < width; ++x) {
+                    auto xcs = x * 4;
+                    pixels[n][x].r = float(*(scanLine + xcs));
+                    pixels[n][x].g = float(*(scanLine + xcs + 1));
+                    pixels[n][x].b = float(*(scanLine + xcs + 2));
+                    pixels[n][x].a = float(*(scanLine + xcs + 3));
+                }
+#else
+                auto scanLine = reinterpret_cast<const QRgba64 *>(slc.convertedScanLine(image, y + n));
+                if (scanLine == nullptr) {
+                    return false;
+                }
+                for (int x = 0; x < width; ++x) {
+                    pixels[n][x].r = float((scanLine + x)->red() / 65535.f);
+                    pixels[n][x].g = float((scanLine + x)->green() / 65535.f);
+                    pixels[n][x].b = float((scanLine + x)->blue() / 65535.f);
+                    pixels[n][x].a = float((scanLine + x)->alpha() / 65535.f);
+                }
+#endif
+            }
+            file.setFrameBuffer(&pixels[0][0] - qint64(y) * width, 1, width);
+            file.writePixels(n);
+        }
+    } catch (const std::exception &) {
+        return false;
+    }
+
+    return true;
+}
+
+void EXRHandler::setOption(ImageOption option, const QVariant &value)
+{
+    if (option == QImageIOHandler::CompressionRatio) {
+        auto ok = false;
+        auto cr = value.toInt(&ok);
+        if (ok) {
+            m_compressionRatio = cr;
+        }
+    }
+    if (option == QImageIOHandler::Quality) {
+        auto ok = false;
+        auto q = value.toInt(&ok);
+        if (ok) {
+            m_quality = q;
+        }
+    }
+}
+
+bool EXRHandler::supportsOption(ImageOption option) const
+{
+    if (option == QImageIOHandler::Size) {
+        return true;
+    }
+    if (option == QImageIOHandler::ImageFormat) {
+        return true;
+    }
+    if (option == QImageIOHandler::CompressionRatio) {
+        return true;
+    }
+    if (option == QImageIOHandler::Quality) {
+        return true;
+    }
+    return false;
+}
+
+QVariant EXRHandler::option(ImageOption option) const
+{
+    QVariant v;
+
+    if (option == QImageIOHandler::Size) {
+        if (auto d = device()) {
+            // transactions works on both random and sequential devices
+            d->startTransaction();
+            try {
+                K_IStream istr(d, QByteArray());
+                Imf::RgbaInputFile file(istr);
+                if (m_imageNumber > -1) { // set the image to read
+                    auto views = viewList(file.header());
+                    if (m_imageNumber < views.count()) {
+                        file.setLayerName(views.at(m_imageNumber).toStdString());
+                    }
+                }
+                Imath::Box2i dw = file.dataWindow();
+                v = QVariant(QSize(dw.max.x - dw.min.x + 1, dw.max.y - dw.min.y + 1));
+            } catch (const std::exception &) {
+                // broken file or unsupported version
+            }
+            d->rollbackTransaction();
+        }
+    }
+
+    if (option == QImageIOHandler::ImageFormat) {
+        if (auto d = device()) {
+            // transactions works on both random and sequential devices
+            d->startTransaction();
+            try {
+                K_IStream istr(d, QByteArray());
+                Imf::RgbaInputFile file(istr);
+                v = QVariant::fromValue(imageFormat(file));
+            } catch (const std::exception &) {
+                // broken file or unsupported version
+            }
+            d->rollbackTransaction();
+        }
+    }
+
+    if (option == QImageIOHandler::CompressionRatio) {
+        v = QVariant(m_compressionRatio);
+    }
+
+    if (option == QImageIOHandler::Quality) {
+        v = QVariant(m_quality);
+    }
+
+    return v;
+}
+
+bool EXRHandler::jumpToNextImage()
+{
+    return jumpToImage(m_imageNumber + 1);
+}
+
+bool EXRHandler::jumpToImage(int imageNumber)
+{
+    if (imageNumber < 0 || imageNumber >= imageCount()) {
+        return false;
+    }
+    m_imageNumber = imageNumber;
+    return true;
+}
+
+int EXRHandler::imageCount() const
+{
+    // NOTE: image count is cached for performance reason
+    auto &&count = m_imageCount;
+    if (count > 0) {
+        return count;
+    }
+
+    count = QImageIOHandler::imageCount();
+
+    auto d = device();
+    d->startTransaction();
+
+    try {
+        K_IStream istr(d, QByteArray());
+        Imf::RgbaInputFile file(istr);
+        auto views = viewList(file.header());
+        if (!views.isEmpty()) {
+            count = views.size();
+        }
+    } catch (const std::exception &) {
+        // do nothing
+    }
+
+    d->rollbackTransaction();
+
+    return count;
+}
+
+int EXRHandler::currentImageNumber() const
+{
+    return m_imageNumber;
+}
+
 bool EXRHandler::canRead(QIODevice *device)
 {
     if (!device) {
@@ -279,7 +828,7 @@ bool EXRHandler::canRead(QIODevice *device)
 QImageIOPlugin::Capabilities EXRPlugin::capabilities(QIODevice *device, const QByteArray &format) const
 {
     if (format == "exr") {
-        return Capabilities(CanRead);
+        return Capabilities(CanRead | CanWrite);
     }
     if (!format.isEmpty()) {
         return {};
@@ -292,6 +841,9 @@ QImageIOPlugin::Capabilities EXRPlugin::capabilities(QIODevice *device, const QB
     if (device->isReadable() && EXRHandler::canRead(device)) {
         cap |= CanRead;
     }
+    if (device->isWritable()) {
+        cap |= CanWrite;
+    }
     return cap;
 }
 

src/imageformats/exr.desktop

@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Service
-X-KDE-ServiceTypes=QImageIOPlugins
-X-KDE-ImageFormat=exr
-X-KDE-MimeType=image/x-exr
-X-KDE-Read=true
-X-KDE-Write=false

src/imageformats/exr_p.h

@@ -1,8 +1,8 @@
 /*
-    QImageIO Routines to read (and perhaps in the future, write) images
-    in the high definition EXR format.
+    The high dynamic range EXR format support for QImage.
 
     SPDX-FileCopyrightText: 2003 Brad Hards <bradh@frogmouth.net>
+    SPDX-FileCopyrightText: 2023 Mirco Miranda <mircomir@outlook.com>
 
     SPDX-License-Identifier: LGPL-2.0-or-later
 */
@@ -12,6 +12,44 @@
 
 #include <QImageIOPlugin>
 
+/*!
+ * \brief The EXRHandler class
+ * The handler uses the OpenEXR reference implementation of the EXR file format.
+ *
+ * The purpose of EXR format is to accurately and efficiently represent high-dynamic-range scene-linear
+ * image data and associated metadata.
+ *
+ * Both reading and writing of EXR files is supported. When saving, the image is converted to 16-bit
+ * and sRGB Linear color space (if not already so). If no color space is set in the image, sRGB is assumed.
+ * When the handler is compiled with the default compile options, the loaded image is a 16-bit image
+ * with linear color space.
+ * Multiview images are also supported (read only) via imageCount(), jumpToImage(), etc....
+ *
+ * The following QImageIOHandler options are supported:
+ * - ImageFormat: The image's data format returned by the handler.
+ * - Size: The size of the image.
+ * - CompressionRatio: The compression ratio of the image data (see OpenEXR compression schemes).
+ * - Quality: The quality level of the image (see OpenEXR compression level of lossy codecs).
+ *
+ * The following metadata are set/get via QImage::setText()/QImage::text() in both read/write (if any):
+ * - Latitude, Longitude, Altitude: Geographic coordinates (Float converted to string).
+ * - CreationDate: Date the image was captured/created (QDateTime converted to string using Qt::ISODate).
+ * - Comment: Additional image information in human-readable form, for example a verbal description of the image (QString).
+ * - Owner: Name of the owner of the image (QString).
+ *
+ * In addition, information about image resolution is preserved and the preview is written for images larger
+ * than 1024px.
+ *
+ * The following compile options are supported (defines):
+ * - EXR_MAX_IMAGE_WIDTH: Maximum image width supported (read/write, default: 300000 px).
+ * - EXR_MAX_IMAGE_HEIGHT: Maximum image height supported (read/write, default: 300000 px).
+ * - EXR_LINES_PER_BLOCK: The number of scanlines buffered on both read and write operations.\n
+ *                        The higher the value, the greater the parallelization but the RAM consumption increases (default: 128)
+ * - EXR_USE_LEGACY_CONVERSIONS: The result image is an 8-bit RGB(A) converted without icc profiles (read, default: undefined).
+ * - EXR_CONVERT_TO_SRGB: The resulting image is convertef in the sRGB color space (read, default: undefined).
+ * - EXR_DISABLE_XMP_ATTRIBUTE: Disable the stores of XMP values in a non-standard attribute named "xmp".\n
+ *                              The QImage metadata used is "XML:com.adobe.xmp" (write, default: undefined).
+ */
 class EXRHandler : public QImageIOHandler
 {
 public:
@@ -19,8 +57,65 @@ public:
 
     bool canRead() const override;
     bool read(QImage *outImage) override;
+    bool write(const 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:
+    /*!
+     * \brief m_compressionRatio
+     * Value set by QImageWriter::setCompression().
+     *
+     * The compression scheme is the same as defined by OpenEXR library:
+     * - 0: no compression
+     * - 1: run length encoding
+     * - 2: zlib compression, one scan line at a time
+     * - 3: zlib compression, in blocks of 16 scan lines
+     * - 4: piz-based wavelet compression (default)
+     * - 5: lossy 24-bit float compression
+     * - 6: lossy 4-by-4 pixel block compression, fixed compression rate
+     * - 7: lossy 4-by-4 pixel block compression, fields are compressed more
+     * - 8: lossy DCT based compression, in blocks of 32 scanlines. More efficient for partial buffer access.
+     * - 9: lossy DCT based compression, in blocks of 256 scanlines. More efficient space wise and faster to decode full frames than DWAA_COMPRESSION.
+     */
+    qint32 m_compressionRatio;
+
+    /*!
+     * \brief m_quality
+     * Value set by QImageWriter::setQuality().
+     *
+     * The quality is used on DCT compression schemes only with a
+     * supposed value between 0 and 100 (default: 45).
+     */
+    qint32 m_quality;
+
+    /*!
+     * \brief m_imageNumber
+     * Value set by QImageReader::jumpToImage() or QImageReader::jumpToNextImage().
+     * The number of view selected in a multiview image.
+     */
+    qint32 m_imageNumber;
+
+    /*!
+     * \brief m_imageCount
+     * The total number of views (cache value)
+     */
+    mutable qint32 m_imageCount;
+
+    /*!
+     * \brief m_startPos
+     * The initial device position to allow multi image load (cache value).
+     */
+    qint64 m_startPos;
 };
 
 class EXRPlugin : public QImageIOPlugin

src/imageformats/hdr.cpp

@@ -11,12 +11,18 @@
 
 #include <QColorSpace>
 #include <QDataStream>
+#include <QFloat16>
 #include <QImage>
 #include <QLoggingCategory>
 #include <QRegularExpressionMatch>
 
 #include <QDebug>
 
+/* *** HDR_HALF_QUALITY ***
+ * If defined, a 16-bits float image is created, otherwise a 32-bits float ones (default).
+ */
+//#define HDR_HALF_QUALITY // default commented -> you should define it in your cmake file
+
 typedef unsigned char uchar;
 
 Q_LOGGING_CATEGORY(HDRPLUGIN, "kf.imageformats.plugins.hdr", QtWarningMsg)
@@ -27,12 +33,6 @@ namespace // Private.
 #define MINELEN 8 // minimum scanline length for encoding
 #define MAXELEN 0x7fff // maximum scanline length for encoding
 
-static inline uchar ClipToByte(float value)
-{
-    // we know value is positive.
-    return uchar(std::min(value + 0.5f, 255.0f));
-}
-
 // read an old style line from the hdr image file
 // if 'first' is true the first byte is already read
 static bool Read_Old_Line(uchar *image, int width, QDataStream &s)
@@ -75,7 +75,8 @@ static bool Read_Old_Line(uchar *image, int width, QDataStream &s)
     return true;
 }
 
-static void RGBE_To_QRgbLine(uchar *image, QRgb *scanline, int width)
+template<class float_T>
+void RGBE_To_QRgbLine(uchar *image, float_T *scanline, int width)
 {
     for (int j = 0; j < width; j++) {
         // v = ldexp(1.0, int(image[3]) - 128);
@@ -87,12 +88,25 @@ static void RGBE_To_QRgbLine(uchar *image, QRgb *scanline, int width)
             v = 1.0f / float(1 << -e);
         }
 
-        scanline[j] = qRgb(ClipToByte(float(image[0]) * v), ClipToByte(float(image[1]) * v), ClipToByte(float(image[2]) * v));
-
+        auto j4 = j * 4;
+        auto vn = v / 255.0f;
+        scanline[j4] = float_T(std::min(float(image[0]) * vn, 1.0f));
+        scanline[j4 + 1] = float_T(std::min(float(image[1]) * vn, 1.0f));
+        scanline[j4 + 2] = float_T(std::min(float(image[2]) * vn, 1.0f));
+        scanline[j4 + 3] = float_T(1.0f);
         image += 4;
     }
 }
 
+QImage::Format imageFormat()
+{
+#ifdef HDR_HALF_QUALITY
+    return QImage::Format_RGBX16FPx4;
+#else
+    return QImage::Format_RGBX32FPx4;
+#endif
+}
+
 // Load the HDR image.
 static bool LoadHDR(QDataStream &s, const int width, const int height, QImage &img)
 {
@@ -100,7 +114,7 @@ static bool LoadHDR(QDataStream &s, const int width, const int height, QImage &i
     uchar code;
 
     // Create dst image.
-    img = imageAlloc(width, height, QImage::Format_RGB32);
+    img = imageAlloc(width, height, imageFormat());
     if (img.isNull()) {
         qCDebug(HDRPLUGIN) << "Couldn't create image with size" << width << height << "and format RGB32";
         return false;
@@ -108,10 +122,14 @@ static bool LoadHDR(QDataStream &s, const int width, const int height, QImage &i
 
     QByteArray lineArray;
     lineArray.resize(4 * width);
-    uchar *image = (uchar *)lineArray.data();
+    uchar *image = reinterpret_cast<uchar *>(lineArray.data());
 
     for (int cline = 0; cline < height; cline++) {
-        QRgb *scanline = (QRgb *)img.scanLine(cline);
+#ifdef HDR_HALF_QUALITY
+        auto scanline = reinterpret_cast<qfloat16 *>(img.scanLine(cline));
+#else
+        auto scanline = reinterpret_cast<float *>(img.scanLine(cline));
+#endif
 
         // determine scanline type
         if ((width < MINELEN) || (MAXELEN < width)) {
@@ -193,9 +211,7 @@ static bool LoadHDR(QDataStream &s, const int width, const int height, QImage &i
     return true;
 }
 
-} // namespace
-
-bool HDRHandler::read(QImage *outImage)
+static QSize readHeaderSize(QIODevice *device)
 {
     int len;
     QByteArray line(MAXLINE + 1, Qt::Uninitialized);
@@ -203,7 +219,7 @@ bool HDRHandler::read(QImage *outImage)
 
     // Parse header
     do {
-        len = device()->readLine(line.data(), MAXLINE);
+        len = device->readLine(line.data(), MAXLINE);
 
         if (line.startsWith("FORMAT=")) {
             format = line.mid(7, len - 7 - 1 /*\n*/);
@@ -213,10 +229,10 @@ bool HDRHandler::read(QImage *outImage)
 
     if (format != "32-bit_rle_rgbe") {
         qCDebug(HDRPLUGIN) << "Unknown HDR format:" << format;
-        return false;
+        return QSize();
     }
 
-    len = device()->readLine(line.data(), MAXLINE);
+    len = device->readLine(line.data(), MAXLINE);
     line.resize(len);
 
     /*
@@ -236,21 +252,30 @@ bool HDRHandler::read(QImage *outImage)
     QRegularExpressionMatch match = resolutionRegExp.match(QString::fromLatin1(line));
     if (!match.hasMatch()) {
         qCDebug(HDRPLUGIN) << "Invalid HDR file, the first line after the header didn't have the expected format:" << line;
-        return false;
+        return QSize();
     }
 
     if ((match.captured(1).at(1) != u'Y') || (match.captured(3).at(1) != u'X')) {
         qCDebug(HDRPLUGIN) << "Unsupported image orientation in HDR file.";
+        return QSize();
+    }
+
+    return QSize(match.captured(4).toInt(), match.captured(2).toInt());
+}
+
+} // namespace
+
+bool HDRHandler::read(QImage *outImage)
+{
+    QDataStream s(device());
+
+    QSize size = readHeaderSize(s.device());
+    if (!size.isValid()) {
         return false;
     }
 
-    const int width = match.captured(4).toInt();
-    const int height = match.captured(2).toInt();
-
-    QDataStream s(device());
-
     QImage img;
-    if (!LoadHDR(s, width, height, img)) {
+    if (!LoadHDR(s, size.width(), size.height(), img)) {
         // qDebug() << "Error loading HDR file.";
         return false;
     }
@@ -262,6 +287,40 @@ bool HDRHandler::read(QImage *outImage)
     return true;
 }
 
+bool HDRHandler::supportsOption(ImageOption option) const
+{
+    if (option == QImageIOHandler::Size) {
+        return true;
+    }
+    if (option == QImageIOHandler::ImageFormat) {
+        return true;
+    }
+    return false;
+}
+
+QVariant HDRHandler::option(ImageOption option) const
+{
+    QVariant v;
+
+    if (option == QImageIOHandler::Size) {
+        if (auto d = device()) {
+            // transactions works on both random and sequential devices
+            d->startTransaction();
+            auto size = readHeaderSize(d);
+            d->rollbackTransaction();
+            if (size.isValid()) {
+                v = QVariant::fromValue(size);
+            }
+        }
+    }
+
+    if (option == QImageIOHandler::ImageFormat) {
+        v = QVariant::fromValue(imageFormat());
+    }
+
+    return v;
+}
+
 HDRHandler::HDRHandler()
 {
 }
@@ -282,7 +341,20 @@ bool HDRHandler::canRead(QIODevice *device)
         return false;
     }
 
-    return device->peek(11) == "#?RADIANCE\n" || device->peek(7) == "#?RGBE\n";
+    // the .pic taken from official test cases does not start with this string but can be loaded.
+    if(device->peek(11) == "#?RADIANCE\n" || device->peek(7) == "#?RGBE\n") {
+        return true;
+    }
+
+    // allow to load offical test cases: https://radsite.lbl.gov/radiance/framed.html
+    device->startTransaction();
+    QSize size = readHeaderSize(device);
+    device->rollbackTransaction();
+    if (size.isValid()) {
+        return true;
+    }
+
+    return false;
 }
 
 QImageIOPlugin::Capabilities HDRPlugin::capabilities(QIODevice *device, const QByteArray &format) const

src/imageformats/hdr.desktop

@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Service
-X-KDE-ServiceTypes=QImageIOPlugins
-X-KDE-ImageFormat=hdr
-X-KDE-MimeType=image/x-hdr
-X-KDE-Read=true
-X-KDE-Write=false

src/imageformats/hdr_p.h

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

src/imageformats/heif.cpp

@@ -22,6 +22,7 @@ size_t HEIFHandler::m_initialized_count = 0;
 bool HEIFHandler::m_plugins_queried = false;
 bool HEIFHandler::m_heif_decoder_available = false;
 bool HEIFHandler::m_heif_encoder_available = false;
+bool HEIFHandler::m_hej2_decoder_available = false;
 
 extern "C" {
 static struct heif_error heifhandler_write_callback(struct heif_context * /* ctx */, const void *data, size_t size, void *userdata)
@@ -59,12 +60,25 @@ HEIFHandler::HEIFHandler()
 
 bool HEIFHandler::canRead() const
 {
-    if (m_parseState == ParseHeicNotParsed && !canRead(device())) {
+    if (m_parseState == ParseHeicNotParsed) {
+        QIODevice *dev = device();
+        if (dev) {
+            const QByteArray header = dev->peek(28);
+
+            if (HEIFHandler::isSupportedBMFFType(header)) {
+                setFormat("heif");
+                return true;
+            }
+
+            if (HEIFHandler::isSupportedHEJ2(header)) {
+                setFormat("hej2");
+                return true;
+            }
+        }
         return false;
     }
 
     if (m_parseState != ParseHeicError) {
-        setFormat("heif");
         return true;
     }
     return false;
@@ -300,17 +314,6 @@ bool HEIFHandler::write_helper(const QImage &image)
     return true;
 }
 
-bool HEIFHandler::canRead(QIODevice *device)
-{
-    if (!device) {
-        qWarning("HEIFHandler::canRead() called with no device");
-        return false;
-    }
-
-    const QByteArray header = device->peek(28);
-    return HEIFHandler::isSupportedBMFFType(header);
-}
-
 bool HEIFHandler::isSupportedBMFFType(const QByteArray &header)
 {
     if (header.size() < 28) {
@@ -350,6 +353,22 @@ bool HEIFHandler::isSupportedBMFFType(const QByteArray &header)
     return false;
 }
 
+bool HEIFHandler::isSupportedHEJ2(const QByteArray &header)
+{
+    if (header.size() < 28) {
+        return false;
+    }
+
+    const char *buffer = header.constData();
+    if (qstrncmp(buffer + 4, "ftyp", 4) == 0) {
+        if (qstrncmp(buffer + 8, "j2ki", 4) == 0) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
 QVariant HEIFHandler::option(ImageOption option) const
 {
     if (option == Quality) {
@@ -425,7 +444,7 @@ bool HEIFHandler::ensureDecoder()
     }
 
     const QByteArray buffer = device()->readAll();
-    if (!HEIFHandler::isSupportedBMFFType(buffer)) {
+    if (!HEIFHandler::isSupportedBMFFType(buffer) && !HEIFHandler::isSupportedHEJ2(buffer)) {
         m_parseState = ParseHeicError;
         return false;
     }
@@ -814,6 +833,9 @@ bool HEIFHandler::isHeifDecoderAvailable()
         }
 #endif
 
+#if LIBHEIF_HAVE_VERSION(1, 13, 0)
+        m_hej2_decoder_available = heif_have_decoder_for_format(heif_compression_JPEG2000);
+#endif
         m_heif_encoder_available = heif_have_encoder_for_format(heif_compression_HEVC);
         m_heif_decoder_available = heif_have_decoder_for_format(heif_compression_HEVC);
         m_plugins_queried = true;
@@ -839,6 +861,9 @@ bool HEIFHandler::isHeifEncoderAvailable()
         }
 #endif
 
+#if LIBHEIF_HAVE_VERSION(1, 13, 0)
+        m_hej2_decoder_available = heif_have_decoder_for_format(heif_compression_JPEG2000);
+#endif
         m_heif_decoder_available = heif_have_decoder_for_format(heif_compression_HEVC);
         m_heif_encoder_available = heif_have_encoder_for_format(heif_compression_HEVC);
         m_plugins_queried = true;
@@ -853,6 +878,34 @@ bool HEIFHandler::isHeifEncoderAvailable()
     return m_heif_encoder_available;
 }
 
+bool HEIFHandler::isHej2DecoderAvailable()
+{
+    QMutexLocker locker(&getHEIFHandlerMutex());
+
+    if (!m_plugins_queried) {
+#if LIBHEIF_HAVE_VERSION(1, 13, 0)
+        if (m_initialized_count == 0) {
+            heif_init(nullptr);
+        }
+#endif
+
+        m_heif_encoder_available = heif_have_encoder_for_format(heif_compression_HEVC);
+        m_heif_decoder_available = heif_have_decoder_for_format(heif_compression_HEVC);
+#if LIBHEIF_HAVE_VERSION(1, 13, 0)
+        m_hej2_decoder_available = heif_have_decoder_for_format(heif_compression_JPEG2000);
+#endif
+        m_plugins_queried = true;
+
+#if LIBHEIF_HAVE_VERSION(1, 13, 0)
+        if (m_initialized_count == 0) {
+            heif_deinit();
+        }
+#endif
+    }
+
+    return m_hej2_decoder_available;
+}
+
 void HEIFHandler::startHeifLib()
 {
 #if LIBHEIF_HAVE_VERSION(1, 13, 0)
@@ -901,6 +954,15 @@ QImageIOPlugin::Capabilities HEIFPlugin::capabilities(QIODevice *device, const Q
         }
         return format_cap;
     }
+
+    if (format == "hej2") {
+        Capabilities format_cap;
+        if (HEIFHandler::isHej2DecoderAvailable()) {
+            format_cap |= CanRead;
+        }
+        return format_cap;
+    }
+
     if (!format.isEmpty()) {
         return {};
     }
@@ -909,8 +971,16 @@ QImageIOPlugin::Capabilities HEIFPlugin::capabilities(QIODevice *device, const Q
     }
 
     Capabilities cap;
-    if (device->isReadable() && HEIFHandler::canRead(device) && HEIFHandler::isHeifDecoderAvailable()) {
-        cap |= CanRead;
+    if (device->isReadable()) {
+        const QByteArray header = device->peek(28);
+
+        if (HEIFHandler::isSupportedBMFFType(header) && HEIFHandler::isHeifDecoderAvailable()) {
+            cap |= CanRead;
+        }
+
+        if (HEIFHandler::isSupportedHEJ2(header) && HEIFHandler::isHej2DecoderAvailable()) {
+            cap |= CanRead;
+        }
     }
 
     if (device->isWritable() && HEIFHandler::isHeifEncoderAvailable()) {

src/imageformats/heif.desktop

@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Service
-X-KDE-ServiceTypes=QImageIOPlugins
-X-KDE-ImageFormat=heif
-X-KDE-MimeType=image/heif
-X-KDE-Read=true
-X-KDE-Write=true

src/imageformats/heif.json

@@ -1,4 +1,4 @@
 {
-    "Keys": [ "heif", "heic" ],
-    "MimeTypes": [ "image/heif", "image/heif" ]
+    "Keys": [ "heif", "heic", "hej2" ],
+    "MimeTypes": [ "image/heif", "image/heif", "image/hej2k" ]
 }

src/imageformats/heif_p.h

@@ -24,17 +24,18 @@ public:
     bool read(QImage *image) override;
     bool write(const QImage &image) override;
 
-    static bool canRead(QIODevice *device);
-
     QVariant option(ImageOption option) const override;
     void setOption(ImageOption option, const QVariant &value) override;
     bool supportsOption(ImageOption option) const override;
 
     static bool isHeifDecoderAvailable();
     static bool isHeifEncoderAvailable();
+    static bool isHej2DecoderAvailable();
+
+    static bool isSupportedBMFFType(const QByteArray &header);
+    static bool isSupportedHEJ2(const QByteArray &header);
 
 private:
-    static bool isSupportedBMFFType(const QByteArray &header);
     bool ensureParsed() const;
     bool ensureDecoder();
 
@@ -57,6 +58,7 @@ private:
     static bool m_plugins_queried;
     static bool m_heif_decoder_available;
     static bool m_heif_encoder_available;
+    static bool m_hej2_decoder_available;
 
     static QMutex &getHEIFHandlerMutex();
 };

src/imageformats/jp2.desktop

@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Service
-X-KDE-ServiceTypes=QImageIOPlugins
-X-KDE-ImageFormat=jp2
-X-KDE-MimeType=image/jp2
-X-KDE-Read=true
-X-KDE-Write=true

src/imageformats/jxl.desktop

@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Service
-X-KDE-ServiceTypes=QImageIOPlugins
-X-KDE-ImageFormat=jxl
-X-KDE-MimeType=image/jxl
-X-KDE-Read=true
-X-KDE-Write=true

src/imageformats/jxl_p.h

@@ -14,8 +14,8 @@
 #include <QImage>
 #include <QImageIOHandler>
 #include <QImageIOPlugin>
+#include <QList>
 #include <QVariant>
-#include <QVector>
 
 #include <jxl/decode.h>
 
@@ -71,7 +71,7 @@ private:
     void *m_runner;
     JxlBasicInfo m_basicinfo;
 
-    QVector<int> m_framedelays;
+    QList<int> m_framedelays;
     int m_next_image_delay;
 
     QImage m_current_image;

src/imageformats/kra.desktop

@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Service
-X-KDE-ServiceTypes=QImageIOPlugins
-X-KDE-ImageFormat=kra
-X-KDE-MimeType=application/x-krita
-X-KDE-Read=true
-X-KDE-Write=false

src/imageformats/ora.desktop

@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Service
-X-KDE-ServiceTypes=QImageIOPlugins
-X-KDE-ImageFormat=ora
-X-KDE-MimeType=image/openraster
-X-KDE-Read=true
-X-KDE-Write=false

src/imageformats/pcx.desktop

@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Service
-X-KDE-ServiceTypes=QImageIOPlugins
-X-KDE-ImageFormat=pcx
-X-KDE-MimeType=image/x-pcx
-X-KDE-Read=true
-X-KDE-Write=true

src/imageformats/pic.desktop

@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Service
-X-KDE-ServiceTypes=QImageIOPlugins
-X-KDE-ImageFormat=pic
-X-KDE-MimeType=image/x-pic
-X-KDE-Read=true
-X-KDE-Write=true

src/imageformats/psd.cpp

@@ -20,13 +20,13 @@
 
 /*
  * Limitations of the current code:
- * - 32-bit float image are converted to 16-bit integer image.
- * - Other color spaces cannot directly be read due to lack of QImage support for
- *   color spaces other than RGB (and Grayscale). Where possible, a conversion
- *   to RGB is done:
+ * - Color spaces other than RGB/Grayscale cannot be read due to lack of QImage
+ *   support. Where possible, a conversion to RGB is done:
  *   - CMYK images are converted using an approximated way that ignores the color
  *     information (ICC profile).
  *   - LAB images are converted to sRGB using literature formulas.
+ *   - MULICHANNEL images more than 3 channels are converted as CMYK images.
+ *   - DUOTONE images are considered as Grayscale images.
  *
  *   NOTE: The best way to convert between different color spaces is to use a
  *   color management engine (e.g. LittleCMS).
@@ -126,7 +126,7 @@ struct PSDDuotoneOptions {
  */
 struct PSDColorModeDataSection {
     PSDDuotoneOptions duotone;
-    QVector<QRgb> palette;
+    QList<QRgb> palette;
 };
 
 using PSDImageResourceSection = QHash<quint16, PSDImageResourceBlock>;
@@ -458,7 +458,7 @@ PSDColorModeDataSection readColorModeDataSection(QDataStream &s, bool *ok = null
     }
     else {              // read the palette (768 bytes)
         auto&& palette = cms.palette;
-        QVector<quint8> vect(size);
+        QList<quint8> vect(size);
         for (auto&& v : vect)
             s >> v;
         for (qsizetype i = 0, n = vect.size()/3; i < n; ++i)
@@ -631,7 +631,7 @@ static bool IsValid(const PSDHeader &header)
         qDebug() << "PSD header: invalid color mode" << header.color_mode;
         return false;
     }
-    // Specs tells: "Supported range is 1 to 56" but the limit is 57:
+    // Specs tells: "Supported range is 1 to 56" but when the alpha channel is present the limit is 57:
     // Photoshop does not make you add more (see also 53alphas.psd test case).
     if (header.channel_count < 1 || header.channel_count > 57) {
         qDebug() << "PSD header: invalid number of channels" << header.channel_count;
@@ -733,7 +733,9 @@ static QImage::Format imageFormat(const PSDHeader &header, bool alpha)
     auto format = QImage::Format_Invalid;
     switch(header.color_mode) {
     case CM_RGB:
-        if (header.depth == 16 || header.depth == 32)
+        if (header.depth == 32)
+            format = header.channel_count < 4 || !alpha ? QImage::Format_RGBX32FPx4 : QImage::Format_RGBA32FPx4_Premultiplied;
+        else if (header.depth == 16)
             format = header.channel_count < 4 || !alpha ? QImage::Format_RGBX64 : QImage::Format_RGBA64_Premultiplied;
         else
             format = header.channel_count < 4 || !alpha ? QImage::Format_RGB888 : QImage::Format_RGBA8888_Premultiplied;
@@ -789,11 +791,13 @@ static qint32 imageChannels(const QImage::Format& format)
     return c;
 }
 
-inline quint8 xchg(quint8 v) {
+inline quint8 xchg(quint8 v)
+{
     return v;
 }
 
-inline quint16 xchg(quint16 v) {
+inline quint16 xchg(quint16 v)
+{
 #if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
     return quint16( (v>>8) | (v<<8) );
 #else
@@ -801,7 +805,8 @@ inline quint16 xchg(quint16 v) {
 #endif
 }
 
-inline quint32 xchg(quint32 v) {
+inline quint32 xchg(quint32 v)
+{
 #if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
     return quint32( (v>>24) | ((v & 0x00FF0000)>>8) | ((v & 0x0000FF00)<<8) | (v<<24) );
 #else
@@ -858,8 +863,9 @@ enum class PremulConversion {
 template<class T>
 inline void premulConversion(char *stride, qint32 width, qint32 ac, qint32 cn, const PremulConversion &conv)
 {
-    auto s = reinterpret_cast<T *>(stride);
-    auto max = qint64(std::numeric_limits<T>::max());
+    auto s = reinterpret_cast<T*>(stride);
+    // NOTE: to avoid overflows, max is casted to qint64: that is possible because max is always an integer (even if T is float)
+    auto max = qint64(std::numeric_limits<T>::is_integer ? std::numeric_limits<T>::max() : 1);
 
     for (qint32 c = 0; c < ac; ++c) {
         if (conv == PremulConversion::PS2P) {
@@ -868,14 +874,16 @@ inline void premulConversion(char *stride, qint32 width, qint32 ac, qint32 cn, c
                 auto alpha = *(s + xcn + ac);
                 *(s + xcn + c) = *(s + xcn + c) + alpha - max;
             }
-        } else if (conv == PremulConversion::PS2A || (conv == PremulConversion::PSLab2A && c == 0)) {
+        }
+        else if (conv == PremulConversion::PS2A || (conv == PremulConversion::PSLab2A && c == 0)) {
             for (qint32 x = 0; x < width; ++x) {
                 auto xcn = x * cn;
                 auto alpha = *(s + xcn + ac);
                 if (alpha > 0)
                     *(s + xcn + c) = ((*(s + xcn + c) + alpha - max) * max + alpha / 2) / alpha;
             }
-        } else if (conv == PremulConversion::PSLab2A) {
+        }
+        else if (conv == PremulConversion::PSLab2A) {
             for (qint32 x = 0; x < width; ++x) {
                 auto xcn = x * cn;
                 auto alpha = *(s + xcn + ac);
@@ -898,8 +906,8 @@ inline void monoInvert(uchar *target, const char* source, qint32 bytes)
 template<class T>
 inline void rawChannelsCopy(uchar *target, qint32 targetChannels, const char *source, qint32 sourceChannels, qint32 width)
 {
-    auto s = reinterpret_cast<const T *>(source);
-    auto t = reinterpret_cast<T *>(target);
+    auto s = reinterpret_cast<const T*>(source);
+    auto t = reinterpret_cast<T*>(target);
     for (qint32 c = 0, cs = std::min(targetChannels, sourceChannels); c < cs; ++c) {
         for (qint32 x = 0; x < width; ++x) {
             t[x * targetChannels + c] = s[x * sourceChannels + c];
@@ -1101,7 +1109,7 @@ static bool LoadPSD(QDataStream &stream, const PSDHeader &header, QImage &img)
         return false;
     }
 
-    QVector<quint32> strides(header.height * header.channel_count, raw_count);
+    QList<quint32> strides(header.height * header.channel_count, raw_count);
     // Read the compressed stride sizes
     if (compression) {
         for (auto&& v : strides) {
@@ -1116,7 +1124,7 @@ static bool LoadPSD(QDataStream &stream, const PSDHeader &header, QImage &img)
     }
     // calculate the absolute file positions of each stride (required when a colorspace conversion should be done)
     auto device = stream.device();
-    QVector<quint64> stridePositions(strides.size());
+    QList<quint64> stridePositions(strides.size());
     if (!stridePositions.isEmpty()) {
         stridePositions[0] = device->pos();
     }
@@ -1131,15 +1139,15 @@ static bool LoadPSD(QDataStream &stream, const PSDHeader &header, QImage &img)
     // clang-format off
     // checks the need of color conversion (that requires random access to the image)
     auto randomAccess = (header.color_mode == CM_CMYK) ||
-        (header.color_mode == CM_LABCOLOR) ||
-        (header.color_mode == CM_MULTICHANNEL) ||
-        (header.color_mode != CM_INDEXED && img.hasAlphaChannel());
+                        (header.color_mode == CM_LABCOLOR) ||
+                        (header.color_mode == CM_MULTICHANNEL) ||
+                        (header.color_mode != CM_INDEXED && img.hasAlphaChannel());
     // clang-format on
 
     if (randomAccess) {
         // In order to make a colorspace transformation, we need all channels of a scanline
         QByteArray psdScanline;
-        psdScanline.resize(qsizetype(header.width * std::min(header.depth, quint16(16)) * header.channel_count + 7) / 8);
+        psdScanline.resize(qsizetype(header.width * header.depth * header.channel_count + 7) / 8);
         for (qint32 y = 0, h = header.height; y < h; ++y) {
             for (qint32 c = 0; c < header.channel_count; ++c) {
                 auto strideNumber = c * qsizetype(h) + y;
@@ -1156,32 +1164,37 @@ static bool LoadPSD(QDataStream &stream, const PSDHeader &header, QImage &img)
                 auto scanLine = reinterpret_cast<unsigned char*>(psdScanline.data());
                 if (header.depth == 8) {
                     planarToChunchy<quint8>(scanLine, rawStride.data(), header.width, c, header.channel_count);
-                } else if (header.depth == 16) {
+                }
+                else if (header.depth == 16) {
                     planarToChunchy<quint16>(scanLine, rawStride.data(), header.width, c, header.channel_count);
-                } else if (header.depth == 32) {
-                    planarToChunchyFloatToUInt16<float>(scanLine, rawStride.data(), header.width, c, header.channel_count);
+                }
+                else if (header.depth == 32) {
+                    planarToChunchy<float>(scanLine, rawStride.data(), header.width, c, header.channel_count);
                 }
             }
 
             // Convert premultiplied data to unassociated data
             if (img.hasAlphaChannel()) {
+                auto scanLine = reinterpret_cast<char*>(psdScanline.data());
                 if (header.color_mode == CM_CMYK) {
                     if (header.depth == 8)
-                        premulConversion<quint8>(psdScanline.data(), header.width, 4, header.channel_count, PremulConversion::PS2A);
+                        premulConversion<quint8>(scanLine, header.width, 4, header.channel_count, PremulConversion::PS2A);
                     else if (header.depth == 16)
-                        premulConversion<quint16>(psdScanline.data(), header.width, 4, header.channel_count, PremulConversion::PS2A);
+                        premulConversion<quint16>(scanLine, header.width, 4, header.channel_count, PremulConversion::PS2A);
                 }
                 if (header.color_mode == CM_LABCOLOR) {
                     if (header.depth == 8)
-                        premulConversion<quint8>(psdScanline.data(), header.width, 3, header.channel_count, PremulConversion::PSLab2A);
+                        premulConversion<quint8>(scanLine, header.width, 3, header.channel_count, PremulConversion::PSLab2A);
                     else if (header.depth == 16)
-                        premulConversion<quint16>(psdScanline.data(), header.width, 3, header.channel_count, PremulConversion::PSLab2A);
+                        premulConversion<quint16>(scanLine, header.width, 3, header.channel_count, PremulConversion::PSLab2A);
                 }
                 if (header.color_mode == CM_RGB) {
                     if (header.depth == 8)
-                        premulConversion<quint8>(psdScanline.data(), header.width, 3, header.channel_count, PremulConversion::PS2P);
-                    else if (header.depth == 16 || header.depth == 32)
-                        premulConversion<quint16>(psdScanline.data(), header.width, 3, header.channel_count, PremulConversion::PS2P);
+                        premulConversion<quint8>(scanLine, header.width, 3, header.channel_count, PremulConversion::PS2P);
+                    else if (header.depth == 16)
+                        premulConversion<quint16>(scanLine, header.width, 3, header.channel_count, PremulConversion::PS2P);
+                    else if (header.depth == 32)
+                        premulConversion<float>(scanLine, header.width, 3, header.channel_count, PremulConversion::PS2P);
                 }
             }
 
@@ -1201,11 +1214,14 @@ static bool LoadPSD(QDataStream &stream, const PSDHeader &header, QImage &img)
             if (header.color_mode == CM_RGB) {
                 if (header.depth == 8)
                     rawChannelsCopy<quint8>(img.scanLine(y), imgChannels, psdScanline.data(), header.channel_count, header.width);
-                else if (header.depth == 16 || header.depth == 32)
+                else if (header.depth == 16)
                     rawChannelsCopy<quint16>(img.scanLine(y), imgChannels, psdScanline.data(), header.channel_count, header.width);
+                else if (header.depth == 32)
+                    rawChannelsCopy<float>(img.scanLine(y), imgChannels, psdScanline.data(), header.channel_count, header.width);
             }
         }
-    } else {
+    }
+    else {
         // Linear read (no position jumps): optimized code usable only for the colorspaces supported by QImage
         for (qint32 c = 0; c < channel_num; ++c) {
             for (qint32 y = 0, h = header.height; y < h; ++y) {
@@ -1218,25 +1234,23 @@ static bool LoadPSD(QDataStream &stream, const PSDHeader &header, QImage &img)
                 auto scanLine = img.scanLine(y);
                 if (header.depth == 1) { // Bitmap
                     monoInvert(scanLine, rawStride.data(), std::min(rawStride.size(), img.bytesPerLine()));
-                } else if (header.depth == 8) { // 8-bits images: Indexed, Grayscale, RGB/RGBA
+                }
+                else if (header.depth == 8) { // 8-bits images: Indexed, Grayscale, RGB/RGBA
                     planarToChunchy<quint8>(scanLine, rawStride.data(), header.width, c, imgChannels);
-                } else if (header.depth == 16) { // 16-bits integer images: Grayscale, RGB/RGBA
+                }
+                else if (header.depth == 16) { // 16-bits integer images: Grayscale, RGB/RGBA
                     planarToChunchy<quint16>(scanLine, rawStride.data(), header.width, c, imgChannels);
-                } else if (header.depth == 32) { // 32-bits float images: Grayscale, RGB/RGBA (coverted to equivalent integer 16-bits)
+                }
+                else if (header.depth == 32 && header.color_mode == CM_RGB) { // 32-bits float images: RGB/RGBA
+                    planarToChunchy<float>(scanLine, rawStride.data(), header.width, c, imgChannels);
+                }
+                else if (header.depth == 32 && header.color_mode == CM_GRAYSCALE) { // 32-bits float images: Grayscale (coverted to equivalent integer 16-bits)
                     planarToChunchyFloatToUInt16<float>(scanLine, rawStride.data(), header.width, c, imgChannels);
                 }
             }
         }
     }
 
-    // LAB conversion generates a sRGB image
-    if (header.color_mode == CM_LABCOLOR) {
-#ifdef PSD_FAST_LAB_CONVERSION
-        img.setColorSpace(QColorSpace(QColorSpace::SRgbLinear));
-#else
-        img.setColorSpace(QColorSpace(QColorSpace::SRgb));
-#endif
-    }
 
     // Resolution info
     if (!setResolution(img, irs)) {
@@ -1244,7 +1258,15 @@ static bool LoadPSD(QDataStream &stream, const PSDHeader &header, QImage &img)
     }
 
     // ICC profile
-    if (!setColorSpace(img, irs)) {
+    if (header.color_mode == CM_LABCOLOR) {
+        // LAB conversion generates a sRGB image
+#ifdef PSD_FAST_LAB_CONVERSION
+        img.setColorSpace(QColorSpace(QColorSpace::SRgbLinear));
+#else
+        img.setColorSpace(QColorSpace(QColorSpace::SRgb));
+#endif
+    }
+    else if (!setColorSpace(img, irs)) {
         // qDebug() << "No colorspace info set!";
     }
 

src/imageformats/psd.desktop

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

src/imageformats/qoi.desktop

@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Service
-X-KDE-ServiceTypes=QImageIOPlugins
-X-KDE-ImageFormat=qoi
-X-KDE-MimeType=image/qoi
-X-KDE-Read=true
-X-KDE-Write=true

src/imageformats/ras.cpp

@@ -3,6 +3,7 @@
     SPDX-FileCopyrightText: 2003 Dominik Seichter <domseichter@web.de>
     SPDX-FileCopyrightText: 2004 Ignacio Castaño <castano@ludicon.com>
     SPDX-FileCopyrightText: 2010 Troy Unrau <troy@kde.org>
+    SPDX-FileCopyrightText: 2023 Mirco Miranda <mircomir@outlook.com>
 
     SPDX-License-Identifier: LGPL-2.0-or-later
 */
@@ -39,14 +40,14 @@ enum RASColorMapType {
 };
 
 struct RasHeader {
-    quint32 MagicNumber;
-    quint32 Width;
-    quint32 Height;
-    quint32 Depth;
-    quint32 Length;
-    quint32 Type;
-    quint32 ColorMapType;
-    quint32 ColorMapLength;
+    quint32 MagicNumber = 0;
+    quint32 Width = 0;
+    quint32 Height = 0;
+    quint32 Depth = 0;
+    quint32 Length = 0;
+    quint32 Type = 0;
+    quint32 ColorMapType = 0;
+    quint32 ColorMapLength = 0;
     enum {
         SIZE = 32,
     }; // 8 fields of four bytes each
@@ -80,152 +81,251 @@ static bool IsSupported(const RasHeader &head)
         return false;
     }
     // check for an appropriate depth
-    // we support 8bit+palette, 24bit and 32bit ONLY!
-    // TODO: add support for 1bit
-    if (!((head.Depth == 8 && head.ColorMapType == 1) || head.Depth == 24 || head.Depth == 32)) {
+    if (head.Depth != 1 && head.Depth != 8 && head.Depth != 24 && head.Depth != 32) {
+        return false;
+    }
+    if (head.Width == 0 || head.Height == 0) {
         return false;
     }
     // the Type field adds support for RLE(BGR), RGB and other encodings
-    // we support Type 1: Normal(BGR) and Type 3: Normal(RGB) ONLY!
-    // TODO: add support for Type 2: RLE(BGR) & Type 4,5: TIFF/IFF
-    if (!(head.Type == 1 || head.Type == 3)) {
-        return false;
-    }
-    // Old files didn't have Length set - reject them for now
-    // TODO: add length recalculation to support old files
-    if (!head.Length) {
+    // we support Type 1: Normal(BGR), Type 2: RLE(BGR) and Type 3: Normal(RGB) ONLY!
+    // TODO: add support for Type 4,5: TIFF/IFF
+    if (!(head.Type == RAS_TYPE_STANDARD || head.Type == RAS_TYPE_RGB_FORMAT || head.Type == RAS_TYPE_BYTE_ENCODED)) {
         return false;
     }
     return true;
 }
 
+static QImage::Format imageFormat(const RasHeader &header)
+{
+    if (header.ColorMapType == RAS_COLOR_MAP_TYPE_RGB) {
+        return QImage::Format_Indexed8;
+    }
+    if (header.Depth == 8 && header.ColorMapType == RAS_COLOR_MAP_TYPE_NONE) {
+        return QImage::Format_Grayscale8;
+    }
+    if (header.Depth == 1) {
+        return QImage::Format_Mono;
+    }
+    return QImage::Format_RGB32;
+}
+
+class LineDecoder
+{
+public:
+    LineDecoder(QIODevice *d, const RasHeader &ras)
+        : device(d)
+        , header(ras)
+    {
+    }
+
+    QByteArray readLine(qint64 size)
+    {
+        /* *** uncompressed
+         */
+        if (header.Type != RAS_TYPE_BYTE_ENCODED) {
+            return device->read(size);
+        }
+
+        /* *** rle compressed
+         * The Run-length encoding (RLE) scheme optionally used in Sun Raster
+         * files (Type = 0002h) is used to encode bytes of image data
+         * separately. RLE encoding may be found in any Sun Raster file
+         * regardless of the type of image data it contains.
+         *
+         * The RLE packets are typically three bytes in size:
+         * - The first byte is a Flag Value indicating the type of RLE packet.
+         * - The second byte is the Run Count.
+         * - The third byte is the Run Value.
+         *
+         * A Flag Value of 80h is followed by a Run Count in the range of 01h
+         * to FFh. The Run Value follows the Run count and is in the range of
+         * 00h to FFh. The pixel run is the Run Value repeated Run Count times.
+         * There are two exceptions to this algorithm. First, if the Run Count
+         * following the Flag Value is 00h, this is an indication that the run
+         * is a single byte in length and has a value of 80h. And second, if
+         * the Flag Value is not 80h, then it is assumed that the data is
+         * unencoded pixel data and is written directly to the output stream.
+         *
+         * source: http://www.fileformat.info/format/sunraster/egff.htm
+         */
+        for (qsizetype psz = 0, ptr = 0; uncBuffer.size() < size;) {
+            rleBuffer.append(device->read(std::min(qint64(32768), size)));
+            qsizetype sz = rleBuffer.size();
+            if (psz == sz) {
+                break; // avoid infinite loop (data corrupted?!)
+            }
+            auto data = reinterpret_cast<uchar *>(rleBuffer.data());
+            for (; ptr < sz;) {
+                auto flag = data[ptr++];
+                if (flag == 0x80) {
+                    if (ptr >= sz) {
+                        ptr -= 1;
+                        break;
+                    }
+                    auto cnt = data[ptr++];
+                    if (cnt == 0) {
+                        uncBuffer.append(char(0x80));
+                        continue;
+                    } else if (ptr >= sz) {
+                        ptr -= 2;
+                        break;
+                    }
+                    auto val = data[ptr++];
+                    uncBuffer.append(QByteArray(1 + cnt, char(val)));
+                } else {
+                    uncBuffer.append(char(flag));
+                }
+            }
+            if (ptr) { // remove consumed data
+                rleBuffer.remove(0, ptr);
+                ptr = 0;
+            }
+            psz = rleBuffer.size();
+        }
+        if (uncBuffer.size() < size) {
+            return QByteArray(); // something wrong
+        }
+        auto line = uncBuffer.mid(0, size);
+        uncBuffer.remove(0, line.size()); // remove consumed data
+        return line;
+    }
+
+private:
+    QIODevice *device;
+    RasHeader header;
+
+    // RLE decoding buffers
+    QByteArray rleBuffer;
+    QByteArray uncBuffer;
+};
+
 static bool LoadRAS(QDataStream &s, const RasHeader &ras, QImage &img)
 {
     s.device()->seek(RasHeader::SIZE);
 
-    if (ras.ColorMapLength > kMaxQVectorSize) {
-        qWarning() << "LoadRAS() unsupported image color map length in file header" << ras.ColorMapLength;
+    // The width of a scan line is always a multiple of 16 bits, padded when necessary.
+    auto rasLineSize = (qint64(ras.Width) * ras.Depth + 7) / 8;
+    if (rasLineSize & 1)
+        ++rasLineSize;
+    if (rasLineSize > kMaxQVectorSize) {
+        qWarning() << "LoadRAS() unsupported line size" << rasLineSize;
         return false;
     }
 
-    // Read palette if needed.
-    QVector<quint8> palette(ras.ColorMapLength);
-    if (ras.ColorMapType == 1) {
-        for (quint32 i = 0; i < ras.ColorMapLength; ++i) {
-            s >> palette[i];
-        }
-    }
-
-    const int bpp = ras.Depth / 8;
-    if (ras.Height == 0) {
-        return false;
-    }
-    if (bpp == 0) {
-        return false;
-    }
-    if (ras.Length / ras.Height / bpp < ras.Width) {
-        qWarning() << "LoadRAS() mistmatch between height and width" << ras.Width << ras.Height << ras.Length << ras.Depth;
-        return false;
-    }
-    if (ras.Length > kMaxQVectorSize) {
-        qWarning() << "LoadRAS() unsupported image length in file header" << ras.Length;
-        return false;
-    }
-
-    // each line must be a factor of 16 bits, so they may contain padding
-    // this will be 1 if padding required, 0 otherwise
-    const int paddingrequired = (ras.Width * bpp % 2);
-
-    // qDebug() << "paddingrequired: " << paddingrequired;
-    // don't trust ras.Length
-    QVector<quint8> input(ras.Length);
-
-    int i = 0;
-    while (!s.atEnd() && i < input.size()) {
-        s >> input[i];
-        // I guess we need to find out if we're at the end of a line
-        if (paddingrequired && i != 0 && !(i % (ras.Width * bpp))) {
-            s >> input[i];
-        }
-        i++;
-    }
-
     // Allocate image
-    img = imageAlloc(ras.Width, ras.Height, QImage::Format_ARGB32);
+    img = imageAlloc(ras.Width, ras.Height, imageFormat(ras));
     if (img.isNull()) {
         return false;
     }
 
-    // Reconstruct image from RGB palette if we have a palette
-    // TODO: make generic so it works with 24bit or 32bit palettes
-    if (ras.ColorMapType == 1 && ras.Depth == 8) {
-        quint8 red;
-        quint8 green;
-        quint8 blue;
-        for (quint32 y = 0; y < ras.Height; y++) {
-            for (quint32 x = 0; x < ras.Width; x++) {
-                red = palette.value((int)input[y * ras.Width + x]);
-                green = palette.value((int)input[y * ras.Width + x] + (ras.ColorMapLength / 3));
-                blue = palette.value((int)input[y * ras.Width + x] + 2 * (ras.ColorMapLength / 3));
-                img.setPixel(x, y, qRgb(red, green, blue));
-            }
+    // Read palette if needed.
+    if (ras.ColorMapType == RAS_COLOR_MAP_TYPE_RGB) {
+        QList<quint8> palette(ras.ColorMapLength);
+        for (quint32 i = 0; i < ras.ColorMapLength; ++i) {
+            s >> palette[i];
+        }
+        QList<QRgb> colorTable;
+        for (quint32 i = 0, n = ras.ColorMapLength / 3; i < n; ++i) {
+            colorTable << qRgb(palette.at(i), palette.at(i + n), palette.at(i + 2 * n));
+        }
+        for (; colorTable.size() < 256;) {
+            colorTable << qRgb(255, 255, 255);
+        }
+        img.setColorTable(colorTable);
+        if (s.status() != QDataStream::Ok) {
+            return false;
         }
     }
 
-    if (ras.ColorMapType == 0 && ras.Depth == 24 && (ras.Type == 1 || ras.Type == 2)) {
-        quint8 red;
-        quint8 green;
-        quint8 blue;
-        for (quint32 y = 0; y < ras.Height; y++) {
-            for (quint32 x = 0; x < ras.Width; x++) {
-                red = input[y * 3 * ras.Width + x * 3 + 2];
-                green = input[y * 3 * ras.Width + x * 3 + 1];
-                blue = input[y * 3 * ras.Width + x * 3];
-                img.setPixel(x, y, qRgb(red, green, blue));
-            }
+    LineDecoder dec(s.device(), ras);
+    auto bytesPerLine = std::min(img.bytesPerLine(), qsizetype(rasLineSize));
+    for (quint32 y = 0; y < ras.Height; ++y) {
+        auto rasLine = dec.readLine(rasLineSize);
+        if (rasLine.size() != rasLineSize) {
+            qWarning() << "LoadRAS() unable to read line" << y << ": the seems corrupted!";
+            return false;
         }
-    }
 
-    if (ras.ColorMapType == 0 && ras.Depth == 24 && ras.Type == 3) {
-        quint8 red;
-        quint8 green;
-        quint8 blue;
-        for (quint32 y = 0; y < ras.Height; y++) {
-            for (quint32 x = 0; x < ras.Width; x++) {
-                red = input[y * 3 * ras.Width + x * 3];
-                green = input[y * 3 * ras.Width + x * 3 + 1];
-                blue = input[y * 3 * ras.Width + x * 3 + 2];
-                img.setPixel(x, y, qRgb(red, green, blue));
+        // Grayscale 1-bit / Grayscale 8-bit (never seen)
+        if (ras.ColorMapType == RAS_COLOR_MAP_TYPE_NONE && (ras.Depth == 1 || ras.Depth == 8)) {
+            for (auto &&b : rasLine) {
+                b = ~b;
             }
+            std::memcpy(img.scanLine(y), rasLine.constData(), bytesPerLine);
+            continue;
         }
-    }
 
-    if (ras.ColorMapType == 0 && ras.Depth == 32 && (ras.Type == 1 || ras.Type == 2)) {
-        quint8 red;
-        quint8 green;
-        quint8 blue;
-        for (quint32 y = 0; y < ras.Height; y++) {
-            for (quint32 x = 0; x < ras.Width; x++) {
-                red = input[y * 4 * ras.Width + x * 4 + 3];
-                green = input[y * 4 * ras.Width + x * 4 + 2];
-                blue = input[y * 4 * ras.Width + x * 4 + 1];
-                img.setPixel(x, y, qRgb(red, green, blue));
-            }
+        // Image with palette
+        if (ras.ColorMapType == RAS_COLOR_MAP_TYPE_RGB && (ras.Depth == 1 || ras.Depth == 8)) {
+            std::memcpy(img.scanLine(y), rasLine.constData(), bytesPerLine);
+            continue;
         }
-    }
 
-    if (ras.ColorMapType == 0 && ras.Depth == 32 && ras.Type == 3) {
-        quint8 red;
-        quint8 green;
-        quint8 blue;
-        for (quint32 y = 0; y < ras.Height; y++) {
+        // BGR 24-bit
+        if (ras.ColorMapType == RAS_COLOR_MAP_TYPE_NONE && ras.Depth == 24 && (ras.Type == RAS_TYPE_STANDARD || ras.Type == RAS_TYPE_BYTE_ENCODED)) {
+            quint8 red;
+            quint8 green;
+            quint8 blue;
+            auto scanLine = reinterpret_cast<QRgb *>(img.scanLine(y));
             for (quint32 x = 0; x < ras.Width; x++) {
-                red = input[y * 4 * ras.Width + x * 4 + 1];
-                green = input[y * 4 * ras.Width + x * 4 + 2];
-                blue = input[y * 4 * ras.Width + x * 4 + 3];
-                img.setPixel(x, y, qRgb(red, green, blue));
+                red = rasLine.at(x * 3 + 2);
+                green = rasLine.at(x * 3 + 1);
+                blue = rasLine.at(x * 3);
+                *(scanLine + x) = qRgb(red, green, blue);
             }
+            continue;
         }
+
+        // RGB 24-bit
+        if (ras.ColorMapType == RAS_COLOR_MAP_TYPE_NONE && ras.Depth == 24 && ras.Type == RAS_TYPE_RGB_FORMAT) {
+            quint8 red;
+            quint8 green;
+            quint8 blue;
+            auto scanLine = reinterpret_cast<QRgb *>(img.scanLine(y));
+            for (quint32 x = 0; x < ras.Width; x++) {
+                red = rasLine.at(x * 3);
+                green = rasLine.at(x * 3 + 1);
+                blue = rasLine.at(x * 3 + 2);
+                *(scanLine + x) = qRgb(red, green, blue);
+            }
+            continue;
+        }
+
+        // BGR 32-bit (not tested: test case missing)
+        if (ras.ColorMapType == RAS_COLOR_MAP_TYPE_NONE && ras.Depth == 32 && (ras.Type == RAS_TYPE_STANDARD || ras.Type == RAS_TYPE_BYTE_ENCODED)) {
+            quint8 red;
+            quint8 green;
+            quint8 blue;
+            auto scanLine = reinterpret_cast<QRgb *>(img.scanLine(y));
+            for (quint32 x = 0; x < ras.Width; x++) {
+                red = rasLine.at(x * 4 + 3);
+                green = rasLine.at(x * 4 + 2);
+                blue = rasLine.at(x * 4 + 1);
+                *(scanLine + x) = qRgb(red, green, blue);
+            }
+
+            continue;
+        }
+
+        // RGB 32-bit (tested: test case missing due to image too large)
+        if (ras.ColorMapType == RAS_COLOR_MAP_TYPE_NONE && ras.Depth == 32 && ras.Type == RAS_TYPE_RGB_FORMAT) {
+            quint8 red;
+            quint8 green;
+            quint8 blue;
+            auto scanLine = reinterpret_cast<QRgb *>(img.scanLine(y));
+            for (quint32 x = 0; x < ras.Width; x++) {
+                red = rasLine.at(x * 4 + 1);
+                green = rasLine.at(x * 4 + 2);
+                blue = rasLine.at(x * 4 + 3);
+                *(scanLine + x) = qRgb(red, green, blue);
+            }
+            continue;
+        }
+
+        qWarning() << "LoadRAS() unsupported format!"
+                   << "ColorMapType:" << ras.ColorMapType << "Type:" << ras.Type << "Depth:" << ras.Depth;
+        return false;
     }
 
     return true;
@@ -283,16 +383,8 @@ bool RASHandler::read(QImage *outImage)
     RasHeader ras;
     s >> ras;
 
-    if (ras.ColorMapLength > std::numeric_limits<int>::max()) {
-        return false;
-    }
-
-    // TODO: add support for old versions of RAS where Length may be zero in header
-    s.device()->seek(RasHeader::SIZE + ras.Length + ras.ColorMapLength);
-
-    // Check image file format. Type 2 is RLE, which causing seeking to be silly.
-    if (!s.atEnd() && ras.Type != 2) {
-        //         qDebug() << "This RAS file is not valid, or an older version of the format.";
+    if (ras.ColorMapLength > kMaxQVectorSize) {
+        qWarning() << "LoadRAS() unsupported image color map length in file header" << ras.ColorMapLength;
         return false;
     }
 
@@ -314,9 +406,65 @@ bool RASHandler::read(QImage *outImage)
     return true;
 }
 
+bool RASHandler::supportsOption(ImageOption option) const
+{
+    if (option == QImageIOHandler::Size) {
+        return true;
+    }
+    if (option == QImageIOHandler::ImageFormat) {
+        return true;
+    }
+    return false;
+}
+
+QVariant RASHandler::option(ImageOption option) const
+{
+    QVariant v;
+
+    if (option == QImageIOHandler::Size) {
+        if (auto d = device()) {
+            // transactions works on both random and sequential devices
+            d->startTransaction();
+            auto ba = d->read(RasHeader::SIZE);
+            d->rollbackTransaction();
+
+            QDataStream s(ba);
+            s.setByteOrder(QDataStream::BigEndian);
+
+            RasHeader header;
+            s >> header;
+
+            if (s.status() == QDataStream::Ok && IsSupported(header)) {
+                v = QVariant::fromValue(QSize(header.Width, header.Height));
+            }
+        }
+    }
+
+    if (option == QImageIOHandler::ImageFormat) {
+        if (auto d = device()) {
+            // transactions works on both random and sequential devices
+            d->startTransaction();
+            auto ba = d->read(RasHeader::SIZE);
+            d->rollbackTransaction();
+
+            QDataStream s(ba);
+            s.setByteOrder(QDataStream::BigEndian);
+
+            RasHeader header;
+            s >> header;
+
+            if (s.status() == QDataStream::Ok && IsSupported(header)) {
+                v = QVariant::fromValue(imageFormat(header));
+            }
+        }
+    }
+
+    return v;
+}
+
 QImageIOPlugin::Capabilities RASPlugin::capabilities(QIODevice *device, const QByteArray &format) const
 {
-    if (format == "ras") {
+    if (format == "im1" || format == "im8" || format == "im24" || format == "im32" || format == "ras" || format == "sun") {
         return Capabilities(CanRead);
     }
     if (!format.isEmpty()) {

src/imageformats/ras.desktop

@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Service
-X-KDE-ServiceTypes=QImageIOPlugins
-X-KDE-ImageFormat=ras
-X-KDE-MimeType=image/x-sun-raster
-X-KDE-Read=true
-X-KDE-Write=false

src/imageformats/ras.json

@@ -1,4 +1,4 @@
 {
-    "Keys": [ "ras" ],
-    "MimeTypes": [ "image/x-sun-raster" ]
+    "Keys": [ "im1", "im8", "im24", "im32", "ras", "sun" ],
+    "MimeTypes": [ "image/x-sun-raster", "image/x-sun-raster", "image/x-sun-raster", "image/x-sun-raster", "image/x-sun-raster", "image/x-sun-raster" ]
 }

src/imageformats/ras_p.h

@@ -19,6 +19,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/raw.cpp

@@ -14,6 +14,7 @@
 #include <QDebug>
 #include <QImage>
 #include <QSet>
+#include <QTimeZone>
 
 #if defined(Q_OS_WINDOWS) && !defined(NOMINMAX)
 #define NOMINMAX
@@ -222,7 +223,7 @@ QString createTag(char *asciiz, const char *tag)
 
 QString createTimeTag(time_t time, const char *tag)
 {
-    auto value = QDateTime::fromSecsSinceEpoch(time, Qt::UTC);
+    auto value = QDateTime::fromSecsSinceEpoch(time, QTimeZone::utc());
     if (value.isValid() && time > 0) {
         return createTag(value.toString(Qt::ISODate), tag);
     }
@@ -417,7 +418,7 @@ inline void rgbToRgbX(uchar *target, const uchar *source, qint32 targetSize, qin
 #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 C_FLAGS(a) (((a) & 0x1) << 31) // flags mode
 
 #define T_IQ(a) (((a) >> 4) & 0xF)
 #define T_OC(a) (((a) >> 8) & 0xF)
@@ -429,10 +430,10 @@ inline void rgbToRgbX(uchar *target, const uchar *source, qint32 targetSize, qin
 #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)
+#define T_FLAGS(a) (((a) >> 31) & 0x1)
 // clang-format on
 
-#define DEFAULT_QUALITY (C_IQ(3) | C_OC(1) | C_CW(1) | C_AW(1) | C_BT(1) | C_HS(0))
+#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)
 {
@@ -460,47 +461,45 @@ void setParams(QImageIOHandler *handler, LibRaw *rawProcessor)
     if (handler->supportsOption(QImageIOHandler::Quality)) {
         quality = handler->option(QImageIOHandler::Quality).toInt();
     }
-    if (quality < 0) {
+    if (quality > -1) {
+        switch (quality / 10) {
+        case 0:
+            quality = C_IQ(0) | C_OC(1) | C_CW(1) | C_AW(1) | C_BT(0) | C_HS(1);
+            break;
+        case 1:
+            quality = C_IQ(0) | C_OC(1) | C_CW(1) | C_AW(1) | C_BT(0) | C_HS(0);
+            break;
+        case 2:
+            quality = C_IQ(3) | 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(1) | C_HS(0);
+            break;
+        case 4:
+            quality = C_IQ(3) | C_OC(2) | C_CW(1) | C_AW(1) | C_BT(1) | C_HS(0);
+            break;
+        case 5:
+            quality = C_IQ(3) | C_OC(4) | C_CW(1) | C_AW(1) | C_BT(1) | C_HS(0);
+            break;
+        case 6:
+            quality = C_IQ(11) | C_OC(1) | C_CW(1) | C_AW(1) | C_BT(0) | C_HS(0);
+            break;
+        case 7:
+            quality = C_IQ(11) | C_OC(1) | C_CW(1) | C_AW(1) | C_BT(1) | C_HS(0);
+            break;
+        case 8:
+            quality = C_IQ(11) | C_OC(2) | C_CW(1) | C_AW(1) | C_BT(1) | C_HS(0);
+            break;
+        default:
+            quality = C_IQ(11) | C_OC(4) | C_CW(1) | C_AW(1) | C_BT(1) | C_HS(0);
+            break;
+        }
+        quality |= C_FLAGS(1);
+    }
+    if (quality == -1) {
         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;
-    }
+    Q_ASSERT(T_FLAGS(quality));
 
     auto &&params = rawProcessor->imgdata.params;
 

src/imageformats/raw.desktop

@@ -1,7 +0,0 @@
-[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_p.h

@@ -40,30 +40,13 @@ private:
      * Change the quality of the conversion. If -1, default quality is used.
      * @note Verify that the quality change support has been compiled with supportsOption()
      *
+     * When the quality value is negative (but not -1), we assume we want to work with flags according to the following scheme:
      *   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
+     * 1 _ _ _ _ _ _ _ _ _ _ S F NN E H B A W CCCC IIII ____
      *
      * 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
+     * _: reserved (should be zero)
      * 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)
@@ -74,8 +57,21 @@ private:
      * 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.
+     *
+     * When quality is a positive value, a value between 0 and 100 is expected. The values are interpreted as follows:
+     * - 00-09: I =  0, C = 1, B = 0, W = 1, A = 1, H = 1 (Linear, sRGB, 8-bits, Camera White, Auto White, Half-size)
+     * - 10-19: I =  0, C = 1, B = 0, W = 1, A = 1, H = 0 (Linear, sRGB, 8-bits, Camera White, Auto White)
+     * - 20-29: I =  3, C = 1, B = 0, W = 1, A = 1, H = 0 (AHD, sRGB, 8-bits, Camera White, Auto White)
+     * - 30-39: I =  3, C = 1, B = 1, W = 1, A = 1, H = 0 (AHD, sRGB, 16-bits, Camera White, Auto White) [Default]
+     * - 40-49: I =  3, C = 2, B = 1, W = 1, A = 1, H = 0 (AHD, Adobe, 16-bits, Camera White, Auto White)
+     * - 50-59: I =  3, C = 4, B = 1, W = 1, A = 1, H = 0 (AHD, ProPhoto, 16-bits, Camera White, Auto White)
+     * - 60-69: I = 11, C = 1, B = 0, W = 1, A = 1, H = 0 (DHT, sRGB, 8-bits, Camera White, Auto White)
+     * - 70-79: I = 11, C = 1, B = 1, W = 1, A = 1, H = 0 (DHT, sRGB, 16-bits, Camera White, Auto White)
+     * - 80-89: I = 11, C = 2, B = 1, W = 1, A = 1, H = 0 (DHT, Adobe, 16-bits, Camera White, Auto White)
+     * - >= 90: I = 11, C = 4, B = 1, W = 1, A = 1, H = 0 (DHT, ProPhoto, 16-bits, Camera White, Auto White)
+     *
+     * When the quality is -1, default quality is used.
      */
     qint32 m_quality;
 

src/imageformats/rgb.cpp

@@ -22,13 +22,13 @@
 #include "rgb_p.h"
 #include "util_p.h"
 
+#include <QList>
 #include <QMap>
-#include <QVector>
 
 #include <QDebug>
 #include <QImage>
 
-class RLEData : public QVector<uchar>
+class RLEData : public QList<uchar>
 {
 public:
     RLEData()
@@ -61,7 +61,7 @@ public:
     {
     }
     uint insert(const uchar *d, uint l);
-    QVector<const RLEData *> vector();
+    QList<const RLEData *> vector();
     void setBaseOffset(uint o)
     {
         _offset = o;
@@ -107,7 +107,7 @@ private:
     QByteArray _data;
     QByteArray::Iterator _pos;
     RLEMap _rlemap;
-    QVector<const RLEData *> _rlevector;
+    QList<const RLEData *> _rlevector;
     uint _numrows;
 
     bool readData(QImage &);
@@ -421,9 +421,9 @@ uint RLEMap::insert(const uchar *d, uint l)
     return QMap<RLEData, uint>::insert(data, _counter++).value();
 }
 
-QVector<const RLEData *> RLEMap::vector()
+QList<const RLEData *> RLEMap::vector()
 {
-    QVector<const RLEData *> v(size());
+    QList<const RLEData *> v(size());
     for (Iterator it = begin(); it != end(); ++it) {
         v.replace(it.value(), &it.key());
     }

src/imageformats/rgb.desktop

@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Service
-X-KDE-ServiceTypes=QImageIOPlugins
-X-KDE-ImageFormat=rgb,rgba,bw,sgi
-X-KDE-MimeType=image/x-rgb
-X-KDE-Read=true
-X-KDE-Write=true

src/imageformats/scanlineconverter.cpp

@@ -15,13 +15,15 @@ ScanLineConverter::ScanLineConverter(const QImage::Format &targetFormat)
 ScanLineConverter::ScanLineConverter(const ScanLineConverter &other)
     : _targetFormat(other._targetFormat)
     , _colorSpace(other._colorSpace)
+    , _defaultColorSpace(other._defaultColorSpace)
 {
 }
 
 ScanLineConverter &ScanLineConverter::operator=(const ScanLineConverter &other)
 {
-    this->_targetFormat = other._targetFormat;
-    this->_colorSpace = other._colorSpace;
+    _targetFormat = other._targetFormat;
+    _colorSpace = other._colorSpace;
+    _defaultColorSpace = other._defaultColorSpace;
     return (*this);
 }
 
@@ -40,24 +42,51 @@ QColorSpace ScanLineConverter::targetColorSpace() const
     return _colorSpace;
 }
 
+void ScanLineConverter::setDefaultSourceColorSpace(const QColorSpace &colorSpace)
+{
+    _defaultColorSpace = colorSpace;
+}
+
+QColorSpace ScanLineConverter::defaultSourceColorSpace() const
+{
+    return _defaultColorSpace;
+}
+
 const uchar *ScanLineConverter::convertedScanLine(const QImage &image, qint32 y)
 {
-    auto colorSpaceConversion = isColorSpaceConversionNeeded(image, _colorSpace);
+    auto colorSpaceConversion = isColorSpaceConversionNeeded(image);
     if (image.format() == _targetFormat && !colorSpaceConversion) {
         return image.constScanLine(y);
     }
     if (image.width() != _tmpBuffer.width() || image.format() != _tmpBuffer.format()) {
         _tmpBuffer = QImage(image.width(), 1, image.format());
+        _tmpBuffer.setColorTable(image.colorTable());
     }
     if (_tmpBuffer.isNull()) {
         return nullptr;
     }
     std::memcpy(_tmpBuffer.bits(), image.constScanLine(y), std::min(_tmpBuffer.bytesPerLine(), image.bytesPerLine()));
+    auto tmp = _tmpBuffer;
     if (colorSpaceConversion) {
-        _tmpBuffer.setColorSpace(image.colorSpace());
-        _tmpBuffer.convertToColorSpace(_colorSpace);
+        auto cs = image.colorSpace();
+        if (!cs.isValid()) {
+            cs = _defaultColorSpace;
+        }
+        if (tmp.depth() < 24) {
+            tmp.convertTo(tmp.hasAlphaChannel() ? QImage::Format_ARGB32 : QImage::Format_RGB32);
+        }
+        tmp.setColorSpace(cs);
+        tmp.convertToColorSpace(_colorSpace);
     }
-    _convBuffer = _tmpBuffer.convertToFormat(_targetFormat);
+
+    /*
+     * Work Around for wrong RGBA64 -> 16FPx4/32FPx4 conversion on Intel architecture.
+     * Luckily convertTo() works fine with 16FPx4 images so I can use it instead convertToFormat().
+     * See also: https://bugreports.qt.io/browse/QTBUG-120614
+     */
+    tmp.convertTo(_targetFormat);
+    _convBuffer = tmp;
+
     if (_convBuffer.isNull()) {
         return nullptr;
     }
@@ -72,12 +101,12 @@ qsizetype ScanLineConverter::bytesPerLine() const
     return _convBuffer.bytesPerLine();
 }
 
-bool ScanLineConverter::isColorSpaceConversionNeeded(const QImage &image, const QColorSpace &targetColorSpace) const
+bool ScanLineConverter::isColorSpaceConversionNeeded(const QImage &image, const QColorSpace &targetColorSpace, const QColorSpace &defaultColorSpace)
 {
-    if (image.depth() < 24) { // RGB 8 bit or grater only
-        return false;
-    }
     auto sourceColorSpace = image.colorSpace();
+    if (!sourceColorSpace.isValid()) {
+        sourceColorSpace = defaultColorSpace;
+    }
     if (!sourceColorSpace.isValid() || !targetColorSpace.isValid()) {
         return false;
     }

src/imageformats/scanlineconverter_p.h

@@ -42,6 +42,14 @@ public:
     void setTargetColorSpace(const QColorSpace &colorSpace);
     QColorSpace targetColorSpace() const;
 
+    /*!
+     * \brief setDefaultSourceColorSpace
+     * Set the source color space to use when the image does not have a color space.
+     * \param colorSpace
+     */
+    void setDefaultSourceColorSpace(const QColorSpace &colorSpace);
+    QColorSpace defaultSourceColorSpace() const;
+
     /*!
      * \brief convertedScanLine
      * Convert the scanline \a y.
@@ -62,14 +70,24 @@ public:
      * \note Only 24 bit or grater images.
      * \param image The source image.
      * \param targetColorSpace The target color space.
+     * \param defaultColorSpace The default color space to use it image does not contains one.
      * \return True if the conversion should be done otherwise false.
      */
-    bool isColorSpaceConversionNeeded(const QImage &image, const QColorSpace &targetColorSpace) const;
+    static bool isColorSpaceConversionNeeded(const QImage &image, const QColorSpace &targetColorSpace, const QColorSpace &defaultColorSpace = QColorSpace());
+
+    /*!
+     * \brief isColorSpaceConversionNeeded
+     */
+    inline bool isColorSpaceConversionNeeded(const QImage &image) const
+    {
+        return isColorSpaceConversionNeeded(image, _colorSpace, _defaultColorSpace);
+    }
 
 private:
     // data
     QImage::Format _targetFormat;
     QColorSpace _colorSpace;
+    QColorSpace _defaultColorSpace;
 
     // internal buffers
     QImage _tmpBuffer;

src/imageformats/tga.desktop

@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Service
-X-KDE-ServiceTypes=QImageIOPlugins
-X-KDE-ImageFormat=tga
-X-KDE-MimeType=image/x-tga
-X-KDE-Read=true
-X-KDE-Write=true

src/imageformats/util_p.h

@@ -11,12 +11,9 @@
 #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
+// 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;
 
 // On Qt 6 to make the plugins fail to allocate if the image size is greater than QImageReader::allocationLimit()
@@ -24,13 +21,9 @@ static constexpr int kMaxQVectorSize = std::numeric_limits<int>::max() - 32;
 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;
 }
 

src/imageformats/xcf.cpp

@@ -14,18 +14,12 @@
 #include <QIODevice>
 #include <QImage>
 #include <QImageReader>
+#include <QList>
 #include <QLoggingCategory>
 #include <QPainter>
 #include <QStack>
-#include <QVector>
 #include <QtEndian>
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-// To test the plugin with OSS FUZZ (in 2023) you need to make it compatible with Qt 5.
-// The plugin has been made compatible with all Qt (5 and 6) versions supported by the KDE project.
-#define XCF_QT5_SUPPORT
-#endif
-
 #ifndef XCF_QT5_SUPPORT
 // Float images are not supported by Qt 5 and can be disabled in QT 6 to reduce memory usage.
 // Unfortunately enabling/disabling this define results in slightly different images, so leave the default if possible.
@@ -116,7 +110,7 @@ struct RandomTable {
  * parallel processing on a tile-by-tile basis. Here, though,
  * we just read them in en-masse and store them in a matrix.
  */
-typedef QVector<QVector<QImage>> Tiles;
+typedef QList<QList<QImage>> Tiles;
 
 class XCFImageFormat
 {
@@ -498,7 +492,7 @@ public:
         qint32 tattoo; //!< (unique identifier?)
         quint32 unit; //!< Units of The GIMP (inch, mm, pica, etc...)
         qint32 num_colors = 0; //!< number of colors in an indexed image
-        QVector<QRgb> palette; //!< indexed image color palette
+        QList<QRgb> palette; //!< indexed image color palette
 
         int num_layers; //!< number of layers
         Layer layer; //!< most recently read layer
@@ -551,7 +545,7 @@ private:
     //! This table is used as a shared grayscale ramp to be set on grayscale
     //! images. This is because Qt does not differentiate between indexed and
     //! grayscale images.
-    static QVector<QRgb> grayTable;
+    static QList<QRgb> grayTable;
 
     //! This table provides the add_pixel saturation values (i.e. 250 + 250 = 255).
     // static int add_lut[256][256]; - this is so lame waste of 256k of memory
@@ -652,7 +646,7 @@ bool XCFImageFormat::random_table_initialized;
 
 constexpr RandomTable XCFImageFormat::randomTable;
 
-QVector<QRgb> XCFImageFormat::grayTable;
+QList<QRgb> XCFImageFormat::grayTable;
 
 bool XCFImageFormat::modeAffectsSourceAlpha(const quint32 type)
 {
@@ -966,7 +960,11 @@ bool XCFImageFormat::loadImageProperties(QDataStream &xcf_io, XCFImage &xcf_imag
         case PROP_PARASITES:
             while (!property.atEnd()) {
                 char *tag;
+#if QT_VERSION < QT_VERSION_CHECK(6, 7, 0)
                 quint32 size;
+#else
+                qsizetype size;
+#endif
 
                 property.readBytes(tag, size);
 
@@ -999,7 +997,7 @@ bool XCFImageFormat::loadImageProperties(QDataStream &xcf_io, XCFImage &xcf_imag
                 return false;
             }
 
-            xcf_image.palette = QVector<QRgb>();
+            xcf_image.palette = QList<QRgb>();
             xcf_image.palette.reserve(xcf_image.num_colors);
 
             for (int i = 0; i < xcf_image.num_colors; i++) {
@@ -2019,7 +2017,7 @@ bool XCFImageFormat::loadLevel(QDataStream &xcf_io, Layer &layer, qint32 bpp, co
 
     const uint blockSize = TILE_WIDTH * TILE_HEIGHT * bpp * 1.5;
 
-    QVector<uchar> buffer;
+    QList<uchar> buffer;
     if (needConvert) {
         buffer.resize(blockSize * (bpp == 2 ? 2 : 1));
     }

src/imageformats/xcf.desktop

@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Service
-X-KDE-ServiceTypes=QImageIOPlugins
-X-KDE-ImageFormat=xcf
-X-KDE-MimeType=image/x-xcf
-X-KDE-Read=true
-X-KDE-Write=false

tests/CMakeLists.txt

@@ -5,7 +5,7 @@ include(ECMMarkAsTest)
 macro(kimageformats_executable_tests)
     foreach(_testname ${ARGN})
         add_executable(${_testname} ${_testname}.cpp)
-        target_link_libraries(${_testname} Qt${QT_MAJOR_VERSION}::Gui)
+        target_link_libraries(${_testname} Qt6::Gui)
         ecm_mark_as_test(${_testname})
     endforeach(_testname)
 endmacro()