GIT_SILENT Upgrade ECM and KF version requirements for 5.107.0 release.

- 1-bit writer: checks where is black and use NOT operator only if needed
- Fix images with witdh == 65536(*)
- Checks result of disk writes and reads on all formats

(*) PCX formats support images with with of 65536 but only if the header field bytesPerLine is valid (no overflow). This means that the width 65536 is supported on 1bpp images only.
The previous version of the plugins wrote an image with width of 65536px in the wrong way and it was unable to read it (wrong image returned). I verified that Photoshop and Gimp weren't able to read the image either.

(cherry picked from commit d57ff91f8b)

.gitlab-ci.yml

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

.kde-ci.yml

@@ -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.4.0") # handled by release scripts
-set(KF_DEP_VERSION "6.4.0") # handled by release scripts
-project(KImageFormats VERSION ${KF_VERSION})
+project(KImageFormats)
 
 include(FeatureSummary)
-find_package(ECM 6.4.0  NO_MODULE)
+find_package(ECM 5.107.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,11 +19,11 @@ include(ECMDeprecationSettings)
 include(CheckIncludeFiles)
 include(FindPkgConfig)
 
-set(REQUIRED_QT_VERSION 6.5.0)
-find_package(Qt6Gui ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
+set(REQUIRED_QT_VERSION 5.15.2)
+find_package(Qt${QT_MAJOR_VERSION}Gui ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
 
-find_package(KF6Archive ${KF_DEP_VERSION})
-set_package_properties(KF6Archive PROPERTIES
+find_package(KF5Archive)
+set_package_properties(KF5Archive PROPERTIES
     TYPE OPTIONAL
     PURPOSE "Required for the QImage plugin for Krita and OpenRaster images"
 )
@@ -34,12 +32,12 @@ set_package_properties(KF6Archive PROPERTIES
 # this available in PATH
 set(BUILD_EPS_PLUGIN FALSE)
 if (UNIX)
-    find_package(Qt6PrintSupport ${REQUIRED_QT_VERSION} NO_MODULE)
-    set_package_properties(Qt6PrintSupport PROPERTIES
+    find_package(Qt${QT_MAJOR_VERSION}PrintSupport ${REQUIRED_QT_VERSION} NO_MODULE)
+    set_package_properties(Qt${QT_MAJOR_VERSION}PrintSupport PROPERTIES
         PURPOSE "Required for the QImage plugin for EPS images"
         TYPE OPTIONAL
     )
-    if (TARGET Qt6::PrintSupport)
+    if (TARGET Qt${QT_MAJOR_VERSION}::PrintSupport)
         set(BUILD_EPS_PLUGIN TRUE)
     endif()
 endif()
@@ -53,10 +51,7 @@ set_package_properties(OpenEXR PROPERTIES
     PURPOSE "Required for the QImage plugin for OpenEXR images"
 )
 
-find_package(libavif 0.8.2 CONFIG QUIET)
-if(NOT libavif_FOUND)
-    find_package(libavif 1 CONFIG)
-endif()
+find_package(libavif 0.8.2 CONFIG)
 set_package_properties(libavif PROPERTIES
     TYPE OPTIONAL
     PURPOSE "Required for the QImage plugin for AVIF images"
@@ -70,26 +65,21 @@ add_feature_info(LibHeif LibHeif_FOUND "required for the QImage plugin for HEIF/
 
 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(LibJXL IMPORTED_TARGET libjxl>=0.6.1)
+    pkg_check_modules(LibJXLThreads IMPORTED_TARGET libjxl_threads>=0.6.1)
 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
-    KF 5.102
+    QT 5.15.2
+    KF 5.95
 )
 
 add_subdirectory(src)
@@ -98,7 +88,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

@@ -14,29 +14,22 @@ image formats.
 The following image formats have read-only support:
 
 - Animated Windows cursors (ani)
-- Camera RAW images (arw, cr2, cr3, dcs, dng, ...)
 - Gimp (xcf)
-- Krita (kra)
-- OpenRaster (ora)
-- Pixar raster (pxr)
-- Portable FloatMap (pfm)
+- OpenEXR (exr)
 - Photoshop documents (psd, psb, pdd, psdt)
-- Radiance HDR (hdr)
-- Sun Raster (im1, im8, im24, im32, ras, sun)
+- Sun Raster (ras)
+- Camera RAW images (arw, cr2, cr3, dcs, dng, ...)
 
 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)
 - Softimage PIC (pic)
 - Targa (tga): supports more formats than Qt's version
+- XView (xv)
 
 ## Contributing
 
@@ -48,6 +41,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

@@ -1,4 +1,7 @@
+#find_package(Qt5Test ${REQUIRED_QT_VERSION} NO_MODULE)
+
 include(ECMMarkAsTest)
+include(CMakeParseArguments)
 
 add_definitions(-DPLUGIN_DIR="${CMAKE_CURRENT_BINARY_DIR}/../bin")
 remove_definitions(-DQT_NO_CAST_FROM_ASCII)
@@ -11,8 +14,8 @@ macro(kimageformats_read_tests)
     endif()
 
     if (NOT TARGET readtest)
-        add_executable(readtest readtest.cpp templateimage.cpp)
-        target_link_libraries(readtest Qt6::Gui)
+        add_executable(readtest readtest.cpp)
+        target_link_libraries(readtest Qt${QT_MAJOR_VERSION}::Gui)
         target_compile_definitions(readtest
             PRIVATE IMAGEDIR="${CMAKE_CURRENT_SOURCE_DIR}/read")
         ecm_mark_as_test(readtest)
@@ -35,7 +38,7 @@ macro(kimageformats_write_tests)
 
     if (NOT TARGET writetest)
         add_executable(writetest writetest.cpp)
-        target_link_libraries(writetest Qt6::Gui)
+        target_link_libraries(writetest Qt${QT_MAJOR_VERSION}::Gui)
         target_compile_definitions(writetest
             PRIVATE IMAGEDIR="${CMAKE_CURRENT_SOURCE_DIR}/write")
         ecm_mark_as_test(writetest)
@@ -66,16 +69,13 @@ endmacro()
 kimageformats_read_tests(
     hdr
     pcx
-    pfm
     psd
-    pxr
-    qoi
     ras
     rgb
     tga
 )
 
-if (KF6Archive_FOUND)
+if (KF5Archive_FOUND)
     kimageformats_read_tests(
         kra
         ora
@@ -99,12 +99,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 +110,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
@@ -140,7 +125,6 @@ kimageformats_read_tests(FUZZ 1
 kimageformats_write_tests(
     pcx-lossless
     pic-lossless
-    qoi-lossless
     rgb-lossless
     tga # fixme: the alpha images appear not to be written properly
 )
@@ -155,11 +139,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)
@@ -168,19 +147,19 @@ if (LibRaw_FOUND)
     )
 endif()
 
-find_package(Qt6Test ${REQUIRED_QT_VERSION} CONFIG QUIET)
+find_package(Qt${QT_MAJOR_VERSION}Test ${REQUIRED_QT_VERSION} CONFIG QUIET)
 
-if(NOT TARGET Qt6::Test)
-    message(STATUS "Qt6Test not found, some autotests will not be built.")
+if(NOT TARGET Qt${QT_MAJOR_VERSION}::Test)
+    message(STATUS "Qt${QT_MAJOR_VERSION}Test not found, some autotests will not be built.")
     return()
 endif()
 
 add_executable(pictest pictest.cpp)
-target_link_libraries(pictest Qt6::Gui Qt6::Test)
+target_link_libraries(pictest Qt${QT_MAJOR_VERSION}::Gui Qt${QT_MAJOR_VERSION}::Test)
 ecm_mark_as_test(pictest)
 add_test(NAME kimageformats-pic COMMAND pictest)
 
 add_executable(anitest anitest.cpp)
-target_link_libraries(anitest Qt6::Gui Qt6::Test)
+target_link_libraries(anitest Qt${QT_MAJOR_VERSION}::Gui Qt${QT_MAJOR_VERSION}::Test)
 ecm_mark_as_test(anitest)
 add_test(NAME kimageformats-ani COMMAND anitest)

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"
-    }
-]