Enable exiv2 ISOBMFF support for CR3 and HEIF files

Author: cytrinox

DefineOptions.cmake

@@ -21,6 +21,7 @@ option(USE_OPENJPEG "Enable JPEG 2000 support" ON)
 option(USE_WEBP "Enable WebP export support" ON)
 option(USE_AVIF "Enable AVIF support" ON)
 option(USE_XCF "Enable XCF support" ON)
+option(USE_ISOBMFF "Enable ISOBMFF support" ON)
 option(BUILD_CMSTEST "Build a test program to check your system's color management setup" ON)
 option(USE_OPENEXR "Enable OpenEXR support" ON)
 option(BUILD_PRINT "Build the print module" ON)

cmake/modules/FindExiv2.cmake

@@ -4,6 +4,7 @@
 #  EXIV2_INCLUDE_DIR, where to find png.h, etc.
 #  EXIV2_LIBRARIES, the libraries to link against to use exiv2
 #  EXIV2_FOUND, If false, do not try to use exiv2
+#  EXIV2_VERSION, version string for exiv2
 # also defined, but not for general use are
 #  EXIV2_LIBRARY, where to find the exiv2 library
 
@@ -50,4 +51,5 @@ find_package_handle_standard_args(Exiv2 DEFAULT_MSG Exiv2_LIBRARY Exiv2_INCLUDE_
 IF(Exiv2_FOUND)
   set(Exiv2_LIBRARIES ${Exiv2_LIBRARY})
   set(Exiv2_INCLUDE_DIRS ${Exiv2_INCLUDE_DIR})
+  set(Exiv2_VERSION ${Exiv2_PKGCONF_VERSION})
 ENDIF(Exiv2_FOUND)

src/CMakeLists.txt

@@ -3,6 +3,7 @@ add_subdirectory(external)
 include(CheckCCompilerFlag)
 include(CheckCXXCompilerFlag)
 include(CheckCSourceCompiles)
+include(CheckCXXSymbolExists)
 
 #
 # Add files for libdarktable
@@ -389,6 +390,25 @@ include_directories(SYSTEM ${Exiv2_INCLUDE_DIRS})
 list(APPEND LIBS ${Exiv2_LIBRARIES})
 add_definitions(${Exiv2_DEFINITIONS})
 
+# Optionally enable ISOBMFF support in Exiv2
+if (USE_ISOBMFF)
+  if(Exiv2_VERSION VERSION_GREATER_EQUAL "0.27.4")
+    # exiv2 >= 0.27.4 provides optional support for ISOBMFF files.
+    # This must be manually enabled during exiv2 build and can be checked with
+    # the EXV_ENABLE_BMFF symbol.
+    check_cxx_symbol_exists(EXV_ENABLE_BMFF "exiv2/exiv2.hpp" HAVE_EXV_ENABLE_BMFF)
+    if(HAVE_EXV_ENABLE_BMFF)
+      add_definitions(-DHAVE_LIBEXIV2_WITH_ISOBMFF=1)
+      set(DT_SUPPORTED_EXTENSIONS ${DT_SUPPORTED_EXTENSIONS} cr3 heif CACHE INTERNAL "")
+      message(STATUS "Exiv2 >= 0.27.4 found with ISOBMFF support (CR3, AVIF, HEIF)")
+    else()
+      message(STATUS "Exiv2 >= 0.27.4 found, but was not compiled with ISOBMFF support (CR3, AVIF, HEIF)")
+    endif()
+  else()
+    message(STATUS "Exiv2 <= 0.27.4 found, no support for ISOBMFF files (CR3, AVIF, HEIF)")
+  endif()
+endif()
+
 if(USE_OPENJPEG)
   find_package(OpenJPEG)
   if(OpenJPEG_FOUND)

src/common/exif.cc

@@ -4223,6 +4223,10 @@ void dt_exif_init()
   // preface the exiv2 messages with "[exiv2] "
   Exiv2::LogMsg::setHandler(&dt_exif_log_handler);
 
+  #ifdef HAVE_LIBEXIV2_WITH_ISOBMFF
+  Exiv2::enableBMFF();
+  #endif
+
   Exiv2::XmpParser::initialize();
   // this has to stay with the old url (namespace already propagated outside dt)
   Exiv2::XmpProperties::registerNs("http://darktable.sf.net/", "darktable");