Update dependency version to 6.10.0

With Qt 6.8.x, PQ and HLG transfer functions are supported.
Better support for GRAY profiles

.gitattributes

@@ -11,3 +11,5 @@ autotests/read/hdr/fake_earth.hdr binary
 autotests/read/hdr/rgb.hdr binary
 autotests/read/hdr/rgb-landscape.hdr binary
 autotests/read/hdr/rgb-portrait.hdr binary
+autotests/read/pfm/testcard_gray_half.phm binary
+autotests/read/pfm/testcard_rgb_half.phm binary

.gitlab-ci.yml

@@ -5,6 +5,7 @@ include:
   - project: sysadmin/ci-utilities
     file:
       - /gitlab-templates/linux-qt6.yml
+      - /gitlab-templates/alpine-qt6.yml
       - /gitlab-templates/android-qt6.yml
       - /gitlab-templates/freebsd-qt6.yml
       - /gitlab-templates/windows-qt6.yml

.kde-ci.yml

@@ -7,4 +7,4 @@ Dependencies:
 Options:
   test-before-installing: True
   require-passing-tests-on: [ 'Linux', 'FreeBSD', 'Windows' ]
-  cmake-options: "-DKIMAGEFORMATS_JXR=ON"
+  cmake-options: "-DKIMAGEFORMATS_DDS=ON -DKIMAGEFORMATS_JXR=ON"

CMakeLists.txt

@@ -1,11 +1,11 @@
 cmake_minimum_required(VERSION 3.16)
 
-set(KF_VERSION "6.8.0") # handled by release scripts
-set(KF_DEP_VERSION "6.8.0") # handled by release scripts
+set(KF_VERSION "6.10.0") # handled by release scripts
+set(KF_DEP_VERSION "6.10.0") # handled by release scripts
 project(KImageFormats VERSION ${KF_VERSION})
 
 include(FeatureSummary)
-find_package(ECM 6.8.0  NO_MODULE)
+find_package(ECM 6.10.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)
 
@@ -21,7 +21,7 @@ include(ECMDeprecationSettings)
 include(CheckIncludeFiles)
 include(FindPkgConfig)
 
-set(REQUIRED_QT_VERSION 6.5.0)
+set(REQUIRED_QT_VERSION 6.6.0)
 find_package(Qt6Gui ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
 
 find_package(KF6Archive ${KF_DEP_VERSION})
@@ -62,6 +62,8 @@ set_package_properties(libavif PROPERTIES
     PURPOSE "Required for the QImage plugin for AVIF images"
 )
 
+option(KIMAGEFORMATS_DDS "Enable plugin for DDS format" ON)
+
 option(KIMAGEFORMATS_HEIF "Enable plugin for HEIF format" OFF)
 if(KIMAGEFORMATS_HEIF)
     pkg_check_modules(LibHeif IMPORTED_TARGET libheif>=1.10.0)
@@ -72,6 +74,7 @@ option(KIMAGEFORMATS_JXL "Enable plugin for JPEG XL format" ON)
 if(KIMAGEFORMATS_JXL)
     pkg_check_modules(LibJXL IMPORTED_TARGET libjxl>=0.7.0)
     pkg_check_modules(LibJXLThreads IMPORTED_TARGET libjxl_threads>=0.7.0)
+    pkg_check_modules(LibJXLCMS IMPORTED_TARGET libjxl_cms>=0.9.0)
 endif()
 add_feature_info(LibJXL LibJXL_FOUND "required for the QImage plugin for JPEG XL images")
 
@@ -81,6 +84,7 @@ set_package_properties(LibRaw PROPERTIES
     PURPOSE "Required for the QImage plugin for RAW images"
 )
 
+# JXR plugin disabled by default due to security issues
 option(KIMAGEFORMATS_JXR "Enable plugin for JPEG XR format" OFF)
 if(KIMAGEFORMATS_JXR)
     find_package(LibJXR)
@@ -88,8 +92,8 @@ endif()
 add_feature_info(LibJXR LibJXR_FOUND "required for the QImage plugin for JPEG XR images")
 
 ecm_set_disabled_deprecation_versions(
-    QT 6.5
-    KF 5.102
+    QT 6.8.0
+    KF 6.8.0
 )
 
 add_subdirectory(src)

README.md

@@ -1,6 +1,7 @@
 # KImageFormats
 
-Plugins to allow `QImage` to support extra file formats.
+Plugins to allow [`QImage`](https://doc.qt.io/qt-6/qimage.html) to support
+extra file formats.
 
 ## Introduction
 
@@ -19,14 +20,16 @@ The following image formats have read-only support:
 - Krita (kra)
 - OpenRaster (ora)
 - Pixar raster (pxr)
-- Portable FloatMap (pfm)
+- Portable FloatMap/HalfMap (pfm, phm)
 - Photoshop documents (psd, psb, pdd, psdt)
 - Radiance HDR (hdr)
+- Scitex CT (sct)
 - Sun Raster (im1, im8, im24, im32, ras, sun)
 
 The following image formats have read and write support:
 
 - AV1 Image File Format (avif)
+- DirectDraw Surface (dds)
 - Encapsulated PostScript (eps)
 - High Efficiency Image File Format (heif)
 - JPEG XL (jxl)
@@ -40,16 +43,22 @@ The following image formats have read and write support:
 
 ## Contributing
 
-See the [`QImageIOPlugin`](https://doc.qt.io/qt-6/qimageioplugin.html) documentation for information on how to write a
-new plugin.
+See the [`QImageIOPlugin`](https://doc.qt.io/qt-6/qimageioplugin.html)
+documentation for information on how to write a new plugin.
 
-The main difference between this framework and the qimageformats module
-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.
+The main difference between this framework and the image formats of Qt is
+the license. As such, if you write an image format 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.
+
+To be accepted, contributions must:
+- Contain the test images needed to verify that the changes work correctly
+- Pass the tests successfully
 
 ## Duplicated Plugins
 
+### The TGA plugin
+
 The TGA plugin supports more formats than Qt's own TGA plugin;
 specifically, the one provided here supports indexed, greyscale and RLE
 images (types 1-3 and 9-11), while Qt's plugin only supports type 2
@@ -60,6 +69,12 @@ licensing.  If anyone were willing to write fresh code to improve Qt's
 TGA plugin, it would allow the TGA plugin in this framework to be
 removed.
 
+### The DDS plugin
+
+The DDS plugin is a fork from Qt 5.6 with bug fixes and improvements.
+
+The plugin was forked because Qt Project no longer supports its DDS plugin.
+
 ## License
 
 This framework is licensed under the
@@ -70,22 +85,23 @@ The CMake code in this framework is licensed under the
 
 ## Plugin status
 
-The current implementation of a plugin may not be complete or may have limitations
-of various kinds. Typically the limitations are on maximum size and color depth.
+The current implementation of a plugin may not be complete or may have
+limitations of various kinds. Typically the limitations are on maximum size
+and color depth.
 
-The various plugins are also limited by the formats natively supported by Qt. 
+The various plugins are also limited by the formats natively supported by Qt.
 For example, native support for CMYK images is only available since Qt 6.8.
 
 ### HDR images
 
-HDR images are supported via floating point image formats from EXR, HDR, JXL,
-JXR, PFM and PSD plugins.
-It is important to note that in the past these plugins stripped away HDR 
+HDR images are supported via floating point image formats from DDS, EXR, HDR,
+JXL, JXR, PFM and PSD plugins.
+It is important to note that in the past these plugins stripped away HDR
 information, returning SDR images.
 
 HDR images return R, G and B values ​​outside the range 0.0 - 1.0.
-While Qt painters handles HDR data correctly, some older programs may display 
-strange artifacts if they do not use a tone mapping operator (or at least a 
+While Qt painters handles HDR data correctly, some older programs may display
+strange artifacts if they do not use a tone mapping operator (or at least a
 clamp). This is not a plugin issue.
 
 ### Metadata
@@ -113,11 +129,15 @@ plugin ('n/a' means no limit, i.e. the limit depends on the format encoding).
 
 - ANI: n/a
 - AVIF: 32,768 x 32,768 pixels, in any case no larger than 256 megapixels
+- DDS: n/a
 - EXR: 300,000 x 300,000 pixels
+- EPS: n/a
 - HDR: n/a (large image)
 - HEIF: n/a
 - JXL: 262,144 x 262,144 pixels, in any case no larger than 256 megapixels
 - JXR: n/a, in any case no larger than 4 GB
+- KRA: same size as Qt's PNG plugin
+- ORA: same size as Qt's PNG plugin
 - PCX: 65,535 x 65,535 pixels
 - PFM: n/a (large image)
 - PIC: 65,535 x 65,535 pixels
@@ -127,6 +147,7 @@ plugin ('n/a' means no limit, i.e. the limit depends on the format encoding).
 - RAS: n/a (large image)
 - RAW: n/a (depends on the RAW format loaded)
 - RGB: 65,535 x 65,535 pixels
+- SCT: 300,000 x 300,000 pixels
 - TGA: 65,535 x 65,535 pixels
 - XCF: 300,000 x 300,000 pixels
 
@@ -157,13 +178,26 @@ been used or the maximum size of the image that can be saved has been limited.
 PSD plugin loads CMYK, Lab and Multichannel images and converts them to RGB 
 without using the ICC profile.
 
-JXR and PSD plugins natively support 4-channel CMYK images when compiled 
+JXR, PSD and SCT plugins natively support 4-channel CMYK images when compiled 
 with Qt 6.8+.
 
+### The DDS plugin
+
+**This plugin can be disabled by setting `KIMAGEFORMATS_DDS` to `OFF` 
+in your cmake options.**
+
+The following defines can be defined in cmake to modify the behavior of the plugin:
+- `DDS_DISABLE_STRIDE_ALIGNMENT`: disable the stride aligment based on DDS pitch: it is known that some writers do not set it correctly.
+
 ### The HEIF plugin
 
-**This plugin is disabled by default. It can be enabled with the 
-`KIMAGEFORMATS_HEIF` build option in the cmake file.**
+**This plugin is disabled by default. It can be enabled by settings
+`KIMAGEFORMATS_HEIF` to `ON` in your cmake options.**
+
+The plugin is disabled due to issues with the heif library on certain
+distributions. In particular, it is necessary that the HEIF library has
+support for HEVC codec. If HEVC codec is not available the plugin
+will compile but will fail the tests.
 
 ### The EXR plugin
 
@@ -171,6 +205,14 @@ The following defines can be defined in cmake to modify the behavior of the plug
 - `EXR_CONVERT_TO_SRGB`: the linear data is converted to sRGB on read to accommodate programs that do not support color profiles.
 - `EXR_DISABLE_XMP_ATTRIBUTE`: disables the stores XMP values in a non-standard attribute named "xmp". Note that Gimp reads the "xmp" attribute and Darktable writes it as well.
 
+### The EPS plugin
+
+The plugin uses `Ghostscript` to convert the raster image. When reading it
+converts the EPS to PPM and uses the Qt PPM plugin to read the image.
+When writing it uses [`QPrinter`](https://doc.qt.io/qt-6/qprinter.html) to
+create a temporary PDF file which is then converted to EPS. Therefore, if
+`Ghostscript` is not installed, the plugin will not work.
+
 ### The HDR plugin
 
 The following defines can be defined in cmake to modify the behavior of the plugin:
@@ -187,8 +229,8 @@ The following defines can be defined in cmake to modify the behavior of the plug
 
 ### The JXR plugin
 
-**This plugin is disabled by default. It can be enabled with the 
-`KIMAGEFORMATS_JXR` build option in the cmake file.**
+**This plugin is disabled by default. It can be enabled by settings
+`KIMAGEFORMATS_JXR` to `ON` in your cmake options.**
 
 The following defines can be defined in cmake to modify the behavior of the plugin:
 - `JXR_DENY_FLOAT_IMAGE`: disables the use of float images and consequently any HDR data will be lost.
@@ -196,11 +238,24 @@ The following defines can be defined in cmake to modify the behavior of the plug
 - `JXR_DISABLE_BGRA_HACK`: Windows displays and opens JXR files correctly out of the box. Unfortunately it doesn't seem to open (P)RGBA @32bpp files as it only wants (P)BGRA32bpp files (a format not supported by Qt). Only for this format an hack is activated to guarantee total compatibility of the plugin with Windows.
 - `JXR_ENABLE_ADVANCED_METADATA`: enable metadata support (e.g. XMP). Some distributions use an incomplete JXR library that does not allow reading metadata, causing compilation errors.
 
+### The KRA plugin
+
+The KRA format is a ZIP archive containing image data. In particular, the
+rendered image in PNG format is saved in the root: the plugin reads this 
+image.
+
+### The ORA plugin
+
+The ORA format is a ZIP archive containing image data. In particular, the
+rendered image in PNG format is saved in the root: the plugin reads this 
+image.
+
 ### The PSD plugin
 
 PSD support has the following limitations:
 - Only images saved by Photoshop using compatibility mode enabled (Photoshop default) can be decoded.
-- Multichannel images are treated as CMY/CMYK and are only loaded if they have 3 or more channels.
+- Multichannel images are treated as CMYK if they have 2 or more channels.
+- Multichannel images are treated as Grayscale if they have 1 channel.
 - Duotone images are treated as grayscale images.
 - Extra channels other than alpha are discarded.
 

autotests/CMakeLists.txt

@@ -72,9 +72,15 @@ kimageformats_read_tests(
     qoi
     ras
     rgb
+    sct
     tga
 )
 
+if(KIMAGEFORMATS_DDS)
+    kimageformats_read_tests(dds)
+    kimageformats_write_tests(dds-nodatacheck-lossless)
+endif()
+
 if (KF6Archive_FOUND)
     kimageformats_read_tests(
         kra
@@ -105,6 +111,12 @@ if (LibHeif_FOUND)
             hej2
         )
     endif()
+
+    if (LibHeif_VERSION VERSION_GREATER_EQUAL "1.19.0")
+        kimageformats_read_tests(FUZZ 4
+            avci
+        )
+    endif()
 endif()
 
 if (LibJXL_FOUND AND LibJXLThreads_FOUND)

autotests/read/dds/earth-cubemap.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Copyright (c) 2006 - 2010 The Open Toolkit library.
+SPDX-License-Identifier: MIT

autotests/read/pfm/comment_gray_half.phm.json

@@ -0,0 +1,5 @@
+[
+    {
+        "fileName" : "testcard_gray_half.png"
+    }
+]

autotests/read/sct/cmyk.sct.json

@@ -0,0 +1,11 @@
+[
+    {
+        "minQtVersion" : "6.8.0",
+        "fileName" : "cmyk.tif"
+    },
+    {
+        "maxQtVersion" : "6.7.99",
+        "unsupportedFormat" : true,
+        "comment" : "Qt versions lower than 6.8 do not support CMYK format so this test should be skipped."
+    }
+]

autotests/readtest.cpp

@@ -263,7 +263,7 @@ int main(int argc, char **argv)
         }
         for (const QFileInfo &fi : lstImgDir) {
             TemplateImage timg(fi);
-            if (timg.isTemplate()) {
+            if (timg.isTemplate() || timg.isLicense()) {
                 continue;
             }
 
@@ -375,6 +375,66 @@ int main(int argc, char **argv)
         }
     }
 
+    // NULL device test
+    for (const QFileInfo &fi : lstImgDir) {
+        TemplateImage timg(fi);
+        if (timg.isTemplate() || timg.isLicense()) {
+            continue;
+        }
+
+        QTextStream(stdout) << "* Run on NULL device\n";
+        QImageReader reader;
+        reader.setFormat(fi.suffix().toLatin1());
+        if (reader.canRead() == true) {
+            QTextStream(stdout) << "FAIL : " << fi.suffix() << ": canRead() returns true\n";
+            ++failed;
+            break;
+        }
+
+        if (!reader.read().isNull()) {
+            QTextStream(stdout) << "FAIL : " << fi.suffix() << ": read() returns a non-NULL image\n";
+            ++failed;
+            break;
+        }
+
+        if (reader.size() != QSize()) {
+            QTextStream(stdout) << "FAIL : " << fi.suffix() << ": size() returns a valid size\n";
+            ++failed;
+            break;
+        }
+
+        if (reader.imageFormat() != QImage::Format_Invalid) {
+            QTextStream(stdout) << "FAIL : " << fi.suffix() << ": size() returns a valid format\n";
+            ++failed;
+            break;
+        }
+
+        // test for crash only
+        reader.textKeys();
+        reader.quality();
+        reader.clipRect();
+        reader.scaledSize();
+        reader.scaledClipRect();
+        reader.backgroundColor();
+        reader.supportsAnimation();
+        reader.transformation();
+        reader.autoTransform();
+        reader.subType();
+        reader.supportedSubTypes();
+        reader.jumpToNextImage();
+        reader.loopCount();
+        reader.imageCount();
+        reader.currentImageNumber();
+        reader.currentImageRect();
+
+        // success
+        QTextStream(stdout) << "PASS : " << fi.suffix() << "\n";
+        ++passed;
+
+        // runs once for each format
+        break;
+    }
+
     QTextStream(stdout) << "Totals: " << passed << " passed, " << skipped << " skipped, " << failed << " failed\n";
     QTextStream(stdout) << "********* "
                         << "Finished basic read tests for " << suffix << " images *********\n";

autotests/templateimage.cpp

@@ -28,6 +28,11 @@ bool TemplateImage::isTemplate() const
     return false;
 }
 
+bool TemplateImage::isLicense() const
+{
+    return !m_fi.suffix().compare(QStringLiteral("license"), Qt::CaseInsensitive);
+}
+
 QFileInfo TemplateImage::compareImage(TestFlags &flags, QString& comment) const
 {
     auto fi = jsonImage(flags, comment);

autotests/templateimage.h

@@ -47,6 +47,12 @@ public:
      */
     bool isTemplate() const;
 
+    /*!
+     * \brief isLicense
+     * \return True if the file suffix is .license
+     */
+    bool isLicense() const;
+
     /*!
      * \brief compareImage
      * \param flags Flags for modifying test behavior (e.g. image format not supported by current Qt version).