Update dependency version to 6.30.0

unique_ptr will call delete which is not the right thing to do with
memory allocated with new[]

BUGS: 525120

.gitlab-ci.yml

@@ -16,7 +16,7 @@ include:
 
 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-qt611: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_WITH_KNOWN_CRASHES_JXR=ON -DKIMAGEFORMATS_HEIF=ON -DKIMAGEFORMATS_HEIC_TEST:STRING=OFF -DKIMAGEFORMATS_HEIF_TEST:STRING=OFF -DKIMAGEFORMATS_HEJ2_TEST:STRING=OFF -DKIMAGEFORMATS_AVCI_TEST:STRING=OFF"
  per-test-timeout: 90

CMakeLists.txt

@@ -1,11 +1,11 @@
 cmake_minimum_required(VERSION 3.29)
 
-set(KF_VERSION "6.25.0") # handled by release scripts
+set(KF_VERSION "6.30.0") # handled by release scripts
-set(KF_DEP_VERSION "6.25.0") # handled by release scripts
+set(KF_DEP_VERSION "6.30.0") # handled by release scripts
 project(KImageFormats VERSION ${KF_VERSION})
 
 include(FeatureSummary)
-find_package(ECM 6.25.0  NO_MODULE)
+find_package(ECM 6.30.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)
 
@@ -53,10 +53,7 @@ set_package_properties(OpenEXR PROPERTIES
     PURPOSE "Required for the QImage plugin for OpenEXR images"
 )
 
-find_package(libavif 0.8.2 CONFIG QUIET)
+find_package(libavif 1 CONFIG)
-if(NOT libavif_FOUND)
-    find_package(libavif 1 CONFIG)
-endif()
 set_package_properties(libavif PROPERTIES
     TYPE OPTIONAL
     PURPOSE "Required for the QImage plugin for AVIF images"
@@ -65,14 +62,16 @@ 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(KIMAGEFORMATS_HEIC_TEST "ALL" CACHE STRING "Enable HEIC tests: OFF, READ_ONLY, ALL")
-set_property(CACHE KIMAGEFORMATS_HEIF_TEST PROPERTY STRINGS "OFF" "READ_ONLY" "ALL")
+set_property(CACHE KIMAGEFORMATS_HEIC_TEST PROPERTY STRINGS "OFF" "READ_ONLY" "ALL")
+set(KIMAGEFORMATS_HEIF_TEST "ALL" CACHE STRING "Enable HEIF tests: OFF, ALL")
+set_property(CACHE KIMAGEFORMATS_HEIF_TEST PROPERTY STRINGS "OFF" "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)
+    pkg_check_modules(LibHeif IMPORTED_TARGET libheif>=1.17.0)
 endif()
 add_feature_info(LibHeif LibHeif_FOUND "required for the QImage plugin for HEIF/HEIC images")
 
@@ -97,16 +96,17 @@ set_package_properties(LibRaw PROPERTIES
     PURPOSE "Required for the QImage plugin for RAW images"
 )
 
-# JXR plugin disabled by default due to security issues
+# JXR plugin disabled by default due to security issues.
-option(KIMAGEFORMATS_JXR "Enable plugin for JPEG XR format" OFF)
+# You should not enable it unless you know what you are doing.
-if(KIMAGEFORMATS_JXR)
+option(KIMAGEFORMATS_WITH_KNOWN_CRASHES_JXR "Enable plugin for JPEG XR format" OFF)
+if(KIMAGEFORMATS_WITH_KNOWN_CRASHES_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.11.0
-    KF 6.23.0
+    KF 6.27.0
 )
 
 add_subdirectory(src)

README.md

@@ -16,6 +16,7 @@ The following image formats have read-only support:
 
 - Animated Windows cursors (ani)
 - Camera RAW images (arw, cr2, cr3, dcs, dng, ...)
+- Farbfeld (ff)
 - Gimp (xcf)
 - Interchange Format Files (iff, ilbm, lbm)
 - Krita (kra)
@@ -30,13 +31,13 @@ The following image formats have read-only support:
 
 The following image formats have read and write support:
 
-- AV1 Image File Format (avif)
+- AV1 Image File Format (avif, avifs<sup>1</sup>)
 - DirectDraw Surface (dds)
 - Encapsulated PostScript (eps)
-- High Efficiency Image File Format (heif)
+- High Efficiency Image File Format (avci<sup>2</sup>, heic<sup>2</sup>, heif<sup>2</sup>, hej2<sup>2</sup>, hif<sup>2</sup>)
-- JPEG 2000 (jp2, j2k, jpf)
+- JPEG 2000 (jp2, j2k, jpf<sup>1</sup>)
 - JPEG XL (jxl)
-- JPEG XR (jxr)
+- JPEG XR (jxr, hdp<sup>1</sup>, wdp<sup>1</sup>)
 - OpenEXR (exr)
 - Personal Computer Exchange (pcx)
 - Quite OK Image format (qoi)
@@ -44,6 +45,11 @@ The following image formats have read and write support:
 - Softimage PIC (pic)
 - Targa (tga): supports more formats than Qt's version
 
+Footnotes:
+1. Read only support.
+2. It depends on the HEIF plugins installed. 
+
+
 ## Contributing
 
 See the [`QImageIOPlugin`](https://doc.qt.io/qt-6/qimageioplugin.html)
@@ -145,6 +151,7 @@ About the image:
   scanned.
 - `HostComputer`: The computer and/or operating system in use at the time 
   of image creation.
+- `Keywords`: Keywords, separated by semicolons, that represent the image.
 - `Latitude`: Floating-point number indicating the latitude in degrees 
   north of the equator (e.g. 27.717).
 - `Longitude`: Floating-point number indicating the longitude in degrees 
@@ -153,10 +160,35 @@ About the image:
   without milliseconds (e.g. 2024-03-23T15:30:43). This value should be 
   updated every time the image is saved.
 - `Owner`: Name of the owner of the image.
+- `Rating`: Integer number indicating the image rating (usually between 1 
+  and 5).
 - `Software`: Name and version number of the software package(s) used to 
   create the image.
+- `Speed`: Floating-point number indicating the speed of GPS receiver 
+  movement in Km/h (e.g. 30.2).
 - `Title`: The title of the image.
 
+About the shot:
+- `DigitalZoomRatio`: Floating-point number indicating the digital zoom ratio
+  when the image was shot.
+- `ExposureMode`: Integer number indicating the exposure mode set when the 
+  image was shot as reported in the EXIF ​​specifications.
+- `ExposureProgram`: Integer number indicating the class of the program used 
+  by the camera to set exposure when the picture is taken as reported in the 
+  EXIF ​​specifications.
+- `ExposureTime`: Floating-point number indicating the exposure time, 
+  given in seconds (s).
+- `Flash`: Integer number indicating the status of flash when the image 
+  was shot as reported in the EXIF ​​specifications.
+- `FNumber`: Floating-point number indicating the F number.
+- `FocalLength`: Floating-point number indicating the actual focal length 
+  of the lens, in millimeters (mm).
+- `ISOSpeedRatings`: Integer number indicating the sensitivity of the camera 
+  or input device when the image was shot as reported in the EXIF 
+  ​​specifications.
+- `WhiteBalance`: Integer number indicating the white balance mode set when 
+  the image was shot as reported in the EXIF ​​specifications.
+
 About the camera:
 - `Manufacturer`: The manufacturer of the recording equipment.
 - `Model`: The model name or model number of the recording equipment.
@@ -220,21 +252,23 @@ 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()`.
+`QImageReader::allocationLimit()`.
 
 > [!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.
+> `KIF_LARGE_IMAGE_PIXEL_LIMIT` to the desired value in the cmake file. It 
+> cannot be less than 65536.
 
 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
+- ANI: same size as Qt's ICO plugin
 - AVIF: 32,768 x 32,768 pixels, in any case no larger than 256 megapixels
 - DDS: 300,000 x 300,000 pixels
 - EXR: 300,000 x 300,000 pixels
 - EPS: same size as Qt's JPG plugin
+- FF: 300,000 x 300,000 pixels
 - HDR: 300,000 x 300,000 pixels
-- HEIF: n/a
+- HEIF: 65,535 x 65,535 pixels
 - 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
@@ -274,8 +308,18 @@ consumption proportional to the size of the image to be saved.
 Normally this is not a source of problems because the affected plugins
 are limited to maximum images of 2GiB or less.
 
+Note that the value of `QImageReader::allocationLimit()` is only used when 
+allocating a new `QImage`. Since this parameter was created to limit damage 
+caused by corrupted files, any conversion of `QImage` (for example, with 
+`QImage::convertTo()`) is not subject to this limit.
+
 On plugins for formats that support large images, progressive conversion has
 been used or the maximum size of the image that can be saved has been limited.
+Plugins that use external libraries don't always allow progressive decoding 
+(e.g., the JPEG series). In these cases, the memory required for reading 
+may be much larger than the entire decoded image. When the external library has 
+a maximum memory limit function, the value of `QImageReader::allocationLimit()` 
+is set.
 
 ### Non-RGB formats
 
@@ -295,6 +339,11 @@ plugin:
 - `DDS_DISABLE_STRIDE_ALIGNMENT`: disable the stride alignment based on DDS 
   pitch: it is known that some writers do not set it correctly.
 
+When writing, it is possible to set which pixel format to use by setting the
+subtypes. The default is `Automatic` which chooses the most appropriate format
+based on the image. For a complete list of subformats, please use the
+appropriate [`QImageWriter`](https://doc.qt.io/qt-6/qimagewriter.html) APIs.
+
 ### The HEIF plugin
 
 **This plugin is disabled by default. It can be enabled by settings
@@ -305,14 +354,29 @@ distributions. In particular, it is necessary that the HEIF library has
 support for HEVC codec. If HEVC codec is not available the plugin
 will compile but will fail the tests.
 
+The following defines can be defined in cmake to modify the behavior of the 
+plugin:
+- `HEIF_DISABLE_QT_TRANSFORMATION`: HEIF transformations, in addition to 
+  rotations and reflections, also support image cropping. Consequently, the 
+  Qt plugin, must also honor the crop. This define is useful in case 
+  of problems: activating it disables Qt's support for transformations, 
+  delegating them to the HEIF libraries (which will therefore always apply 
+  them regardless of what is requested from Qt).
+
 **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 
+- `KIMAGEFORMATS_HEIC_TEST` to change the behaviour of HEIC tests. Set to
 `"OFF"` (no test at all) or `"READ_ONLY"` (run read tests only).
+Required codecs: HEVC / H.265.
+- `KIMAGEFORMATS_HEIF_TEST` to change the behaviour of HEIF tests. Set to
+`"OFF"` (no test at all).
+Required codecs: uncompressed, deflate, zlib, brotli, jpeg.
 - `KIMAGEFORMATS_HEJ2_TEST` to change the behaviour of HEJ2 tests. Set to 
-`"OFF"` (no test at all) or `"READ_ONLY"` (run read tests only)..
+`"OFF"` (no test at all) or `"READ_ONLY"` (run read tests only).
+Required codecs: JPEG 2000.
 - `KIMAGEFORMATS_AVCI_TEST` to change the behaviour of AVCI tests. Set to 
 `"OFF"` (no test at all).
+Required codecs: Advanced Video Coding / H.264.
 
 ### The EXR plugin
 
@@ -324,6 +388,10 @@ plugin:
   attribute named "xmp". Note that Gimp reads the "xmp" attribute and Darktable 
   writes it as well.
 
+The plugin can set the following additional metadata:
+- `EXRLayerName`: A string containing the name of the EXR layer used to decode 
+   the image.
+
 ### The EPS plugin
 
 The plugin uses `Ghostscript` to convert the raster image. When reading it
@@ -361,7 +429,8 @@ The plugin supports the following image data:
   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.
+- FORM RGFX: It supports uncompressed and ZIP compressed images.
+- FORM DEEP: It supports uncompressed, RLE and TVDC images.
 - FOR4 CIMG (Maya Image File Format): It supports 24/48-bit RGB and 32/64-bit 
   RGBA images.
 
@@ -379,6 +448,11 @@ JP2 plugin has the following limitations due to the lack of support by OpenJPEG:
 - Image resolution is not supported.
 - To write ICC profiles you need OpenJPEG V2.5.4 or higher
 
+When writing, it is possible to set which format to use by setting the 
+following subtypes:
+- `JP2` (default): Save data using the JP2 container.
+- `J2K`: Save only the compressed codestream.
+
 ### The JXL plugin
 
 **The current version of the plugin limits the image size to 256 megapixels
@@ -394,7 +468,17 @@ plugin:
 ### The JXR plugin
 
 **This plugin is disabled by default. It can be enabled by settings
-`KIMAGEFORMATS_JXR` to `ON` in your cmake options.**
+`KIMAGEFORMATS_WITH_KNOWN_CRASHES_JXR` to `ON` in your cmake options.**
+
+> [!caution]
+> The plugin disabled by default due to security issues in [jxrlib](https://github.com/4creators/jxrlib): 
+> the upstream jxrlib is dead and there is no "hope" they will fix the issues.
+>
+> **You should not enable it unless you know what you are doing.**
+
+> [!note]
+> Security issues in the jxrlib discovered by the [KImageFormats OSS-Fuzz project](https://github.com/google/oss-fuzz/tree/master/projects/kimageformats) 
+> should be fixed in this [jxrlib fork](https://github.com/mircomir/jxrlib).
 
 The following defines can be defined in cmake to modify the behavior of the 
 plugin:
@@ -408,20 +492,11 @@ plugin:
   it only wants (P)BGRA32bpp files (a format not supported by Qt). Only for 
   this format an hack is activated to guarantee total compatibility of the 
   plugin with Windows.
-- `JXR_ENABLE_ADVANCED_METADATA`: enable metadata support (e.g. XMP). Some 
-  distributions use an incomplete JXR library that does not allow reading 
-  metadata, causing compilation errors.
 
-### The KRA plugin
+### The KRA and ORA plugin
 
-The KRA format is a ZIP archive containing image data. In particular, the
+Both KRA and ORA formats are ZIP archives containing image data. Specifically,
-rendered image in PNG format is saved in the root: the plugin reads this 
+the rendered PNG image is saved in the root directory: the plugin reads this
-image.
-
-### The ORA plugin
-
-The ORA format is a ZIP archive containing image data. In particular, the
-rendered image in PNG format is saved in the root: the plugin reads this 
 image.
 
 ### The PSD plugin
@@ -443,6 +518,13 @@ plugin:
 - `PSD_NATIVE_CMYK_SUPPORT_DISABLED`: disable native support for CMYK images 
   when compiled with Qt 6.8+
 
+The plugin can set the following additional metadata:
+  - `PSDDuotoneOptions`: Byte array in hexadecimal format of color data of the 
+     duotone specification (the format of which is not documented). From the PSD 
+     specification: *"Other applications that read Photoshop files can treat a 
+     duotone image as a gray image, and just preserve the contents of the duotone 
+     information when reading and writing the file."*
+
 ### The RAW plugin
 
 Loading RAW images always requires a conversion. To allow the user to

autotests/CMakeLists.txt

@@ -76,6 +76,7 @@ endmacro()
 # Loads each <format> image in read/<format>/, and compares the
 # result against the data read from the corresponding png file
 kimageformats_read_tests(
+    ff
     hdr
     iff
     pcx
@@ -118,15 +119,21 @@ if (TARGET avif)
 endif()
 
 if (LibHeif_FOUND)
-    if (KIMAGEFORMATS_HEIF_TEST STREQUAL "ALL" OR KIMAGEFORMATS_HEIF_TEST STREQUAL "READ_ONLY")
+    if (KIMAGEFORMATS_HEIC_TEST STREQUAL "ALL" OR KIMAGEFORMATS_HEIC_TEST STREQUAL "READ_ONLY")
         kimageformats_read_tests(
-            heif
+            heic
         )
     endif()
-    if (KIMAGEFORMATS_HEIF_TEST STREQUAL "ALL")
+    if (KIMAGEFORMATS_HEIC_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
+            heic-nodatacheck-lossless
+        )
+    endif()
+
+    if (KIMAGEFORMATS_HEIF_TEST STREQUAL "ALL")
+        kimageformats_read_tests(
+            heif
         )
     endif()
 

autotests/README.md

@@ -23,7 +23,11 @@ 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).
+instance, TIFF for image formats not supported by PNG (e.g. CMYK images) and, 
+as a last choice, lossy JPG for large images.
+
+> [!important]
+> Keep the size of individual test images on the order of a few tens of KiB.
 
 Some image options such as `QImageIOHandler::Size`, 
 `QImageIOHandler::ImageFormat` and `QImageIOHandler::ImageTransformation` are 
@@ -48,7 +52,7 @@ 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).
+(normally 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 

autotests/ossfuzz/build_fuzzers.sh

@@ -26,8 +26,8 @@ export LDFLAGS
 
 # build zstd
 cd $SRC/zstd
-cmake -S build/cmake -DBUILD_SHARED_LIBS=OFF
+cmake -G Ninja -S build/cmake -DBUILD_SHARED_LIBS=OFF -DZSTD_BUILD_PROGRAMS=OFF -DBUILD_TESTING=OFF
-make install -j$(nproc)
+ninja install
 
 # Build zlib
 cd $SRC/zlib
@@ -70,13 +70,13 @@ cmake --install .
 
 # Build extra-cmake-modules
 cd $SRC/extra-cmake-modules
-cmake . -DBUILD_TESTING=OFF
+cmake -G Ninja . -DBUILD_TESTING=OFF -DBUILD_DOC=OFF
-make install -j$(nproc)
+ninja install
 
 cd $SRC/karchive
 rm -rf poqm
-cmake . -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=OFF -DCMAKE_INSTALL_PREFIX=/usr/local
+cmake -G Ninja . -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=OFF -DCMAKE_INSTALL_PREFIX=/usr/local
-make install -j$(nproc)
+ninja install
 
 # Build JXRlib
 cd $SRC/jxrlib
@@ -101,31 +101,28 @@ 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}" ..
+cmake -G Ninja -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)
+ninja install
-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 ..
+CFLAGS="$CFLAGS -fPIC" cmake -G Ninja -DBUILD_SHARED_LIBS=OFF -DAVIF_ENABLE_WERROR=OFF -DAVIF_CODEC_AOM=LOCAL -DAVIF_LIBYUV=OFF ..
-make -j$(nproc)
+ninja
 
 # Build libde265
 cd $SRC/libde265
-cmake -DBUILD_SHARED_LIBS=OFF -DDISABLE_SSE=ON .
+cmake -G Ninja -DBUILD_SHARED_LIBS=OFF -DENABLE_SDL=OFF -DENABLE_SIMD=OFF -DENABLE_AVX2=OFF -DENABLE_AVX512=OFF .
-make -j$(nproc)
+ninja install
-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 ..
+cmake -G Ninja -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON -DBUILD_CODEC=OFF ..
-make -j$(nproc)
+ninja install
-make install -j$(nproc)
 
 # build openh264
 cd $SRC/openh264
@@ -135,9 +132,15 @@ make USE_ASM=No BUILDTYPE=Debug install-static -j$(nproc)
 cd $SRC/openexr
 mkdir _build
 cd _build
-cmake  -DBUILD_SHARED_LIBS=OFF ..
+cmake -G Ninja -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=OFF -DOPENEXR_BUILD_TOOLS=OFF -DOPENEXR_INSTALL_TOOLS=OFF -DOPENEXR_BUILD_EXAMPLES=OFF -DOPENEXR_TEST_LIBRARIES=OFF -DOPENEXR_TEST_TOOLS=OFF -DOPENEXR_TEST_PYTHON=OFF ..
-make -j$(nproc)
+ninja install
-make install -j$(nproc)
+
+# Build libjxl
+cd $SRC/libjxl
+mkdir build
+cd build
+CXXFLAGS="$CXXFLAGS -DHWY_COMPILE_ONLY_SCALAR" cmake -G Ninja -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_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 ..
+ninja install
 
 # Build libheif
 cd $SRC/libheif
@@ -146,55 +149,50 @@ sed -i "s/static const int MAX_IMAGE_WIDTH = 32768;/static const int MAX_IMAGE_W
 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 ..
+cmake -G Ninja -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=OFF -DENABLE_PLUGIN_LOADING=OFF -DWITH_EXAMPLES=OFF -DBUILD_DOCUMENTATION=OFF -DWITH_LIBSHARPYUV=OFF -DWITH_UNCOMPRESSED_CODEC=ON -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_X264=OFF -DWITH_OpenJPEG_DECODER=ON -DWITH_OpenH264_DECODER=ON ..
-make -j$(nproc)
+ninja install
-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
+HANDLER_TYPES="ani
-        QAVIFHandler avif
+        avif
-        QDDSHandler dds
+        dds
-        EXRHandler exr
+        exr
-        HDRHandler hdr
+        ff
-        HEIFHandler heif
+        hdr
-        IFFHandler iff
+        heif
-        JP2Handler jp2
+        iff
-        QJpegXLHandler jxl
+        jp2
-        JXRHandler jxr
+        jxl
-        KraHandler kra
+        jxr
-        OraHandler ora
+        kra
-        PCXHandler pcx
+        pcx
-        PFMHandler pfm
+        pfm
-        SoftimagePICHandler pic
+        pic
-        PSDHandler psd
+        psd
-        PXRHandler pxr
+        pxr
-        QOIHandler qoi
+        qoi
-        RASHandler ras
+        ras
-        RAWHandler raw
+        raw
-        RGBHandler rgb
+        rgb
-        ScitexHandler sct
+        sct
-        TIMHandler tim
+        tim
-        TGAHandler tga
+        tga
-        XCFHandler xcf"
+        xcf"
 
-echo "$HANDLER_TYPES" | while read class format; do
+echo "$HANDLER_TYPES" | while read 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
+  $CXX $CXXFLAGS $LDFLAGS -fPIC -DKIMG_FUZZER_${format}=1 -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 -D__ANSI__ -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_4.a /usr/local/lib/libIex-3_4.a /usr/local/lib/libImath-3_2.a /usr/local/lib/libIlmThread-3_4.a /usr/local/lib/libOpenEXRCore-3_4.a /usr/local/lib/libOpenEXRUtil-3_4.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
+
+# Manually add other supported extensions to HEIF seed corpus
+find . -type f \( -name "*.avci" -o -name "*.heic" -o -name "*.hej2" \) | zip -q $OUT/kimgio_heif_fuzzer_seed_corpus.zip -@

autotests/ossfuzz/kimgio_fuzzer.cc

@@ -23,45 +23,101 @@
   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|tim|tga|xcf]_fuzzer
+    python infra/helper.py run_fuzzer kimageformats kimgio_[ani|avif|dds|exr|ff|hdr|heif|iff|jp2|jxl|jxr|kra|pcx|pfm|pic|psd|pxr|qoi|ras|raw|rgb|sct|tim|tga|xcf]_fuzzer
 */
 
 #include <QBuffer>
 #include <QCoreApplication>
 #include <QImage>
+#include <QImageReader>
 
+#if defined KIMG_FUZZER_ani
 #include "ani_p.h"
+#define HANDLER ANIHandler
+#elif defined KIMG_FUZZER_avif
 #include "avif_p.h"
+#define HANDLER QAVIFHandler
+#elif defined KIMG_FUZZER_dds
 #include "dds_p.h"
+#define HANDLER QDDSHandler
+#elif defined KIMG_FUZZER_exr
 #include "exr_p.h"
+#define HANDLER EXRHandler
+#elif defined KIMG_FUZZER_ff
+#include "ff_p.h"
+#define HANDLER FFHandler
+#elif defined KIMG_FUZZER_hdr
 #include "hdr_p.h"
+#define HANDLER HDRHandler
+#elif defined KIMG_FUZZER_heif
 #include "heif_p.h"
+#define HANDLER HEIFHandler
+#elif defined KIMG_FUZZER_iff
 #include "iff_p.h"
+#define HANDLER IFFHandler
+#elif defined KIMG_FUZZER_jp2
 #include "jp2_p.h"
+#define HANDLER JP2Handler
+#elif defined KIMG_FUZZER_jxl
 #include "jxl_p.h"
+#define HANDLER QJpegXLHandler
+#elif defined KIMG_FUZZER_jxr
 #include "jxr_p.h"
-#include "kra.h"
+#define HANDLER JXRHandler
-#include "ora.h"
+#elif defined KIMG_FUZZER_kra
+#include "kra_p.h"
+#define HANDLER KraHandler
+#elif defined KIMG_FUZZER_pcx
 #include "pcx_p.h"
+#define HANDLER PCXHandler
+#elif defined KIMG_FUZZER_pfm
 #include "pfm_p.h"
+#define HANDLER PFMHandler
+#elif defined KIMG_FUZZER_pic
 #include "pic_p.h"
+#define HANDLER SoftimagePICHandler
+#elif defined KIMG_FUZZER_psd
 #include "psd_p.h"
+#define HANDLER PSDHandler
+#elif defined KIMG_FUZZER_pxr
 #include "pxr_p.h"
+#define HANDLER PXRHandler
+#elif defined KIMG_FUZZER_qoi
 #include "qoi_p.h"
+#define HANDLER QOIHandler
+#elif defined KIMG_FUZZER_ras
 #include "ras_p.h"
+#define HANDLER RASHandler
+#elif defined KIMG_FUZZER_raw
 #include "raw_p.h"
+#define HANDLER RAWHandler
+#elif defined KIMG_FUZZER_rgb
 #include "rgb_p.h"
+#define HANDLER RGBHandler
+#elif defined KIMG_FUZZER_sct
 #include "sct_p.h"
+#define HANDLER ScitexHandler
+#elif defined KIMG_FUZZER_tim
 #include "tim_p.h"
+#define HANDLER TIMHandler
+#elif defined KIMG_FUZZER_tga
 #include "tga_p.h"
+#define HANDLER TGAHandler
+#elif defined KIMG_FUZZER_xcf
 #include "xcf_p.h"
+#define HANDLER XCFHandler
+#else
+#error "KIMG_FUZZER_format not defined!"
+#endif
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
 {
     int argc = 0;
     QCoreApplication a(argc, nullptr);
 
-    QImageIOHandler* handler = new HANDLER();
+    QImageReader::setAllocationLimit(512);
+
+    QImageIOHandler *handler = new HANDLER();
 
     QImage i;
     QBuffer b;
@@ -69,7 +125,27 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
     b.open(QIODevice::ReadOnly);
     handler->setDevice(&b);
     handler->canRead();
-    handler->read(&i);
+
+    bool is_animated = false;
+    if (handler->supportsOption(QImageIOHandler::Animation)) {
+        is_animated = handler->option(QImageIOHandler::Animation).toBool();
+    }
+
+    if (is_animated) { // animated image
+        if (handler->supportsOption(QImageIOHandler::Size)) {
+            handler->option(QImageIOHandler::Size).toSize();
+        }
+
+        handler->imageCount();
+        handler->loopCount();
+        handler->read(&i);
+        handler->nextImageDelay();
+        handler->currentImageNumber();
+        handler->jumpToImage(0);
+        handler->jumpToNextImage();
+    } else { // static image
+        handler->read(&i);
+    }
 
     delete handler;
 

autotests/ossfuzz/prepare_build.sh

@@ -27,14 +27,14 @@ apt-get update && \
 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 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 --branch=RB-3.4 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.13.1 https://aomedia.googlesource.com/aom
+git clone --depth 1 -b v3.14.1 https://aomedia.googlesource.com/aom
-git clone --depth 1 -b v1.3.0 https://github.com/AOMediaCodec/libavif.git
+git clone --depth 1 -b v1.4.2 https://github.com/AOMediaCodec/libavif.git
 git clone --depth 1 https://github.com/strukturag/libde265.git
 git clone --depth 1 -b v2.5.4 https://github.com/uclouvain/openjpeg.git
 git clone --depth 1 https://github.com/strukturag/libheif.git

autotests/read/avif/invalid-exif.avif.json

@@ -0,0 +1,7 @@
+[
+    {
+        "fileName": "invalid-exif.jpg",
+        "fuzziness": 30,
+        "description": "Minimum fuzziness value to pass the test on all architectures."
+    }
+]

autotests/read/exr/ps2026_testcard_rgb.exr.json

@@ -0,0 +1,15 @@
+[
+    {
+        "fileName" : "ps2026_testcard_rgb.png",
+        "colorSpace" : {
+            "description" : "sRGB build-in (Profilo RGB lineare)",
+            "primaries" : "SRgb",
+            "transferFunction" : "Linear",
+            "gamma" : 1
+        },
+        "resolution" : {
+            "dotsPerMeterX" : 3937,
+            "dotsPerMeterY" : 3937
+        }
+    }
+]

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

@@ -2,7 +2,7 @@
     {
         "fileName" : "rgb-gimp.png",
         "colorSpace" : {
-            "description" : "",
+            "description" : "Embedded RGB (linear)",
             "primaries" : "Custom",
             "transferFunction" : "Linear",
             "gamma" : 1

autotests/read/heic/konqi.heic.json

@@ -0,0 +1,7 @@
+[
+    {
+        "fileName": "konqi.jpg",
+        "fuzziness": 72,
+        "description": "Minimum fuzziness value to pass the test on all architectures."
+    }
+]

autotests/read/heic/orientation1.heic.json

@@ -0,0 +1,17 @@
+[
+    {
+        "fileName" : "orientation_all.png",
+        "colorSpace" : {
+            "description" : "GIMP built-in sRGB",
+            "primaries" : "SRgb",
+            "transferFunction" : "SRgb",
+            "gamma" : 0
+        },
+        "metadata" : [
+            {
+                "key" : "Software" ,
+                "value" : "LIFE Pro 2.20.35 (Linux)"
+            }
+        ]
+    }
+]

autotests/read/heic/orientation2.heic.json

@@ -0,0 +1,11 @@
+[
+    {
+        "fileName" : "orientation_all.png",
+        "metadata" : [
+            {
+                "key" : "Software" ,
+                "value" : "LIFE Pro 2.20.35 (Linux)"
+            }
+        ]
+    }
+]

autotests/read/heic/orientation3.heic.json

@@ -0,0 +1,11 @@
+[
+    {
+        "fileName" : "orientation_all.png",
+        "metadata" : [
+            {
+                "key" : "Software" ,
+                "value" : "LIFE Pro 2.20.35 (Linux)"
+            }
+        ]
+    }
+]

autotests/read/heic/orientation4.heic.json

@@ -0,0 +1,11 @@
+[
+    {
+        "fileName" : "orientation_all.png",
+        "metadata" : [
+            {
+                "key" : "Software" ,
+                "value" : "LIFE Pro 2.20.35 (Linux)"
+            }
+        ]
+    }
+]

autotests/read/heic/orientation5.heic.json

@@ -0,0 +1,11 @@
+[
+    {
+        "fileName" : "orientation_all.png",
+        "metadata" : [
+            {
+                "key" : "Software" ,
+                "value" : "LIFE Pro 2.20.35 (Linux)"
+            }
+        ]
+    }
+]

autotests/read/heic/orientation6.heic.json

@@ -0,0 +1,11 @@
+[
+    {
+        "fileName" : "orientation_all.png",
+        "metadata" : [
+            {
+                "key" : "Software" ,
+                "value" : "LIFE Pro 2.20.35 (Linux)"
+            }
+        ]
+    }
+]

autotests/read/heic/orientation7.heic.json

@@ -0,0 +1,11 @@
+[
+    {
+        "fileName" : "orientation_all.png",
+        "metadata" : [
+            {
+                "key" : "Software" ,
+                "value" : "LIFE Pro 2.20.35 (Linux)"
+            }
+        ]
+    }
+]

autotests/read/heic/orientation8.heic.json

@@ -0,0 +1,11 @@
+[
+    {
+        "fileName" : "orientation_all.png",
+        "metadata" : [
+            {
+                "key" : "Software" ,
+                "value" : "LIFE Pro 2.20.35 (Linux)"
+            }
+        ]
+    }
+]

autotests/read/heif/jpeg.heif.json

@@ -0,0 +1,7 @@
+[
+    {
+        "fileName" : "jpeg.png",
+        "fuzziness" : 1,
+        "description" : "Minimum fuzziness value to pass the test on all architectures."
+    }
+]

autotests/read/iff/sv5_idx8z_rgx.iff.json

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

autotests/read/iff/sv5_rgb16z_rgx.iff.json

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

autotests/read/iff/sv5_rgb32z_rgx.iff.json

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

autotests/read/iff/sv5_rgb8z_rgx.iff.json

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