Fix build with older openEXR versions

Dynamic exception specification is not allowed in c++-17. The enforcement needs to be relaxed for the kimg_exr plugin when using openEXR versions older than 2.3.0. (cherry picked from commit 3266a9c466)
Remove CMAKE_CXX_STANDARD, now set to 17 in KDEFrameworkCompilerSettings in ECM
2026-01-11 22:02:44 -05:00 · 2021-07-10 08:49:14 +00:00 · 2021-06-19 20:05:41 +02:00 · 2021-06-19 15:58:16 +00:00 · 2021-06-08 15:20:41 +02:00
3 changed files with 10 additions and 3 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -2,10 +2,8 @@ cmake_minimum_required(VERSION 3.16)

 project(KImageFormats)

-set (CMAKE_CXX_STANDARD 14)
-
 include(FeatureSummary)
-find_package(ECM 5.83.0  NO_MODULE)
+find_package(ECM 5.84.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)

--- a/src/imageformats/CMakeLists.txt
+++ b/src/imageformats/CMakeLists.txt
@ -61,6 +61,11 @@ if(OpenEXR_FOUND)
    if(TARGET OpenEXR::OpenEXR)
        target_link_libraries(kimg_exr OpenEXR::OpenEXR)
    else()
+        if(OpenEXR_VERSION_STRING VERSION_LESS 2.3.0)
+            # Older OpenEXR versions use dynamic exception specifications, so
+            # cannot use C++17 with them
+            set_target_properties(kimg_exr PROPERTIES CXX_STANDARD 14)
+        endif()
        target_link_libraries(kimg_exr OpenEXR::IlmImf)
    endif()
    kde_target_enable_exceptions(kimg_exr PRIVATE)
--- a/src/imageformats/avif.cpp
+++ b/src/imageformats/avif.cpp
@ -97,6 +97,10 @@ bool QAVIFHandler::ensureDecoder()

    m_decoder = avifDecoderCreate();

+#if AVIF_VERSION >= 90100
+    m_decoder->strictFlags = AVIF_STRICT_DISABLED;
+#endif
+
    avifResult decodeResult;

    decodeResult = avifDecoderSetIOMemory(m_decoder, m_rawAvifData.data, m_rawAvifData.size);
Author	SHA1	Message	Date
Christophe Giboudeaux	9b7c24df27	Fix build with older openEXR versions Dynamic exception specification is not allowed in c++-17. The enforcement needs to be relaxed for the kimg_exr plugin when using openEXR versions older than 2.3.0. (cherry picked from commit `3266a9c466`)	2021-07-10 08:49:14 +00:00
Ahmad Samir	1b2bf6e931	Remove CMAKE_CXX_STANDARD, now set to 17 in KDEFrameworkCompilerSettings in ECM NO_CHANGELOG	2021-06-19 20:05:41 +02:00
l10n daemon script	894391b000	GIT_SILENT Upgrade ECM and KF version requirements for 5.84.0 release.	2021-06-19 15:58:16 +00:00
Daniel Novomesky	ef6be2c077	avif: Disable all strict decoder checks New libavif 0.9.1 apply some very strict standard compliance checks by default. Unfortunately, it rejects many files made by libheif-based apps (GIMP, ImageMagick) in the past. libheif 1.12.0 (released on May 5, 2021) addressed the problem, but it would be good to extend grace period, allowing other projects and distributions to upgrade to fixed version.	2021-06-08 15:20:41 +02:00