#10117: remove unnecessary early handling of potentially bad icc prof…

…iles, let lcms decide
darktable-org · Sep 29, 2014 · a9149a7 · a9149a7
1 parent 67d53c3
commit a9149a7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 18 deletions.
diff --git a/src/common/imageio_tiff.c b/src/common/imageio_tiff.c
@@ -246,14 +246,7 @@ int dt_imageio_tiff_read_profile(const char *filename, uint8_t **out)
 
   TIFFGetField(tiff, TIFFTAG_SAMPLESPERPIXEL, &spp);
 
-  if(spp != 3 && spp != 4)
-  {
-    TIFFClose(tiff);
-    return -1;
-  }
-
-  if((spp == 3 || spp == 4) &&
-      TIFFGetField(tiff, TIFFTAG_ICCPROFILE, &profile_len, &profile))
+  if(TIFFGetField(tiff, TIFFTAG_ICCPROFILE, &profile_len, &profile))
   {
     *out = (uint8_t*)malloc(profile_len);
     memcpy(*out, profile, profile_len);

diff --git a/src/iop/colorin.c b/src/iop/colorin.c
@@ -920,16 +920,8 @@ void reload_defaults(dt_iop_module_t *module)
     else if(!strcmp(ext, "tif") || !strcmp(ext, "tiff"))
     {
       dt_image_t *img = dt_image_cache_write_get(darktable.image_cache, cimg);
-      const int profile_size = dt_imageio_tiff_read_profile(filename, &img->profile);
-      if(profile_size == -1)
-      {
-        dt_control_log(_("unsupported input profile has been ignored!"));
-      }
-      else
-      {
-        img->profile_size = profile_size;
-        use_eprofile = (img->profile_size > 0);
-      }
+      img->profile_size = dt_imageio_tiff_read_profile(filename, &img->profile);
+      use_eprofile = (img->profile_size > 0);
       dt_image_cache_write_release(darktable.image_cache, img, DT_IMAGE_CACHE_RELAXED);
     }
     else if(!strcmp(ext, "png"))