CGATS file : skip on .cht

Author: Jiyone

src/common/colorchecker.c

@@ -99,7 +99,7 @@ static void _dt_color_checker_patch_copy(dt_color_checker_patch *dest, const dt_
   dest->Lab[2] = src->Lab[2];
 }
 
-static void dt_color_checker_copy(dt_color_checker_t *dest, const dt_color_checker_t *src)
+void dt_color_checker_copy(dt_color_checker_t *dest, const dt_color_checker_t *src)
 {
   if(!dest || !src) return;
 
@@ -530,7 +530,7 @@ static gboolean _dispatch_cht_data(GList **boxes, dt_colorchecker_chart_spec_t *
     const char **tokens = (const char **)lines->data;
     if(!tokens) ERROR
 
-    const char *letter = tokens[0][0];
+    const char letter = tokens[0][0];
     if(letter == 'F')
     {
       F_box = _dt_cht_extract_F(tokens);
@@ -714,7 +714,7 @@ static gboolean _dt_CGATS_is_supported(const cmsHANDLE *hIT8)
     goto end;
   }
   else
-  {
+  {    
     const char *CGATS_type = cmsIT8GetProperty(*hIT8, "CGATS");
     // Check if the data type can be found in our supported list of CGATS types
     if(_dt_CGATS_get_type_value(CGATS_type) == CGATS_TYPE_UNKOWN)
@@ -1069,9 +1069,7 @@ static dt_color_checker_patch *_dt_colorchecker_CGATS_fill_patch_values(cmsHANDL
         fprintf(stderr, "error: patch %lu not found in chart specification.\n", patch_iter);
         goto error;
       }
-      _dt_color_checker_patch_copy(&values[patch_iter], p);
-      fprintf(stdout, "Fill patch KEY: %s (%.5f, %.5f)\n", values[patch_iter].name, values[patch_iter].x, values[patch_iter].y); 
-      
+      _dt_color_checker_patch_copy(&values[patch_iter], p);      
     }
     else 
     { 
@@ -1347,14 +1345,19 @@ int dt_colorchecker_find_CGAT_reference_files(GList **ref_colorcheckers_files)
     const char *filename;
     while((filename = g_dir_read_name(dir)) != NULL)
     {
-      dt_colorchecker_label_t *CGATS_label = _dt_colorchecker_user_ref_add_label(filename, user_it8_dir);
-      if(CGATS_label)
+      const char *dot = &filename[safe_strlen(filename) - 1];
+      while(dot && *dot != '.')dot--;
+      if(dot && g_strcmp0(dot, ".cht") != 0)
       {
-        *ref_colorcheckers_files = g_list_append(*ref_colorcheckers_files, CGATS_label);
-        nb++;
+        dt_colorchecker_label_t *CGATS_label = _dt_colorchecker_user_ref_add_label(filename, user_it8_dir);
+        if(CGATS_label)
+        {
+          *ref_colorcheckers_files = g_list_append(*ref_colorcheckers_files, CGATS_label);
+          nb++;
+        }
+        else
+          fprintf(stderr, "Warning: failed to load CGATS file '%s' in %s\n", filename, user_it8_dir);
       }
-      else
-        fprintf(stderr, "Error: failed to load CGATS file '%s' in %s\n", filename, user_it8_dir);
     }
     g_dir_close(dir);
   }

src/common/colorchecker.h

@@ -39,7 +39,7 @@ typedef enum dt_color_checker_targets
 // helper to deal with patch color
 typedef struct dt_color_checker_patch
 {
-  const char *name;       // mnemonic name for the patch
+  char *name;       // mnemonic name for the patch
   dt_aligned_pixel_t Lab; // reference color in CIE Lab
 
   // (x, y) position of the patch  center, relatively to the guides (white dots)