QImage: use rvalue overloads more

to reuse internal buffers

.gitattributes

@@ -1,13 +1 @@
 autotests/read/raw/RAW_KODAK_C330_FORMAT_NONE_YRGB.raw binary
-autotests/read/hdr/orientation1.hdr binary
-autotests/read/hdr/orientation2.hdr binary
-autotests/read/hdr/orientation3.hdr binary
-autotests/read/hdr/orientation4.hdr binary
-autotests/read/hdr/orientation5.hdr binary
-autotests/read/hdr/orientation6.hdr binary
-autotests/read/hdr/orientation7.hdr binary
-autotests/read/hdr/orientation8.hdr binary
-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

.gitlab-ci.yml

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

.kde-ci.yml

@@ -1,5 +1,5 @@
 Dependencies:
-- 'on': ['Linux', 'FreeBSD', 'macOS', 'Windows', 'Android']
+- 'on': ['Linux', 'FreeBSD', 'macOS', 'Windows']
   'require':
     'frameworks/extra-cmake-modules': '@same'
     'frameworks/karchive' : '@same'

CMakeLists.txt

@@ -1,11 +1,9 @@
 cmake_minimum_required(VERSION 3.16)
 
-set(KF_VERSION "6.7.0") # handled by release scripts
-set(KF_DEP_VERSION "6.7.0") # handled by release scripts
-project(KImageFormats VERSION ${KF_VERSION})
+project(KImageFormats)
 
 include(FeatureSummary)
-find_package(ECM 6.7.0  NO_MODULE)
+find_package(ECM 5.240.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)
 
@@ -24,7 +22,7 @@ include(FindPkgConfig)
 set(REQUIRED_QT_VERSION 6.5.0)
 find_package(Qt6Gui ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
 
-find_package(KF6Archive ${KF_DEP_VERSION})
+find_package(KF6Archive)
 set_package_properties(KF6Archive PROPERTIES
     TYPE OPTIONAL
     PURPOSE "Required for the QImage plugin for Krita and OpenRaster images"
@@ -75,20 +73,15 @@ if(KIMAGEFORMATS_JXL)
 endif()
 add_feature_info(LibJXL LibJXL_FOUND "required for the QImage plugin for JPEG XL images")
 
+# note: module FindLibRaw missing from https://invent.kde.org/frameworks/extra-cmake-modules
 find_package(LibRaw 0.20.2)
 set_package_properties(LibRaw PROPERTIES
     TYPE OPTIONAL
     PURPOSE "Required for the QImage plugin for RAW images"
 )
 
-option(KIMAGEFORMATS_JXR "Enable plugin for JPEG XR format" OFF)
-if(KIMAGEFORMATS_JXR)
-    find_package(LibJXR)
-endif()
-add_feature_info(LibJXR LibJXR_FOUND "required for the QImage plugin for JPEG XR images")
-
 ecm_set_disabled_deprecation_versions(
-    QT 6.5
+    QT 6.4
     KF 5.102
 )
 
@@ -98,7 +91,6 @@ if (BUILD_TESTING)
     add_subdirectory(tests)
 endif()
 
-include(ECMFeatureSummary)
-ecm_feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
 kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT)

LICENSES/BSD-2-Clause.txt

@@ -1,9 +0,0 @@
-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

@@ -1,11 +0,0 @@
-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

@@ -1,6 +1,6 @@
 # KImageFormats
 
-Plugins to allow `QImage` to support extra file formats.
+Plugins to allow QImage to support extra file formats.
 
 ## Introduction
 
@@ -17,21 +17,18 @@ The following image formats have read-only support:
 - Camera RAW images (arw, cr2, cr3, dcs, dng, ...)
 - Gimp (xcf)
 - Krita (kra)
+- OpenEXR (exr)
 - OpenRaster (ora)
-- Pixar raster (pxr)
-- Portable FloatMap (pfm)
 - Photoshop documents (psd, psb, pdd, psdt)
 - Radiance HDR (hdr)
 - Sun Raster (im1, im8, im24, im32, ras, sun)
 
 The following image formats have read and write support:
 
-- AV1 Image File Format (avif)
+- AV1 Image File Format (AVIF)
 - Encapsulated PostScript (eps)
-- High Efficiency Image File Format (heif)
+- High Efficiency Image File Format (heif). Can be enabled with the KIMAGEFORMATS_HEIF build option.
 - JPEG XL (jxl)
-- JPEG XR (jxr)
-- OpenEXR (exr)
 - Personal Computer Exchange (pcx)
 - Quite OK Image format (qoi)
 - SGI images (rgb, rgba, sgi, bw)
@@ -40,7 +37,7 @@ 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
+See the QImageIOPlugin documentation for information on how to write a
 new plugin.
 
 The main difference between this framework and the qimageformats module
@@ -48,6 +45,10 @@ 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;
@@ -68,156 +69,3 @@ This framework is licensed under the
 The CMake code in this framework is licensed under the
 [BSD license](http://opensource.org/licenses/BSD-3-Clause).
 
-## 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 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, 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 
-clamp). This is not a plugin issue.
-
-### Metadata
-
-Metadata support is implemented in all formats that support it. In particular,
-in addition to the classic `"Description"`, `"Author"`, `"Copyright"`, etc... where 
-possible, XMP data is supported via the `"XML:com.adobe.xmp"` key.
-
-Please note that only the most common metadata is supported.
-
-### ICC profile support
-
-ICC support is fully implemented in all formats that support it. When saving, 
-some formats convert the image using color profiles according to
-specifications. In particular, HDR formats almost always convert to linear
-RGB.
-
-### Maximum image size
-
-Where possible, plugins support large images. By convention, many of the
-large image plugins are limited to a maximum of 300,000 x 300,000 pixels.
-Anyway, all plugins are also limited by the 
-`QImageIOReader::allocationLimit()`. Below are the maximum sizes for each
-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
-- EXR: 300,000 x 300,000 pixels
-- HDR: n/a (large image)
-- HEIF: n/a
-- JXL: 65,535 x 65,535 pixels, in any case no larger than 256 megapixels
-- JXR: n/a
-- PCX: 65,535 x 65,535 pixels
-- PFM: n/a (large image)
-- PIC: 65,535 x 65,535 pixels
-- PSD: 300,000 x 300,000 pixels
-- PXR: 65,535 x 65,535 pixels
-- QOI: 300,000 x 300,000 pixels
-- RAS: n/a (large image)
-- RAW: n/a (depends on the RAW format loaded)
-- RGB: 65,535 x 65,535 pixels
-- TGA: 65,535 x 65,535 pixels
-- XCF: 300,000 x 300,000 pixels
-
-### Sequential and random access devices
-
-All plugins work fine on random access devices while only some work on
-sequential access devices.
-Some plugins, such as PSD, allow reading RGB images on sequential access 
-devices, but cannot do the same for Lab files.
-
-**Important: some plugins use `QIODevice` transactions and/or 
-`QIODevice::ungetChar()`. Therefore, the device used to read the image must not
-have any active transactions.**
-
-### Memory usage
-
-Qt has added many image formats over time. In older plugins, to support new
-formats, `QImage` conversion functions have been used, causing memory
-consumption proportional to the size of the image to be saved.
-Normally this is not a source of problems because the affected plugins
-are limited to maximum images of 2GiB or less.
-
-On plugins for formats that support large images, progressive conversion has
-been used or the maximum size of the image that can be saved has been limited.
-
-### Non-RGB formats
-
-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 
-with Qt 6.8+.
-
-### The HEIF plugin
-
-**This plugin is disabled by default. It can be enabled with the 
-`KIMAGEFORMATS_HEIF` build option in the cmake file.**
-
-### The EXR plugin
-
-The following defines can be defined in cmake to modify the behavior of the plugin:
-- `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 HDR plugin
-
-The following defines can be defined in cmake to modify the behavior of the plugin:
-- `HDR_HALF_QUALITY`: on read, a 16-bit float image is returned instead of a 32-bit float one.
-
-### The JXL plugin
-
-**The current version of the plugin limits the image size to 256 megapixels
-according to feature level 5 of the JXL stream encoding.**
-
-### The JXR plugin
-
-**This plugin is disabled by default. It can be enabled with the 
-`KIMAGEFORMATS_JXR` build option in the cmake file.**
-
-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.
-- `JXR_DISABLE_DEPTH_CONVERSION`: remove the neeeds of additional memory by disabling the conversion between different color depths (e.g. RGBA64bpp to RGBA32bpp) at the cost of reduced compatibility.
-- `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 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.
-- Duotone images are treated as grayscale images.
-- Extra channels other than alpha are discarded.
-
-The following defines can be defined in cmake to modify the behavior of the plugin:
-- `PSD_FAST_LAB_CONVERSION`: the LAB image is converted to linear sRGB instead of sRGB which significantly increases performance.
-- `PSD_NATIVE_CMYK_SUPPORT_DISABLED`: disable native support for CMYK images when compiled with Qt 6.8+
-
-### The RAW plugin
-
-Loading RAW images always requires a conversion. To allow the user to
-choose how to convert the image, it was chosen to use the quality parameter
-to act on the converter. The quality parameter can be used with values ​​from 
-0 to 100 (0 = fast, 100 = maximum quality) or by setting flags to 
-selectively change the conversion (see also [raw_p.h](./src/imageformats/raw_p.h)).
-
-The default setting tries to balance quality and conversion speed.
-
-### The XCF plugin
-
-XCF support has the following limitations:
-- XCF format up to [version 12](https://testing.developer.gimp.org/core/standards/xcf/#version-history) (no support for GIMP 3).
-- The returned image is always 8-bit.
-- Cannot read zlib compressed files.
-- The rendered image may be slightly different (colors/transparencies) than in GIMP.

autotests/CMakeLists.txt

@@ -11,7 +11,7 @@ macro(kimageformats_read_tests)
     endif()
 
     if (NOT TARGET readtest)
-        add_executable(readtest readtest.cpp templateimage.cpp)
+        add_executable(readtest readtest.cpp)
         target_link_libraries(readtest Qt6::Gui)
         target_compile_definitions(readtest
             PRIVATE IMAGEDIR="${CMAKE_CURRENT_SOURCE_DIR}/read")
@@ -66,9 +66,7 @@ endmacro()
 kimageformats_read_tests(
     hdr
     pcx
-    pfm
     psd
-    pxr
     qoi
     ras
     rgb
@@ -99,12 +97,6 @@ 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)
@@ -116,15 +108,6 @@ if (LibJXL_FOUND AND LibJXLThreads_FOUND)
     )
 endif()
 
-if (LibJXR_FOUND)
-    kimageformats_read_tests(
-        jxr
-    )
-    kimageformats_write_tests(
-        jxr-nodatacheck
-    )
-endif()
-
 # Allow some fuzziness when reading this formats, to allow for
 # rounding errors (eg: in alpha blending).
 kimageformats_read_tests(FUZZ 1
@@ -155,11 +138,6 @@ 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)

autotests/read/hdr/orientation1.hdr.json

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

autotests/read/hdr/orientation2.hdr.json

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

autotests/read/hdr/orientation3.hdr.json

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

autotests/read/hdr/orientation4.hdr.json

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

autotests/read/hdr/orientation5.hdr.json

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

autotests/read/hdr/orientation6.hdr.json

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

autotests/read/hdr/orientation7.hdr.json

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

autotests/read/hdr/orientation8.hdr.json

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

autotests/read/jxl/orientation6_notranfs.jxl.json

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

autotests/read/jxr/testcard_cmyk8.jxr.json

@@ -1,11 +0,0 @@
-[
-    {
-        "minQtVersion" : "6.8.0",
-        "fileName" : "testcard_cmyk8.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/read/psd/cmyk16_testcard.psd.json

@@ -1,11 +0,0 @@
-[
-    {
-        "minQtVersion" : "6.8.0",
-        "fileName" : "cmyk16_testcard_qt6_8.tif"
-    },
-    {
-        "minQtVersion" : "6.0.0",
-        "maxQtVersion" : "6.7.99",
-        "fileName" : "cmyk16_testcard.png"
-    }
-]

autotests/read/psd/cmyk8_testcard.psd.json

@@ -1,11 +0,0 @@
-[
-    {
-        "minQtVersion" : "6.8.0",
-        "fileName" : "cmyk8_testcard_qt6_8.tif"
-    },
-    {
-        "minQtVersion" : "6.0.0",
-        "maxQtVersion" : "6.7.99",
-        "fileName" : "cmyk8_testcard.png"
-    }
-]

autotests/read/psd/cmyka-16bits.psd.json

@@ -1,11 +0,0 @@
-[
-    {
-        "minQtVersion" : "6.8.0",
-        "fileName" : "cmyka-16bits_qt6_8.png"
-    },
-    {
-        "minQtVersion" : "6.0.0",
-        "maxQtVersion" : "6.7.99",
-        "fileName" : "cmyka-16bits.png"
-    }
-]

autotests/read/psd/cmyka-8bits.psd.json

@@ -1,11 +0,0 @@
-[
-    {
-        "minQtVersion" : "6.8.0",
-        "fileName" : "cmyka-8bits_qt6_8.png"
-    },
-    {
-        "minQtVersion" : "6.0.0",
-        "maxQtVersion" : "6.7.99",
-        "fileName" : "cmyka-8bits.png"
-    }
-]

autotests/read/psd/mch-16bits.psd.json

@@ -1,11 +0,0 @@
-[
-    {
-        "minQtVersion" : "6.8.0",
-        "fileName" : "mch-16bits_qt_6_8.tif"
-    },
-    {
-        "minQtVersion" : "6.0.0",
-        "maxQtVersion" : "6.7.99",
-        "fileName" : "mch-16bits.png"
-    }
-]

autotests/read/psd/mch-8bits.psd.json

@@ -1,11 +0,0 @@
-[
-    {
-        "minQtVersion" : "6.8.0",
-        "fileName" : "mch-8bits_qt_6.8.tif"
-    },
-    {
-        "minQtVersion" : "6.0.0",
-        "maxQtVersion" : "6.7.99",
-        "fileName" : "mch-8bits.png"
-    }
-]

autotests/read/xcf/birthday16.xcf.json

@@ -1,32 +0,0 @@
-[
-    {
-        "minQtVersion" : "6.7.0",
-        "fileName" : "birthday16.png",
-        "seeAlso" : "https://bugreports.qt.io/browse/QTBUG-120614"
-    },
-    {
-        "minQtVersion" : "6.0.0",
-        "maxQtVersion" : "6.2.10",
-        "fileName" : "birthday16_alphabug.png"
-    },
-    {
-        "minQtVersion" : "6.3.0",
-        "maxQtVersion" : "6.3.2",
-        "fileName" : "birthday32_alphabug.png"
-    },
-    {
-        "minQtVersion" : "6.4.0",
-        "maxQtVersion" : "6.4.3",
-        "fileName" : "birthday32_alphabug.png"
-    },
-    {
-        "minQtVersion" : "6.5.0",
-        "maxQtVersion" : "6.5.4",
-        "fileName" : "birthday16_alphabug.png"
-    },
-    {
-        "minQtVersion" : "6.6.0",
-        "maxQtVersion" : "6.6.1",
-        "fileName" : "birthday16_alphabug.png"
-    }
-]

autotests/read/xcf/birthday32.xcf.json

@@ -1,32 +0,0 @@
-[
-    {
-        "minQtVersion" : "6.7.0",
-        "fileName" : "birthday32.png",
-        "seeAlso" : "https://bugreports.qt.io/browse/QTBUG-120614"
-    },
-    {
-        "minQtVersion" : "6.0.0",
-        "maxQtVersion" : "6.2.10",
-        "fileName" : "birthday32_alphabug.png"
-    },
-    {
-        "minQtVersion" : "6.3.0",
-        "maxQtVersion" : "6.3.2",
-        "fileName" : "birthday32_alphabug.png"
-    },
-    {
-        "minQtVersion" : "6.4.0",
-        "maxQtVersion" : "6.4.3",
-        "fileName" : "birthday32_alphabug.png"
-    },
-    {
-        "minQtVersion" : "6.5.0",
-        "maxQtVersion" : "6.5.4",
-        "fileName" : "birthday32_alphabug.png"
-    },
-    {
-        "minQtVersion" : "6.6.0",
-        "maxQtVersion" : "6.6.1",
-        "fileName" : "birthday32_alphabug.png"
-    }
-]

autotests/readtest.cpp

@@ -16,7 +16,6 @@
 #include <QTextStream>
 
 #include "../tests/format-enum.h"
-#include "templateimage.h"
 
 #include "fuzzyeq.cpp"
 
@@ -90,115 +89,13 @@ static QImage::Format preferredFormat(QImage::Format fmt)
     }
 }
 
-/*!
- * \brief The OptionTest class
- * Class for testing image options.
- * Supports the most common options:
- * - Size
- * - ImageFormat
- * - ImageTransformation (rotations)
- * \todo Add missing options if needed.
- */
-class OptionTest
-{
-public:
-    OptionTest()
-        : m_size(QSize())
-        , m_format(QImage::Format_Invalid)
-        , m_transformations(QImageIOHandler::TransformationNone)
-    {
-    }
-
-    OptionTest(const OptionTest&) = default;
-    OptionTest& operator =(const OptionTest&) = default;
-
-    /*!
-     * \brief store
-     * Stores the supported options of the reader.
-     * \param reader
-     * \return True on success, otherwise false.
-     */
-    bool store(const QImageReader *reader = nullptr)
-    {
-        if (reader == nullptr) {
-            return false;
-        }
-        bool ok = true;
-        if (reader->supportsOption(QImageIOHandler::Size)) {
-            m_size = reader->size();
-            if (m_size.isEmpty())
-                ok = false;
-        }
-        if (reader->supportsOption(QImageIOHandler::ImageFormat)) {
-            m_format = reader->imageFormat();
-            if (m_format == QImage::Format_Invalid)
-                ok = false;
-        }
-        if (reader->supportsOption(QImageIOHandler::ImageTransformation)) {
-            m_transformations = reader->transformation();
-            if (int(m_transformations) < 0 || int(m_transformations) > 7)
-                ok = false;
-        }
-        return ok;
-    }
-
-
-    /*!
-     * \brief compare
-     * Compare the stored values with the ones read from the image reader.
-     * \param reader
-     * \return True on success, otherwise false.
-     */
-    bool compare(const QImageReader *reader)
-    {
-        if (reader == nullptr) {
-            return false;
-        }
-        bool ok = true;
-        if (reader->supportsOption(QImageIOHandler::Size)) {
-            ok = ok && (m_size == reader->size());
-        }
-        if (reader->supportsOption(QImageIOHandler::ImageFormat)) {
-            ok = ok && (m_format == reader->imageFormat());
-        }
-        if (reader->supportsOption(QImageIOHandler::ImageTransformation)) {
-            ok = ok && (m_transformations == reader->transformation());
-        }
-        return ok;
-    }
-
-    /*!
-     * \brief compare
-     * Compare the image properties with the ones stored.
-     * \param image
-     * \return True on success, otherwise false.
-     */
-    bool compare(const QImage& image)
-    {
-        bool ok = true;
-        if (!m_size.isEmpty()) {
-            // Size option return the size without transformation (tested with Qt TIFF plugin).
-            ok = ok && (m_size == image.size() || m_size == image.size().transposed());
-        }
-        if (m_format != QImage::Format_Invalid) {
-            ok = ok && (m_format == image.format());
-        }
-        return ok;
-    }
-
-private:
-    QSize m_size;
-    QImage::Format m_format;
-    QImageIOHandler::Transformations m_transformations;
-};
-
 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.2.0"));
+    QCoreApplication::setApplicationVersion(QStringLiteral("1.1.0"));
 
     QCommandLineParser parser;
     parser.setApplicationDescription(QStringLiteral("Performs basic image conversion checking."));
@@ -262,39 +159,28 @@ int main(int argc, char **argv)
             QTextStream(stdout) << "* Run on RANDOM ACCESS device\n";
         }
         for (const QFileInfo &fi : lstImgDir) {
-            TemplateImage timg(fi);
-            if (timg.isTemplate()) {
+            if (!fi.suffix().compare("png", Qt::CaseInsensitive) || !fi.suffix().compare("tif", Qt::CaseInsensitive)) {
                 continue;
             }
+            int suffixPos = fi.filePath().size() - suffix.size();
+            QString inputfile = fi.filePath();
+            QString fmt = QStringLiteral("png");
+            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.size(), fmt);
+            }
+            QString expfilename = QFileInfo(expfile).fileName();
 
-            TemplateImage::TestFlags flags = TemplateImage::None;
-            QString comment;
-            QFileInfo expFileInfo = timg.compareImage(flags, comment);
-            if ((flags & TemplateImage::SkipTest) == TemplateImage::SkipTest) {
-                if(comment.isEmpty())
-                    comment = QStringLiteral("image format not supported by current Qt version!");
-                QTextStream(stdout) << "SKIP : " << fi.fileName() << QStringLiteral(": %1\n").arg(comment);
-                ++skipped;
-                continue;
-            }
-            if (!formatStrings.contains(expFileInfo.suffix(), Qt::CaseInsensitive)) {
-                // Work Around for CCBUG: 468288
-                QTextStream(stdout) << "SKIP : " << fi.fileName() << ": comparison image " << expFileInfo.fileName() << " cannot be loaded due to the lack of "
-                                    << expFileInfo.suffix().toUpper() << " plugin!\n";
-                ++skipped;
-                continue;
-            }
-            QString expfilename = expFileInfo.fileName();
-
-            std::unique_ptr<QIODevice> inputDevice(seq ? new SequentialFile(fi.filePath()) : new QFile(fi.filePath()));
+            std::unique_ptr<QIODevice> inputDevice(seq ? new SequentialFile(inputfile) : new QFile(inputfile));
             QImageReader inputReader(inputDevice.get(), format);
-            QImageReader expReader(expFileInfo.filePath());
+            QImageReader expReader(expfile, fmt.toLatin1());
 
             QImage inputImage;
             QImage expImage;
 
             // inputImage is auto-rotated to final orientation
-            inputReader.setAutoTransform((flags & TemplateImage::DisableAutotransform) != TemplateImage::DisableAutotransform);
+            inputReader.setAutoTransform(true);
 
             if (!expReader.read(&expImage)) {
                 QTextStream(stdout) << "ERROR: " << fi.fileName() << ": could not load " << expfilename << ": " << expReader.errorString() << "\n";
@@ -313,32 +199,11 @@ int main(int argc, char **argv)
                 }
                 continue;
             }
-
-            OptionTest optionTest;
-            if (!optionTest.store(&inputReader)) {
-                QTextStream(stdout) << "FAIL : " << fi.fileName() << ": error while reading options\n";
-                ++failed;
-                continue;
-            }
-
             if (!inputReader.read(&inputImage)) {
                 QTextStream(stdout) << "FAIL : " << fi.fileName() << ": failed to load: " << inputReader.errorString() << "\n";
                 ++failed;
                 continue;
             }
-
-            if (!optionTest.compare(&inputReader)) {
-                QTextStream(stdout) << "FAIL : " << fi.fileName() << ": error while comparing options\n";
-                ++failed;
-                continue;
-            }
-
-            if (!optionTest.compare(inputImage)) {
-                QTextStream(stdout) << "FAIL : " << fi.fileName() << ": error while comparing the image properties with options\n";
-                ++failed;
-                continue;
-            }
-
             if (expImage.width() != inputImage.width()) {
                 QTextStream(stdout) << "FAIL : " << fi.fileName() << ": width was " << inputImage.width() << " but " << expfilename << " width was "
                                     << expImage.width() << "\n";

autotests/templateimage.cpp

@@ -1,111 +0,0 @@
-/*
-    SPDX-FileCopyrightText: 2024 Mirco Miranda <mircomir@outlook.com>
-
-    SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
-*/
-
-#include "templateimage.h"
-
-#include <QFile>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QVersionNumber>
-
-TemplateImage::TemplateImage(const QFileInfo &fi) :
-    m_fi(fi)
-{
-
-}
-
-bool TemplateImage::isTemplate() const
-{
-    auto list = suffixes();
-    for (auto&& suffix : list) {
-        if (!m_fi.suffix().compare(suffix, Qt::CaseInsensitive))
-            return true;
-    }
-    return false;
-}
-
-QFileInfo TemplateImage::compareImage(TestFlags &flags, QString& comment) const
-{
-    auto fi = jsonImage(flags, comment);
-    if ((flags & TestFlag::SkipTest) == TestFlag::SkipTest) {
-        return {};
-    }
-    if (fi.exists()) {
-        return fi;
-    }
-    return legacyImage();
-}
-
-
-QStringList TemplateImage::suffixes()
-{
-    return QStringList({"png", "tif", "tiff", "json"});
-}
-
-QFileInfo TemplateImage::legacyImage() const
-{
-    auto list = suffixes();
-    for (auto&& suffix : list) {
-        auto fi = QFileInfo(QStringLiteral("%1/%2.%3").arg(m_fi.path(), m_fi.completeBaseName(), suffix));
-        if (fi.exists()) {
-            return fi;
-        }
-    }
-    return {};
-}
-
-QFileInfo TemplateImage::jsonImage(TestFlags &flags, QString& comment) const
-{
-    flags = TestFlag::None;
-    auto fi = QFileInfo(QStringLiteral("%1.json").arg(m_fi.filePath()));
-    if (!fi.exists()) {
-        return {};
-    }
-
-    QFile f(fi.filePath());
-    if (!f.open(QFile::ReadOnly)) {
-        return {};
-    }
-
-    QJsonParseError err;
-    auto doc = QJsonDocument::fromJson(f.readAll(), &err);
-    if (err.error != QJsonParseError::NoError || !doc.isArray()) {
-        return {};
-    }
-
-    auto currentQt = QVersionNumber::fromString(qVersion());
-    auto arr = doc.array();
-    for (auto val : arr) {
-        if (!val.isObject())
-            continue;
-        auto obj = val.toObject();
-        auto minQt = QVersionNumber::fromString(obj.value("minQtVersion").toString());
-        auto maxQt = QVersionNumber::fromString(obj.value("maxQtVersion").toString());
-        auto name = obj.value("fileName").toString();
-        auto unsupportedFormat = obj.value("unsupportedFormat").toBool();
-        comment = obj.value("comment").toString();
-
-        if(obj.value("disableAutoTransform").toBool())
-            flags |= TestFlag::DisableAutotransform;
-
-        // filter
-        if (name.isEmpty() && !unsupportedFormat)
-            continue;
-        if (!minQt.isNull() && currentQt < minQt)
-            continue;
-        if (!maxQt.isNull() && currentQt > maxQt)
-            continue;
-        if (unsupportedFormat) {
-            flags |= TestFlag::SkipTest;
-            break;
-        }
-        return QFileInfo(QStringLiteral("%1/%2").arg(fi.path(), name));
-    }
-
-    return {};
-}
-