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.5.0") # handled by release scripts
-set(KF_DEP_VERSION "6.5.0") # handled by release scripts
-project(KImageFormats VERSION ${KF_VERSION})
+project(KImageFormats)
 
 include(FeatureSummary)
-find_package(ECM 6.5.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

@@ -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). Can be enabled with the KIMAGEFORMATS_HEIF build option.
 - JPEG XL (jxl)
-- JPEG XR (jxr). Can be enabled with the KIMAGEFORMATS_JXR build option.
-- OpenEXR (exr)
 - Personal Computer Exchange (pcx)
 - Quite OK Image format (qoi)
 - SGI images (rgb, rgba, sgi, bw)
@@ -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;

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 (m_transformations < 0 || 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 {};
-}
-

autotests/templateimage.h

@@ -1,83 +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
-*/
-
-#ifndef TEMPLATEIMAGE_H
-#define TEMPLATEIMAGE_H
-
-#include <QFileInfo>
-
-/*!
- * \brief The TemplateImage class
- * Given an image name, it decides the template image to compare it with.
- */
-class TemplateImage
-{
-public:
-    enum TestFlag {
-        None = 0x0,
-        SkipTest = 0x1,
-        DisableAutotransform = 0x2
-    };
-    Q_DECLARE_FLAGS(TestFlags, TestFlag)
-
-    /*!
-     * \brief TemplateImage
-     * \param fi The image to test.
-     */
-    TemplateImage(const QFileInfo& fi);
-
-    /*!
-     * \brief TemplateImage
-     * Default copy constructor.
-     */
-    TemplateImage(const TemplateImage& other) = default;
-    /*!
-     * \brief operator =
-     * Default copy operator
-     */
-    TemplateImage& operator=(const TemplateImage& other) = default;
-
-    /*!
-     * \brief isTemplate
-     * \return True if the image is a template, false otherwise.
-     * \sa suffixes
-     */
-    bool isTemplate() const;
-
-    /*!
-     * \brief compareImage
-     * \param flags Flags for modifying test behavior (e.g. image format not supported by current Qt version).
-     * \return The template image to use for the comparison.
-     */
-    QFileInfo compareImage(TestFlags &flags, QString& comment) const;
-
-    /*!
-     * \brief suffixes
-     * \return The list of suffixes considered templates.
-     */
-    static QStringList suffixes();
-
-private:
-    /*!
-     * \brief legacyImage
-     * \return The template image calculated from the source image name.
-     */
-    QFileInfo legacyImage() const;
-
-    /*!
-     * \brief jsonImage
-     * \param flags Flags for modifying test behavior.
-     * \return The template image read from the corresponding JSON.
-     */
-    QFileInfo jsonImage(TestFlags &flags, QString& comment) const;
-
-private:
-    QFileInfo m_fi;
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(TemplateImage::TestFlags)
-
-#endif // TEMPLATEIMAGE_H

autotests/writetest.cpp

@@ -7,7 +7,6 @@
 #include <stdio.h>
 
 #include <QBuffer>
-#include <QColorSpace>
 #include <QCommandLineParser>
 #include <QCoreApplication>
 #include <QDir>
@@ -24,8 +23,8 @@ int main(int argc, char **argv)
     QCoreApplication app(argc, argv);
     QCoreApplication::removeLibraryPath(QStringLiteral(PLUGIN_DIR));
     QCoreApplication::addLibraryPath(QStringLiteral(PLUGIN_DIR));
-    QCoreApplication::setApplicationName(QStringLiteral("writetest"));
-    QCoreApplication::setApplicationVersion(QStringLiteral("1.1.0"));
+    QCoreApplication::setApplicationName(QStringLiteral("readtest"));
+    QCoreApplication::setApplicationVersion(QStringLiteral("1.0.0"));
 
     QCommandLineParser parser;
     parser.setApplicationDescription(QStringLiteral("Performs basic image conversion checking."));
@@ -149,14 +148,6 @@ 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());
         }