Use of heif_context_add_XMP_metadata instead

heif_context_add_XMP_metadata2

(cherry picked from commit 245c835d92)

.gitlab-ci.yml

@@ -12,11 +12,10 @@ include:
       - /gitlab-templates/windows-qt6.yml
       - /gitlab-templates/xml-lint.yml
       - /gitlab-templates/yaml-lint.yml
-      - /gitlab-templates/oss-fuzz.yml
 
 image_json_validate:
   stage: validate
-  image: invent-registry.kde.org/sysadmin/ci-images/suse-qt69:latest
+  image: invent-registry.kde.org/sysadmin/ci-images/suse-qt68:latest
   tags:
     - Linux
   script:

.kde-ci.yml

@@ -7,5 +7,5 @@ Dependencies:
 Options:
  test-before-installing: True
  require-passing-tests-on: ['Linux', 'FreeBSD', 'Windows']
- cmake-options: "-DKIMAGEFORMATS_JXR=ON -DKIMAGEFORMATS_HEIF=ON -DKIMAGEFORMATS_HEIF_TEST:STRING=OFF -DKIMAGEFORMATS_HEJ2_TEST:STRING=OFF -DKIMAGEFORMATS_AVCI_TEST:STRING=OFF"
+ cmake-options: "-DKIMAGEFORMATS_DDS=ON -DKIMAGEFORMATS_JXR=ON"
  per-test-timeout: 90

CMakeLists.txt

@@ -1,11 +1,11 @@
-cmake_minimum_required(VERSION 3.27)
+cmake_minimum_required(VERSION 3.16)
 
-set(KF_VERSION "6.23.0") # handled by release scripts
-set(KF_DEP_VERSION "6.23.0") # handled by release scripts
+set(KF_VERSION "6.12.0") # handled by release scripts
+set(KF_DEP_VERSION "6.12.0") # handled by release scripts
 project(KImageFormats VERSION ${KF_VERSION})
 
 include(FeatureSummary)
-find_package(ECM 6.23.0  NO_MODULE)
+find_package(ECM 6.12.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.8.0)
+set(REQUIRED_QT_VERSION 6.6.0)
 find_package(Qt6Gui ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
 
 find_package(KF6Archive ${KF_DEP_VERSION})
@@ -65,12 +65,6 @@ set_package_properties(libavif PROPERTIES
 option(KIMAGEFORMATS_DDS "Enable plugin for DDS format" ON)
 
 option(KIMAGEFORMATS_HEIF "Enable plugin for HEIF format" OFF)
-set(KIMAGEFORMATS_HEIF_TEST "ALL" CACHE STRING "Enable HEIF tests: OFF, READ_ONLY, ALL")
-set_property(CACHE KIMAGEFORMATS_HEIF_TEST PROPERTY STRINGS "OFF" "READ_ONLY" "ALL")
-set(KIMAGEFORMATS_HEJ2_TEST "ALL" CACHE STRING "Enable HEJ2 tests: OFF, READ_ONLY, ALL")
-set_property(CACHE KIMAGEFORMATS_HEJ2_TEST PROPERTY STRINGS "OFF" "READ_ONLY" "ALL")
-set(KIMAGEFORMATS_AVCI_TEST "ALL" CACHE STRING "Enable AVCI tests: OFF, ALL")
-set_property(CACHE KIMAGEFORMATS_AVCI_TEST PROPERTY STRINGS "OFF" "ALL")
 if(KIMAGEFORMATS_HEIF)
     pkg_check_modules(LibHeif IMPORTED_TARGET libheif>=1.10.0)
 endif()
@@ -105,8 +99,8 @@ endif()
 add_feature_info(LibJXR LibJXR_FOUND "required for the QImage plugin for JPEG XR images")
 
 ecm_set_disabled_deprecation_versions(
-    QT 6.11.0
-    KF 6.21.0
+    QT 6.8.0
+    KF 6.11.0
 )
 
 add_subdirectory(src)
@@ -115,28 +109,6 @@ if (BUILD_TESTING)
     add_subdirectory(tests)
 endif()
 
-set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF6ImageFormats")
-include(CMakePackageConfigHelpers)
-
-write_basic_package_version_file(
-    "${CMAKE_CURRENT_BINARY_DIR}/KF6ImageFormatsConfigVersion.cmake"
-    VERSION ${PROJECT_VERSION}
-    COMPATIBILITY AnyNewerVersion
-)
-
-configure_package_config_file(
-    "${CMAKE_CURRENT_SOURCE_DIR}/KF6ImageFormatsConfig.cmake.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/KF6ImageFormatsConfig.cmake"
-    INSTALL_DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
-)
-
-install(FILES
-  "${CMAKE_CURRENT_BINARY_DIR}/KF6ImageFormatsConfig.cmake"
-  "${CMAKE_CURRENT_BINARY_DIR}/KF6ImageFormatsConfigVersion.cmake"
-  DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
-  COMPONENT Devel
-)
-
 include(ECMFeatureSummary)
 ecm_feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
 

KF6ImageFormatsConfig.cmake.in

@@ -1,5 +0,0 @@
-# SPDX-FileCopyrightText: 2025 Xaver Hugl <xaver.hugl@gmail.com>
-# SPDX-License-Identifier: BSD-2-Clause
-
-@PACKAGE_INIT@
-# empty, because this is plugins for Qt instead of a library to link against

LICENSES/Apache-2.0.txt

@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

README.md

@@ -17,7 +17,6 @@ The following image formats have read-only support:
 - Animated Windows cursors (ani)
 - Camera RAW images (arw, cr2, cr3, dcs, dng, ...)
 - Gimp (xcf)
-- Interchange Format Files (iff, ilbm, lbm)
 - Krita (kra)
 - OpenRaster (ora)
 - Pixar raster (pxr)
@@ -54,19 +53,11 @@ 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.
-- Use Qt logging categories for Debug messages.
-
-For more info about tests, see also [Autotests README](autotests/README.md).
+- Contain the test images needed to verify that the changes work correctly
+- Pass the tests successfully
 
 ## Duplicated Plugins
 
-> [!important]
-> To ensure you are using the correct plugin, the unwanted one should be 
-renamed or deleted. If several plugins support the same capability, Qt will 
-select one arbitrarily.
-
 ### The TGA plugin
 
 The TGA plugin supports more formats than Qt's own TGA plugin;
@@ -218,36 +209,30 @@ RGB.
 
 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()`.
+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).
 
-> [!note]
-> You can change the maximum limit of 300000 pixels by setting the constant
-> `KIF_LARGE_IMAGE_PIXEL_LIMIT` to the desired value in the cmake file.
-
-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
-- DDS: 300,000 x 300,000 pixels
+- DDS: n/a
 - EXR: 300,000 x 300,000 pixels
-- EPS: same size as Qt's JPG plugin
-- HDR: 300,000 x 300,000 pixels
+- EPS: n/a
+- HDR: n/a (large image)
 - HEIF: n/a
-- IFF: 65,535 x 65,535 pixels
 - JP2: 300,000 x 300,000 pixels, in any case no larger than 2 gigapixels
 - JXL: 262,144 x 262,144 pixels, in any case no larger than 256 megapixels
-- JXR: 300,000 x 300,000 pixels, in any case no larger than 4 GB
+- 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: 300,000 x 300,000 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: 300,000 x 300,000 pixels
-- RAW: 65,535 x 65,535 pixels
+- 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
@@ -290,7 +275,7 @@ 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 alignment based on DDS 
+- `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
@@ -303,15 +288,6 @@ 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.
 
-**If you are interested in compiling the plugin without running the tests, 
-also use the following string options:**
-- `KIMAGEFORMATS_HEIF_TEST` to change the behaviour of HEIF tests. Set to 
-`"OFF"` (no test at all) or `"READ_ONLY"` (run read tests only).
-- `KIMAGEFORMATS_HEJ2_TEST` to change the behaviour of HEJ2 tests. Set to 
-`"OFF"` (no test at all) or `"READ_ONLY"` (run read tests only)..
-- `KIMAGEFORMATS_AVCI_TEST` to change the behaviour of AVCI tests. Set to 
-`"OFF"` (no test at all).
-
 ### The EXR plugin
 
 The following defines can be defined in cmake to modify the behavior of the 
@@ -337,36 +313,6 @@ plugin:
 - `HDR_HALF_QUALITY`: on read, a 16-bit float image is returned instead of a 
   32-bit float one.
 
-
-### The IFF plugin
-
-Interchange File Format is a chunk-based format. Since the original 1985
-version, various extensions have been created over time.
-
-The plugin supports the following image data:
-- FORM ILBM (Interleaved Bitmap): Electronic Arts’ IFF standard for
-  Interchange File Format (EA IFF 1985). ILBM is a format to handle raster
-  images, specifically an InterLeaved bitplane BitMap image with color map.
-  It supports from 1 to 8-bit indexed images with HAM, Halfbride, and normal
-  encoding. It also supports interleaved 24-bit RGB and 32-bit RGBA 
-  extension without color map.
-- FORM ILBM 64: ILBM extension to support 48-bit RGB and 64-bit RGBA encoding.
-- FORM ACBM (Amiga Contiguous BitMap): It supports uncompressed ACBMs by 
-  converting them to ILBMs at runtime.
-- FORM RGBN / RGB8: It supports 13-bit and 25-bit RGB images with compression 
-  type 4.
-- FORM PBM: PBM is a chunky version of IFF pictures. It supports 8-bit images 
-  with color map only.
-- FORM IMAG (Compact Disc-Interactive): It supports CLut4, CLut7, CLut8, Rle7
-  and DYuv formats.
-- FORM RGFX: It supports uncompressed images only.
-- FOR4 CIMG (Maya Image File Format): It supports 24/48-bit RGB and 32/64-bit 
-  RGBA images.
-
-> [!note]
-> The plugin only supports the IFF, ILBM, and LBM file extensions. You'll 
-> need to rename files with different extensions to open them.
-
 ### The JP2 plugin
 
 **This plugin can be disabled by setting `KIMAGEFORMATS_JP2` to `OFF` 
@@ -398,7 +344,7 @@ 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 needs of additional memory by 
+- `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 
@@ -430,8 +376,6 @@ PSD support has the following limitations:
 - 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.
-- Grayscale images with alpha channel or at 32 bit depth are converted to 
-  RGBA due to the lack of the appropriate Qt grayscale container.
 - Extra channels other than alpha are discarded.
 
 The following defines can be defined in cmake to modify the behavior of the 
@@ -451,25 +395,6 @@ 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 TGA plugin
-
-TGA plugin supports both version 1 and version 2 of TGA files. When writing,
-it is possible to force which version to use by setting the following subtypes:
-- `TGAv1`: force TGA v1.0. No metadata.
-- `TGAv2` (default): force TGA v2.0 (strict). Adds the TGA Extension Area.
-- `TGAv2E`: force TGA v2.0 (enhanced). Same as TGA v2.0 (strict) but with the 
-  addition of the TGA v2.0 Developer Area with info like, for e.g., Exif data, 
-  XMP packet and the ICC profile.
-
-They are all TGA specs compliant. While for versions 1 and 2 (strict) it is 
-possible to decode all the information with the TGA specification alone, for 
-version 2 (enhanced) it is necessary to know how the additional data is
-encoded.
-
-The following defines can be defined in cmake to modify the behavior of the 
-plugin:
-- `TGA_V2E_AS_DEFAULT`: change the default version of the plugin to `TGAv2E`.
-
 ### The XCF plugin
 
 XCF support has the following limitations:

autotests/CMakeLists.txt

@@ -77,7 +77,6 @@ endmacro()
 # result against the data read from the corresponding png file
 kimageformats_read_tests(
     hdr
-    iff
     pcx
     pfm
     psd
@@ -102,52 +101,33 @@ if (KF6Archive_FOUND)
 endif()
 
 if (TARGET avif)
-    if(${libavif_VERSION} VERSION_GREATER_EQUAL "1.2.0")
-        kimageformats_read_tests(
-            avif
-        )
-    else()
-        message(WARNING "libavif ${libavif_VERSION} doesn't support decoding new AVIF files!\n"
-                        "AVIF read tests are disabled, consider updating libavif.")
-    endif()
-
+    kimageformats_read_tests(
+        avif
+    )
     kimageformats_write_tests(
         avif-nodatacheck-lossless
     )
 endif()
 
 if (LibHeif_FOUND)
-    if (KIMAGEFORMATS_HEIF_TEST STREQUAL "ALL" OR KIMAGEFORMATS_HEIF_TEST STREQUAL "READ_ONLY")
-        kimageformats_read_tests(
-            heif
-        )
-    endif()
-    if (KIMAGEFORMATS_HEIF_TEST STREQUAL "ALL")
-        # because the plug-ins use RGB->YUV conversion which sometimes results in 1 value difference.
-        kimageformats_write_tests(FUZZ 1
-            heif-nodatacheck-lossless
-        )
-    endif()
+    kimageformats_read_tests(
+        heif
+    )
+    # because the plug-ins use RGB->YUV conversion which sometimes results in 1 value difference.
+    kimageformats_write_tests(FUZZ 1
+        heif-nodatacheck-lossless
+    )
 
     if (LibHeif_VERSION VERSION_GREATER_EQUAL "1.17.0")
-        if (KIMAGEFORMATS_HEJ2_TEST STREQUAL "ALL" OR KIMAGEFORMATS_HEJ2_TEST STREQUAL "READ_ONLY")
-            kimageformats_read_tests(FUZZ 1
-                hej2
-            )
-        endif()
-        if (KIMAGEFORMATS_HEJ2_TEST STREQUAL "ALL")
-            kimageformats_write_tests(FUZZ 1
-                hej2-nodatacheck-lossless
-            )
-        endif()
+        kimageformats_read_tests(FUZZ 1
+            hej2
+        )
     endif()
 
-    if (LibHeif_VERSION VERSION_GREATER_EQUAL "1.19.6")
-        if (KIMAGEFORMATS_AVCI_TEST STREQUAL "ALL")
-            kimageformats_read_tests(FUZZ 4
-                avci
-            )
-        endif()
+    if (LibHeif_VERSION VERSION_GREATER_EQUAL "1.19.0")
+        kimageformats_read_tests(FUZZ 4
+            avci
+        )
     endif()
 endif()
 
@@ -205,7 +185,7 @@ kimageformats_write_tests(
     pic-lossless
     qoi-lossless
     rgb-lossless
-    tga-nodatacheck
+    tga # fixme: the alpha images appear not to be written properly
 )
 
 # EPS read tests depend on the vagaries of GhostScript

autotests/README.md

@@ -1,260 +0,0 @@
-# Autotests
-
-Automated testing for plugins to allow 
-[`QImage`](https://doc.qt.io/qt-6/qimage.html) to support
-extra file formats.
-
-## Introduction
-
-The testing part is essential for the correct functioning of the plugins. 
-There are generic read/write tests and specific tests for the plugins that
-require them.
-
-## Read tests
-
-The generic reading tests are contained in the `read` folder. Inside the 
-`read` folder, there are one or more folders for each plugin to be tested.
-A plugin can support multiple image file types, and if you need different 
-parameters for each type, you need to create a folder for each type supported
-by the plugin (see e.g. HEIF plugin). If all formats supported by the plugin 
-do not require different parameters, a single folder approach is simpler (see 
-e.g. PSD plugin).
-
-The reading tests are mainly based on comparing the image read by the plugin 
-with a template in a known and working format. For this reason, the template 
-formats chosen are those distributed by the Qt project: PNG in the first 
-instance and TIFF for image formats not supported by PNG (e.g. CMYK images).
-
-Some image options such as `QImageIOHandler::Size`, 
-`QImageIOHandler::ImageFormat` and `QImageIOHandler::ImageTransformation` are 
-also checked. If supported by the plugin, the resulting image is checked to 
-see if it is compatible with the option's specification.
-
-Optionally, for each image, you can also create a JSON file to modify the test 
-behavior and/or verify data other than image pixels, such as metadata.
-
-Finally, two tests are run for each test case:
-- On a random access device: this test must not fail.
-- On a sequential access device: a plugin may not support sequential operation. 
-In this case, the test is skipped. However, if an image is returned, the test 
-must succeed.
-
-### The readtest command
-
-To start a test, run the `readtest` command with the format to test as an 
-argument. The format is one of those supported by plugins and a folder with 
-the name of the format must be present inside the `read` folder.
-Depending on the format, you can specify the following additional options.
-
-- `--help`: Displays help on commandline options.
-- `--fuzz <max>`: The fuzziness. Used to add some deviation in ARGB data 
-(nornally used on lossy codec).
-- `--perceptive-fuzz`: Used to scale dynamically the fuzziness based on 
-the alpha channel value. This is useful on images with pre-multiplied and 
-small alphas. Qt can use different roundings based on optimizations resulting 
-in very different RGB values. Since the alpha is small visually there is no 
-difference (so it is not considered an error).
-- `--skip-optional-tests`: Used to skip the optional test such as metadata 
-and resolution tests.
-
-Note that some tests may fail if the correct options are not used. The correct
-options for each test are defined in [CMakeLists.txt](CMakeLists.txt).
-See also [Add a test to CMakeLists.txt](#add-a-test-to-cmakeliststxt).
-
-### Test image nomenclature
-
-Each test consists of the image to test, the verification image(s) (template)
-and, optionally, the additional JSON file.
-To be a test, the names of these files must be the same (except for 
-the extension). A test for a JXL image would be, for example, composed like 
-this:
-- `testRGB.jxl`: The image to test.
-- `testRGB.jxl.json`: The test behavior modifier (note that it must contain 
-the double extension).
-- `testRGB.png`: How the image should look (template). The template name 
-can be different if specified in the JSON file.
-
-Although there is no precise rule for the name of a test, it is good to have 
-a name that is explanatory.
-
-### JSON behavior file
-
-The behavior file was initially introduced to solve compatibility issues 
-between different versions of Qt supported by the framework. It was later 
-extended to also check image metadata.
-
-The JSON file consists of an array of JSON objects. The objects in the array 
-are iterated sequentially and the first object that matches the requirements 
-is used for testing (successes are ignored).
-
-Supported values ​​for JSON objects:
-- `colorSpace` : Type `object`. An object with the `description` (type 
-`string`), `primaries` (type `string`), `transferFunction` (type `string`), 
-`colorModel` (type `string`) and `gamma` (type `double`) values ​​of the
-image color space.
-- `comment`: Type `string`. A string shown by the test when a condition occurs.
-- `description`: Type `string`. A description of the object. Not used by the 
-test.
-- `disableAutoTransform`: Type `boolean`. By default, tests are run with 
-autotransform enabled (i.e. rotation is applied if the plugin supports it).
-Set to `true` to disable autotransform.
-- `fileName`: Type `string`. Name of the template file to use. E.g. 
-"testRGB_Qt_6_2.png".
-- `fuzziness`: Type `integer`. Set the fuzziness only if not already set on the 
-command line. The value set on the command line wins over the one in the JSON 
-file.
-- `maxQtVersion`: Type `string`. Maximum Qt version this object is compatible 
-with (if not set means all). E.g. "6.2.99".
-- `metadata`: Type `array`. An array of key/value objects (string type) 
-containing the image metadata as returned by `QImage::text`.
-- `minQtVersion`: Type `string`. Minimum Qt version this object is compatible 
-with (if not set means all). E.g. "6.2.0".
-- `perceptiveFuzziness` Type `boolean`. Set the perceptive fuzziness only if not
-already set on the command line. The value set on the command line wins over 
-the one in the JSON file.
-- `resolution`: Type `object`. An object with the `dotsPerMeterX` (type `integer`)
-and `dotsPerMeterY` (type `integer`) values ​​of the image.
-- `seeAlso`: Type `string`. More info about the object. Normally used to point
-to bug reports. Not used by the test.
-- `skipSequential`: Type `boolean`. Skip the test on sequential access device.
-Some plugins may have limited functionality on sequential devices (e.g., 
-not reading metadata).
-- `unsupportedFormat`: Type `boolean`. When true, the test is skipped.
-
-Some examples:
-- Example 1: [Runs only on Qt without alpha bug on float formats](read/jxl/testcard_rgba_fp16.jxl.json)
-- Example 2: [Rotation disabled](read/jxl/orientation6_notranfs.jxl.json)
-- Example 3: [Metadata](read/psd/metadata.psd.json)
-- Example 4: [Check Qt version, resolution and metadata](read/psd/mch-16bits.psd.json)
-- Example 5: [Fuzziness setting](read/xcf/birthday16.xcf.json)
-- Example 6: [Color space](read/dds/rgba_f16.dds.json)
- 
-These are just a few examples. More examples can be found in the test folders.
-
-## Write tests
-
-The generic writing tests are contained in the `write/basic` and 
-`write/format` folders. Similar to the read tests, they verify the written 
-(and then reread) image with a template.
-
-The write test is composed of several phases:
-- Basic test: Uses the `write/basic` folder and checks the most common images 
-and, optionally, metadata and resolution via a JSON properties file.
-- Format test: Uses the `write/format` folder and checks that all QImage image
-formats are written correctly.
-- Dimensional test: Uses the `write/format` folder and check images of 
-different sizes (odd numbers, prime numbers, etc.) to verify internal 
-alignments.
-- Null device test: Verify that there are no crashes if the device is null.
-
-### The writetest command
-
-To start a test, run the `writetest` command with the format to test as an 
-argument. The format is one of those supported by plugins, a folder with 
-the name of the format must be present inside the `write/format` folder and 
-may need a template image in `write/basic`.
-Depending on the format, you can specify the following additional options.
-
-- `--help`: Displays help on commandline options.
-- `--create-format-templates`: Create template images for all formats 
-supported by the QImage in `write/format`. Command to simplify the creation of
-format test images when adding a new plugin or modifying an old one. This 
-command is not intended to be used from the CMakeLists file as it must be used
-manually and the generated images must be verified one by one.
-- `--fuzz <max>`: The fuzziness. Used to add some deviation in ARGB data 
-(nornally used on lossy codec).
-- `--lossless`: Check that reading back the data gives the same image.
-- `--no-data-check`: Don't check that write data is exactly the same.
-- `--skip-optional-tests`: Skip optional data tests (metadata, resolution,
-etc...).
-
-Note that some tests may fail if the correct options are not used. The correct
-options for each test are defined in [CMakeLists.txt](CMakeLists.txt).
-See also [Add a test to CMakeLists.txt](#add-a-test-to-cmakeliststxt).
-
-### JSON properties file
-
-The properties file must be located in `write/basic` and must have the name 
-of the file format (e.g. jxl.json). It is a JSON object composed of the 
-following values:
-- `format`: Type `string`. The format tested.
-- `metadata`: Type `array`. An array of key/value objects (string type) 
-containing the image metadata as returned by `QImage::text`.
-- `resolution`: Type `object`. An object with the `dotsPerMeterX` and `
-dotsPerMeterY` (integer) values ​​of the image.
-- `subType`: type `string`. The image writer subtype to set when testing.
-
-[This is an example](write/basic/jxl.json) of property file.
-
-
-## Custom tests
-
-If the generic read/write tests do not meet the requirements of a plugin, 
-it is possible to write a custom test. 
-In general it makes sense to write a dedicated test for a format if and 
-only if you are testing unique features not present in other plugins.
-
-### The PIC test
-
-The PIC test is generated using Qt Test class. For more information 
-see [Qt Test](https://doc.qt.io/qt-6/qttest-index.html).
-
-### The ANI test
-
-The ANI test is generated using Qt Test class. For more information 
-see [Qt Test](https://doc.qt.io/qt-6/qttest-index.html).
-
-
-## Add a test to CMakeLists.txt
-
-To add a test to CMake use the `kimageformats_read_tests` and 
-`kimageformats_write_tests` functions. For example, to add the read 
-tests for the PSD you just write `kimageformats_read_tests(psd)`.
-
-It is also possible to pass command line arguments to the test by 
-appropriately composing the string passed to the test functions.
-For boolean parameters you need to add a string starting with '-' 
-after the image format. For example, to pass `--skip-optional-tests` 
-to the PSD plugin write `kimageformats_read_tests(psd-skipoptional)`.
-
-To add a fuzziness of 4, you must first set it as follows: 
-`kimageformats_read_tests(FUZZ 4 psd-skipoptional)`.
-
-The possible modifiers for `kimageformats_read_tests` are as follows:
-- `-skipoptional`: Add the `--skip-optional-tests` command line parameter.
-
-The possible modifiers for `kimageformats_write_tests` are as follows:
-- `-lossless`: Add the `--lossless` command line parameter.
-- `-nodatacheck`: Add the `--no-data-check` command line parameter.
-- `-skipoptional`: Add the `--skip-optional-tests` command line parameter.
-
-To set multiple parameters, you can enter multiple modifiers. For example:
-```
-kimageformats_write_tests(FUZZ 1
-    hej2-nodatacheck-lossless
-)
-```
-
-## OSS-Fuzz
-
-Plugins are also tested with [OSS-Fuzz](https://google.github.io/oss-fuzz/)
-project to identify possible security issues. When adding a new plugin it is 
-also necessary to add it to the test in the [ossfuzz](ossfuzz) directory.
-
-## TODO
-
-List of tests not implemented or only partially implemented.
-
-### Color Profiles Test
-
-Many plugins support color profiles via [`QColorSpace`](https://doc.qt.io/qt-6/qcolorspace.html). 
-Checking for correct color management is increasingly necessary especially now
-that monitors are HDR and other than RGB color spaces have been added to Qt.
-
-Furthermore, lossy plugins often have different color management behaviors 
-depending on how the image is saved.
-
-### Animations Test
-
-Few plugins support animations. There are currently no plans for 
-implementation.

autotests/anitest.cpp

@@ -48,7 +48,7 @@ private Q_SLOTS:
         QCOMPARE(reader.text(QStringLiteral("Author")), QStringLiteral("KDE Community"));
     }
 
-    void testRead()
+    void textRead()
     {
         QImageReader reader(QFINDTESTDATA("ani/test.ani"));
         QVERIFY(reader.canRead());

autotests/ossfuzz/build_fuzzers.sh

@@ -1,199 +0,0 @@
-#!/bin/bash -eu
-#
-# SPDX-FileCopyrightText: 2020 Google LLC
-# SPDX-License-Identifier: Apache-2.0
-#
-# Copyright 2020 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-################################################################################
-LDFLAGS=""
-if [[ $FUZZING_ENGINE == "afl" ]]; then
-    LDFLAGS="-fuse-ld=lld"
-fi
-export LDFLAGS
-
-# build zstd
-cd $SRC/zstd
-cmake -S build/cmake -DBUILD_SHARED_LIBS=OFF
-make install -j$(nproc)
-
-# Build zlib
-cd $SRC/zlib
-./configure --static
-make install -j$(nproc)
-
-# Build bzip2
-# Inspired from ../bzip2/build
-cd $SRC
-tar xzf bzip2-*.tar.gz && rm -f bzip2-*.tar.gz
-cd bzip2-*
-SRCL=(blocksort.o huffman.o crctable.o randtable.o compress.o decompress.o bzlib.o)
-
-for source in ${SRCL[@]}; do
-    name=$(basename $source .o)
-    $CC $CFLAGS -c ${name}.c
-done
-rm -f libbz2.a
-ar cq libbz2.a ${SRCL[@]}
-cp -f bzlib.h /usr/local/include
-cp -f libbz2.a /usr/local/lib
-
-# Build xz
-export ORIG_CFLAGS="${CFLAGS}"
-export ORIG_CXXFLAGS="${CXXFLAGS}"
-unset CFLAGS
-unset CXXFLAGS
-cd $SRC/xz
-./autogen.sh --no-po4a --no-doxygen
-./configure --enable-static --disable-debug --disable-shared --disable-xz --disable-xzdec --disable-lzmainfo
-make install -j$(nproc)
-export CFLAGS="${ORIG_CFLAGS}"
-export CXXFLAGS="${ORIG_CXXFLAGS}"
-
-# Build qt
-cd $SRC/qtbase
-./configure -no-glib -qt-libpng -qt-pcre -opensource -confirm-license -static -no-opengl -no-icu -platform linux-clang-libc++ -debug -prefix /usr -no-feature-widgets -no-feature-sql -no-feature-network  -no-feature-xml -no-feature-dbus -no-feature-printsupport
-cmake --build . --parallel $(nproc)
-cmake --install .
-
-# Build extra-cmake-modules
-cd $SRC/extra-cmake-modules
-cmake . -DBUILD_TESTING=OFF
-make install -j$(nproc)
-
-cd $SRC/karchive
-rm -rf poqm
-cmake . -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=OFF -DCMAKE_INSTALL_PREFIX=/usr/local
-make install -j$(nproc)
-
-# Build JXRlib
-cd $SRC/jxrlib
-make -j$(nproc)
-
-# Build LibRaw
-cd $SRC/LibRaw
-TMP_CFLAGS=$CFLAGS
-TMP_CXXFLAGS=$CXXFLAGS
-CFLAGS="$CFLAGS -fno-sanitize=function,vptr"
-CXXFLAGS="$CXXFLAGS -fno-sanitize=function,vptr"
-autoreconf --install
-./configure --disable-examples
-make -j$(nproc)
-make install -j$(nproc)
-CFLAGS=$TMP_CFLAGS
-CXXFLAGS=$TMP_CXXFLAGS
-
-
-# Build aom
-cd $SRC/aom
-mkdir build.libavif
-cd build.libavif
-extra_libaom_flags='-DAOM_MAX_ALLOCABLE_MEMORY=536870912 -DDO_RANGE_CHECK_CLAMP=1'
-cmake -DBUILD_SHARED_LIBS=0 -DENABLE_DOCS=0 -DENABLE_EXAMPLES=0 -DENABLE_TESTDATA=0 -DENABLE_TESTS=0 -DENABLE_TOOLS=0 -DCONFIG_PIC=1 -DAOM_TARGET_CPU=generic -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=12288 -DDECODE_WIDTH_LIMIT=12288 -DAOM_EXTRA_C_FLAGS="${extra_libaom_flags}" -DAOM_EXTRA_CXX_FLAGS="${extra_libaom_flags}" ..
-make -j$(nproc)
-make install -j$(nproc)
-
-# Build libavif
-cd $SRC/libavif
-ln -s "$SRC/aom" "$SRC/libavif/ext/"
-mkdir build
-cd build
-CFLAGS="$CFLAGS -fPIC" cmake -DBUILD_SHARED_LIBS=OFF -DAVIF_ENABLE_WERROR=OFF -DAVIF_CODEC_AOM=LOCAL -DAVIF_LIBYUV=OFF ..
-make -j$(nproc)
-
-# Build libde265
-cd $SRC/libde265
-cmake -DBUILD_SHARED_LIBS=OFF -DDISABLE_SSE=ON .
-make -j$(nproc)
-make install -j$(nproc)
-
-# Build openjpeg
-cd $SRC/openjpeg
-mkdir build
-cd build
-cmake -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON -DBUILD_CODEC=OFF ..
-make -j$(nproc)
-make install -j$(nproc)
-
-# build openh264
-cd $SRC/openh264
-make USE_ASM=No BUILDTYPE=Debug install-static -j$(nproc)
-
-# Build openexr
-cd $SRC/openexr
-mkdir _build
-cd _build
-cmake  -DBUILD_SHARED_LIBS=OFF ..
-make -j$(nproc)
-make install -j$(nproc)
-
-# Build libheif
-cd $SRC/libheif
-#Reduce max width and height to avoid allocating too much memory
-sed -i "s/static const int MAX_IMAGE_WIDTH = 32768;/static const int MAX_IMAGE_WIDTH = 8192;/g" libheif/security_limits.h
-sed -i "s/static const int MAX_IMAGE_HEIGHT = 32768;/static const int MAX_IMAGE_HEIGHT = 8192;/g" libheif/security_limits.h
-mkdir build
-cd build
-cmake -DBUILD_SHARED_LIBS=OFF -DENABLE_PLUGIN_LOADING=OFF -DWITH_DAV1D=OFF -DWITH_EXAMPLES=OFF -DWITH_LIBDE265=ON -DWITH_RAV1E=OFF -DWITH_RAV1E_PLUGIN=OFF -DWITH_SvtEnc=OFF -DWITH_SvtEnc_PLUGIN=OFF -DWITH_X265=OFF -DWITH_OpenJPEG_DECODER=ON -DWITH_OpenH264_DECODER=ON ..
-make -j$(nproc)
-make install -j$(nproc)
-
-# Build libjxl
-cd $SRC/libjxl
-mkdir build
-cd build
-CXXFLAGS="$CXXFLAGS -DHWY_COMPILE_ONLY_SCALAR" cmake -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=OFF -DJPEGXL_ENABLE_BENCHMARK=OFF -DJPEGXL_ENABLE_DOXYGEN=OFF -DJPEGXL_ENABLE_EXAMPLES=OFF -DJPEGXL_ENABLE_JNI=OFF -DJPEGXL_ENABLE_JPEGLI=OFF -DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF -DJPEGXL_ENABLE_MANPAGES=OFF -DJPEGXL_ENABLE_OPENEXR=OFF -DJPEGXL_ENABLE_PLUGINS=OFF -DJPEGXL_ENABLE_SJPEG=OFF -DJPEGXL_ENABLE_SKCMS=ON -DJPEGXL_ENABLE_TCMALLOC=OFF -DJPEGXL_ENABLE_TOOLS=OFF -DJPEGXL_ENABLE_FUZZERS=OFF ..
-make -j$(nproc) jxl jxl_cms jxl_threads
-
-cd $SRC/kimageformats
-HANDLER_TYPES="ANIHandler ani
-        QAVIFHandler avif
-        QDDSHandler dds
-        EXRHandler exr
-        HDRHandler hdr
-        HEIFHandler heif
-        IFFHandler iff
-        JP2Handler jp2
-        QJpegXLHandler jxl
-        JXRHandler jxr
-        KraHandler kra
-        OraHandler ora
-        PCXHandler pcx
-        PFMHandler pfm
-        SoftimagePICHandler pic
-        PSDHandler psd
-        PXRHandler pxr
-        QOIHandler qoi
-        RASHandler ras
-        RAWHandler raw
-        RGBHandler rgb
-        ScitexHandler sct
-        TGAHandler tga
-        XCFHandler xcf"
-
-echo "$HANDLER_TYPES" | while read class format; do
-(
-  fuzz_target_name=kimgio_${format}_fuzzer
-
-  /usr/libexec/moc $SRC/kimageformats/src/imageformats/$format.cpp -o $format.moc
-  header=`ls $SRC/kimageformats/src/imageformats/$format*.h`
-  /usr/libexec/moc $header -o moc_`basename $header .h`.cpp
-  $CXX $CXXFLAGS $LDFLAGS -fPIC -DHANDLER=$class -std=c++17 autotests/ossfuzz/kimgio_fuzzer.cc $SRC/kimageformats/src/imageformats/$format.cpp $SRC/kimageformats/src/imageformats/scanlineconverter.cpp $SRC/kimageformats/src/imageformats/microexif.cpp $SRC/kimageformats/src/imageformats/chunks.cpp -o $OUT/$fuzz_target_name -DJXL_STATIC_DEFINE -DJXL_THREADS_STATIC_DEFINE -DJXL_CMS_STATIC_DEFINE -DINITGUID -I $SRC/kimageformats/src/imageformats/ -I $SRC/libavif/include/ -I $SRC/libjxl/build/lib/include/ -I $SRC/libjxl/lib/include/ -I /usr/local/include/OpenEXR/ -I /usr/local/include/KF6/KArchive/ -I /usr/local/include/openjpeg-2.5 -I /usr/local/include/Imath -I $SRC/jxrlib/common/include -I $SRC/jxrlib/jxrgluelib -I $SRC/jxrlib/image/sys -I /usr/include/QtCore/ -I /usr/include/QtGui/ -I . $SRC/libavif/build/libavif.a /usr/local/lib/libheif.a /usr/local/lib/libde265.a /usr/local/lib/libopenh264.a $SRC/aom/build.libavif/libaom.a $SRC/libjxl/build/lib/libjxl_threads.a $SRC/libjxl/build/lib/libjxl.a $SRC/libjxl/build/lib/libjxl_cms.a $SRC/libjxl/build/third_party/highway/libhwy.a $SRC/libjxl/build/third_party/brotli/libbrotlidec.a $SRC/libjxl/build/third_party/brotli/libbrotlienc.a $SRC/libjxl/build/third_party/brotli/libbrotlicommon.a -lQt6Gui -lQt6Core -lQt6BundledLibpng -lQt6BundledHarfbuzz -lm -lQt6BundledPcre2 -ldl -lpthread $LIB_FUZZING_ENGINE /usr/local/lib/libz.a /usr/local/lib/x86_64-linux-gnu/libKF6Archive.a /usr/local/lib/libz.a /usr/local/lib/libraw.a /usr/local/lib/libOpenEXR-3_3.a /usr/local/lib/libIex-3_3.a /usr/local/lib/libImath-3_1.a /usr/local/lib/libIlmThread-3_3.a /usr/local/lib/libOpenEXRCore-3_3.a /usr/local/lib/libOpenEXRUtil-3_3.a /usr/local/lib/libopenjp2.a /usr/local/lib/libzstd.a $SRC/jxrlib/build/libjxrglue.a $SRC/jxrlib/build/libjpegxr.a /usr/local/lib/liblzma.a /usr/local/lib/libbz2.a -lclang_rt.builtins
-
-  # -lclang_rt.builtins in the previous line is a temporary workaround to avoid a linker error "undefined reference to __truncsfhf2". Investigate why this is needed here, but not anywhere else, and possibly remove it.
-
-  find . -name "*.${format}" | zip -q $OUT/${fuzz_target_name}_seed_corpus.zip -@
-)
-done

autotests/ossfuzz/kimgio_fuzzer.cc

@@ -1,76 +0,0 @@
-/*
-# SPDX-FileCopyrightText: 2018 Google Inc.
-# SPDX-License-Identifier: Apache-2.0
-#
-# Copyright 2018 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-################################################################################
-*/
-
-/*
-  Usage:
-    python infra/helper.py build_image kimageformats
-    python infra/helper.py build_fuzzers --sanitizer undefined|address|memory kimageformats
-    python infra/helper.py run_fuzzer kimageformats kimgio_[ani|avif|dds|exr|hdr|heif|iff|jp2|jxl|jxr|kra|ora|pcx|pfm|pic|psd|pxr|qoi|ras|raw|rgb|sct|tga|xcf]_fuzzer
-*/
-
-#include <QBuffer>
-#include <QCoreApplication>
-#include <QImage>
-
-#include "ani_p.h"
-#include "avif_p.h"
-#include "dds_p.h"
-#include "exr_p.h"
-#include "hdr_p.h"
-#include "heif_p.h"
-#include "iff_p.h"
-#include "jp2_p.h"
-#include "jxl_p.h"
-#include "jxr_p.h"
-#include "kra.h"
-#include "ora.h"
-#include "pcx_p.h"
-#include "pfm_p.h"
-#include "pic_p.h"
-#include "psd_p.h"
-#include "pxr_p.h"
-#include "qoi_p.h"
-#include "ras_p.h"
-#include "raw_p.h"
-#include "rgb_p.h"
-#include "sct_p.h"
-#include "tga_p.h"
-#include "xcf_p.h"
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
-{
-    int argc = 0;
-    QCoreApplication a(argc, nullptr);
-
-    QImageIOHandler* handler = new HANDLER();
-
-    QImage i;
-    QBuffer b;
-    b.setData((const char *)data, size);
-    b.open(QIODevice::ReadOnly);
-    handler->setDevice(&b);
-    handler->canRead();
-    handler->read(&i);
-
-    delete handler;
-
-    return 0;
-}

autotests/ossfuzz/prepare_build.sh

@@ -1,44 +0,0 @@
-#!/bin/bash -eu
-#
-# SPDX-FileCopyrightText: 2018 Google Inc.
-# SPDX-License-Identifier: Apache-2.0
-#
-# Based on https://github.com/google/oss-fuzz/blob/33aab4a70dc4b5811143d214536584a8c8cb3924/projects/kimageformats/Dockerfile
-# Copyright 2018 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-################################################################################
-
-apt-get update && \
-    apt-get install -y cmake make autoconf automake autopoint libtool \
-    wget po4a ninja-build pkgconf
-
-git clone --depth 1 https://github.com/madler/zlib.git
-git clone --depth 1 -b v1.5.7 https://github.com/facebook/zstd.git
-wget https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz
-git clone https://github.com/tukaani-project/xz.git
-git clone --depth 1 --branch=RB-3.3 https://github.com/AcademySoftwareFoundation/openexr.git
-git clone --depth 1 -b master https://invent.kde.org/frameworks/extra-cmake-modules.git
-git clone --depth 1 --branch=dev git://code.qt.io/qt/qtbase.git
-git clone --depth 1 --branch=dev git://code.qt.io/qt/qttools.git
-git clone --depth 1 -b master https://invent.kde.org/frameworks/karchive.git
-git clone --depth 1 -b v3.12.0 https://aomedia.googlesource.com/aom
-git clone --depth 1 -b v1.2.1 https://github.com/AOMediaCodec/libavif.git
-git clone --depth 1 https://github.com/strukturag/libde265.git
-git clone --depth 1 -b v2.5.3 https://github.com/uclouvain/openjpeg.git
-git clone --depth 1 https://github.com/strukturag/libheif.git
-git clone --depth=1 --recursive --shallow-submodules https://github.com/libjxl/libjxl.git
-git clone --depth 1 https://github.com/LibRaw/LibRaw
-git clone --depth 1 https://github.com/mircomir/jxrlib.git
-git clone --depth 1 -b v2.6.0 https://github.com/cisco/openh264.git

autotests/read/avif/metadata.avif.json

@@ -1,12 +1,6 @@
 [
     {
         "fileName" : "metadata.png",
-        "colorSpace" : {
-            "description" : "sRGB build-in",
-            "primaries" : "SRgb",
-            "transferFunction" : "SRgb",
-            "gamma" : 0
-        },
         "metadata" : [
             {
                 "key" : "ModificationDate",

autotests/read/avif/profile_gray.avif.json

@@ -1,11 +0,0 @@
-[
-    {
-        "fileName" : "profile_gray.png",
-        "colorSpace" : {
-            "colorModel" : "Gray",
-            "primaries" : "Custom",
-            "transferFunction" : "SRgb",
-            "gamma" : 2.31
-        }
-    }
-]

autotests/read/avif/profile_gray_gamma22.avif.json

@@ -1,11 +0,0 @@
-[
-    {
-        "fileName" : "profile_gray_gamma22.png",
-        "colorSpace" : {
-            "colorModel" : "Gray",
-            "primaries" : "Custom",
-            "transferFunction" : "Gamma",
-            "gamma" : 2.2
-        }
-    }
-]

autotests/read/avif/profile_gray_gamma28.avif.json

@@ -1,11 +0,0 @@
-[
-    {
-        "fileName" : "profile_gray_gamma28.png",
-        "colorSpace" : {
-            "colorModel" : "Gray",
-            "primaries" : "Custom",
-            "transferFunction" : "Gamma",
-            "gamma" : 2.8
-        }
-    }
-]

autotests/read/avif/profile_gray_linear.avif.json

@@ -1,11 +0,0 @@
-[
-    {
-        "fileName" : "profile_gray_linear.png",
-        "colorSpace" : {
-            "colorModel" : "Gray",
-            "primaries" : "Custom",
-            "transferFunction" : "Linear",
-            "gamma" : 1
-        }
-    }
-]

autotests/read/avif/profile_gray_prophoto.avif.json

@@ -1,12 +0,0 @@
-[
-    {
-        "fileName" : "profile_gray_prophoto.png",
-        "colorSpace" : {
-            "description" : "grayscale D50 with ProPhoto TRC",
-            "colorModel" : "Gray",
-            "primaries" : "Custom",
-            "transferFunction" : "Custom",
-            "gamma" : 0
-        }
-    }
-]

autotests/read/dds/rgba_f16.dds.json

@@ -2,12 +2,6 @@
     {
         "fileName" : "rgba_f16.png",
         "fuzziness" : 1,
-        "description" : "Minimum fuzziness value to pass the test on all architectures.",
-        "colorSpace" : {
-            "description" : "Linear sRGB",
-            "primaries" : "SRgb",
-            "transferFunction" : "Linear",
-            "gamma" : 1
-        }
+        "description" : "Minimum fuzziness value to pass the test on all architectures."
     }
 ]

autotests/read/exr/rgb-gimp.exr.json

@@ -1,12 +1,6 @@
 [
     {
         "fileName" : "rgb-gimp.png",
-        "colorSpace" : {
-            "description" : "",
-            "primaries" : "Custom",
-            "transferFunction" : "Linear",
-            "gamma" : 1
-        },
         "resolution" : {
             "dotsPerMeterX" : 3937,
             "dotsPerMeterY" : 3937

autotests/read/hdr/orientation1.hdr.json

@@ -1,12 +1,6 @@
 [
     {
         "fileName" : "orientation_all.png",
-        "colorSpace" : {
-            "description" : "Linear sRGB",
-            "primaries" : "SRgb",
-            "transferFunction" : "Linear",
-            "gamma" : 1
-        },
         "metadata" : [
             {
                 "key" : "Software" ,

autotests/read/hdr/orientation2.hdr.json

@@ -1,12 +1,6 @@
 [
     {
         "fileName" : "orientation_all.png",
-        "colorSpace" : {
-            "description" : "Linear sRGB",
-            "primaries" : "SRgb",
-            "transferFunction" : "Linear",
-            "gamma" : 1
-        },
         "metadata" : [
             {
                 "key" : "Software" ,

autotests/read/hdr/orientation3.hdr.json

@@ -1,12 +1,6 @@
 [
     {
         "fileName" : "orientation_all.png",
-        "colorSpace" : {
-            "description" : "Linear sRGB",
-            "primaries" : "SRgb",
-            "transferFunction" : "Linear",
-            "gamma" : 1
-        },
         "metadata" : [
             {
                 "key" : "Software" ,

autotests/read/hdr/orientation4.hdr.json

@@ -1,12 +1,6 @@
 [
     {
         "fileName" : "orientation_all.png",
-        "colorSpace" : {
-            "description" : "Linear sRGB",
-            "primaries" : "SRgb",
-            "transferFunction" : "Linear",
-            "gamma" : 1
-        },
         "metadata" : [
             {
                 "key" : "Software" ,

autotests/read/hdr/orientation5.hdr.json

@@ -1,12 +1,6 @@
 [
     {
         "fileName" : "orientation_all.png",
-        "colorSpace" : {
-            "description" : "Linear sRGB",
-            "primaries" : "SRgb",
-            "transferFunction" : "Linear",
-            "gamma" : 1
-        },
         "metadata" : [
             {
                 "key" : "Software" ,

autotests/read/hdr/orientation6.hdr.json

@@ -1,12 +1,6 @@
 [
     {
         "fileName" : "orientation_all.png",
-        "colorSpace" : {
-            "description" : "Linear sRGB",
-            "primaries" : "SRgb",
-            "transferFunction" : "Linear",
-            "gamma" : 1
-        },
         "metadata" : [
             {
                 "key" : "Software" ,

autotests/read/hdr/orientation7.hdr.json

@@ -1,12 +1,6 @@
 [
     {
         "fileName" : "orientation_all.png",
-        "colorSpace" : {
-            "description" : "Linear sRGB",
-            "primaries" : "SRgb",
-            "transferFunction" : "Linear",
-            "gamma" : 1
-        },
         "metadata" : [
             {
                 "key" : "Software" ,

autotests/read/hdr/orientation8.hdr.json

@@ -1,12 +1,6 @@
 [
     {
         "fileName" : "orientation_all.png",
-        "colorSpace" : {
-            "description" : "Linear sRGB",
-            "primaries" : "SRgb",
-            "transferFunction" : "Linear",
-            "gamma" : 1
-        },
         "metadata" : [
             {
                 "key" : "Software" ,

autotests/read/heif/metadata.heif.json

@@ -1,12 +1,6 @@
 [
     {
         "fileName" : "metadata.png",
-        "colorSpace" : {
-            "description" : "sRGB build-in",
-            "primaries" : "SRgb",
-            "transferFunction" : "SRgb",
-            "gamma" : 0
-        },
         "metadata" : [
             {
                 "key" : "ModificationDate",

autotests/read/iff/cat_ilbm.iff.json

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

autotests/read/iff/cdi_dyuv_each.iff.json

@@ -1,9 +0,0 @@
-[
-    {
-        "fileName" : "cdi_dyuv_each.iff",
-        "resolution" : {
-            "dotsPerMeterX" : 3937,
-            "dotsPerMeterY" : 5249
-        }
-    }
-]

autotests/read/iff/meta_rgba.iff.json

@@ -1,37 +0,0 @@
-[
-    {
-        "fileName" : "metadata.png",
-        "colorSpace" : {
-            "description" : "TICC ICC Profile",
-            "primaries" : "SRgb",
-            "transferFunction" : "SRgb",
-            "gamma" : 0
-        },
-        "metadata" : [
-            {
-                "key" : "Author",
-                "value" : "KDE Project"
-            },
-            {
-                "key" : "Copyright",
-                "value" : "@2025 KDE Project"
-            },
-            {
-                "key" : "CreationDate",
-                "value" : "2025-01-14T10:34:51"
-            },
-            {
-                "key" : "Description",
-                "value" : "TV broadcast test image."
-            },
-            {
-                "key" : "Title",
-                "value" : "Test Card"
-            }
-        ],
-        "resolution" : {
-            "dotsPerMeterX" : 2835,
-            "dotsPerMeterY" : 2835
-        }
-    }
-]