Merge pull request #18054 from victoryforce/import-cineon-kodak-images

[imageio] Support for reading of Cineon Kodak images
darktable-org · Jan 21, 2025 · ac38544 · ac38544
2 parents ab8e1cc + 3572dec
commit ac38544
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -556,7 +556,7 @@ if(USE_GRAPHICSMAGICK)
   find_package(GraphicsMagick)
   if(GraphicsMagick_FOUND)
     add_definitions(-DHAVE_GRAPHICSMAGICK)
-    set(DT_SUPPORTED_EXTENSIONS ${DT_SUPPORTED_EXTENSIONS} bmp dcm fit fits fts gif jng jp2 jpc jpf jpx miff mng pam webp jxl CACHE INTERNAL "")
+    set(DT_SUPPORTED_EXTENSIONS ${DT_SUPPORTED_EXTENSIONS} bmp cin dcm fit fits fts gif jng jp2 jpc jpf jpx miff mng pam webp jxl CACHE INTERNAL "")
     include_directories(SYSTEM ${GraphicsMagick_INCLUDE_DIRS})
     list(APPEND LIBS ${GraphicsMagick_LIBRARIES})
     list(APPEND SOURCES "imageio/imageio_gm.c")
@@ -580,7 +580,7 @@ if(USE_IMAGEMAGICK AND NOT GraphicsMagick_FOUND)
       list(APPEND LIBS ${ImageMagick_LIBRARY})
       unset(ImageMagick_LIBRARY CACHE)
     endforeach(lib)
-    set(DT_SUPPORTED_EXTENSIONS ${DT_SUPPORTED_EXTENSIONS} bmp dcm fit fits fts gif jng jp2 jpc jpf jpx miff mng pam webp jxl CACHE INTERNAL "")
+    set(DT_SUPPORTED_EXTENSIONS ${DT_SUPPORTED_EXTENSIONS} bmp cin dcm fit fits fts gif jng jp2 jpc jpf jpx miff mng pam webp jxl CACHE INTERNAL "")
   endif(ImageMagick_FOUND)
 endif(USE_IMAGEMAGICK AND NOT GraphicsMagick_FOUND)
 

diff --git a/src/imageio/imageio_gm.c b/src/imageio/imageio_gm.c
@@ -38,7 +38,7 @@ static gboolean _supported_image(const gchar *filename)
   const char *extensions_whitelist[] = { "tiff", "tif", "pbm", "pgm", "ppm", "pnm",
                                          "webp", "jpc", "jp2", "jpf", "jpx", "bmp",
                                          "miff", "dcm", "jng", "mng", "pam", "gif",
-                                         "fits", "fit", "fts", "jxl", NULL };
+                                         "fits", "fit", "fts", "jxl", "cin", NULL };
   gboolean supported = FALSE;
   char *ext = g_strrstr(filename, ".");
   if(!ext) return FALSE;

diff --git a/src/imageio/imageio_im.c b/src/imageio/imageio_im.c
@@ -45,7 +45,7 @@ static gboolean _supported_image(const gchar *filename)
   const char *extensions_whitelist[] = { "tiff", "tif", "pbm", "pgm", "ppm", "pnm",
                                          "webp", "jpc", "jp2", "jpf", "jpx", "bmp",
                                          "miff", "dcm", "jng", "mng", "pam", "gif",
-                                         "fits", "fit", "fts", "jxl", NULL };
+                                         "fits", "fit", "fts", "jxl", "cin", NULL };
   gboolean supported = FALSE;
   char *ext = g_strrstr(filename, ".");
   if(!ext) return FALSE;