Raster Mask: PNG support and image folder (#20170)

Author: AyedaOk

src/iop/rasterfile.c

@@ -20,6 +20,7 @@
 #include "config.h"
 #endif
 #include <math.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -33,6 +34,7 @@
 #include "common/interpolation.h"
 #include "common/fast_guided_filter.h"
 #include "common/pfm.h"
+#include "imageio/imageio_png.h"
 #include "gui/accelerators.h"
 #include "gui/gtk.h"
 
@@ -96,7 +98,7 @@ const char *aliases()
 const char **description(dt_iop_module_t *self)
 {
   return dt_iop_set_description(self,
-      _("read PFM files recorded for use as raster masks"),
+      _("read PFM/PNG files recorded for use as raster masks"),
       _("corrective or creative"),
       _("linear, raw, scene-referred"),
       _("linear, raw"),
@@ -159,6 +161,87 @@ static float *_read_rasterfile(char *filename,
   *sheight = 0;
   if(!filename || filename[0] == 0) return NULL;
 
+  const char *extension = g_strrstr(filename, ".");
+  const gboolean is_png = extension && !g_ascii_strcasecmp(extension, ".png");
+
+  if(is_png)
+  {
+    dt_imageio_png_t png;
+    if(!dt_imageio_png_read_header(filename, &png))
+    {
+      dt_print(DT_DEBUG_ALWAYS, "failed to read PNG header from '%s'", filename ? filename : "???");
+      dt_control_log(_("can't read raster mask file '%s'"), filename ? filename : "???");
+      return NULL;
+    }
+
+    const size_t rowbytes = png_get_rowbytes(png.png_ptr, png.info_ptr);
+    uint8_t *buf = dt_alloc_aligned((size_t)png.height * rowbytes);
+    if(!buf)
+    {
+      fclose(png.f);
+      png_destroy_read_struct(&png.png_ptr, &png.info_ptr, NULL);
+      dt_print(DT_DEBUG_ALWAYS, "can't read raster mask file '%s'", filename ? filename : "???");
+      dt_control_log(_("can't read raster mask file '%s'"), filename ? filename : "???");
+      return NULL;
+    }
+
+    if(!dt_imageio_png_read_image(&png, buf))
+    {
+      dt_free_align(buf);
+      dt_print(DT_DEBUG_ALWAYS, "can't read raster mask file '%s'", filename ? filename : "???");
+      dt_control_log(_("can't read raster mask file '%s'"), filename ? filename : "???");
+      return NULL;
+    }
+
+    const int width = png.width;
+    const int height = png.height;
+    float *mask = dt_iop_image_alloc(width, height, 1);
+    if(!mask)
+    {
+      dt_free_align(buf);
+      dt_print(DT_DEBUG_ALWAYS, "can't read raster mask file '%s'", filename ? filename : "???");
+      dt_control_log(_("can't read raster mask file '%s'"), filename ? filename : "???");
+      return NULL;
+    }
+
+    if(png.bit_depth < 16)
+    {
+      const float normalizer = 1.0f / 255.0f;
+      DT_OMP_FOR()
+      for(size_t k = 0; k < (size_t)width * height; k++)
+      {
+        const size_t base = 3 * k;
+        float val = 0.0f;
+        if(mode & DT_RASTERFILE_MODE_RED)   val = MAX(val, buf[base] * normalizer);
+        if(mode & DT_RASTERFILE_MODE_GREEN) val = MAX(val, buf[base + 1] * normalizer);
+        if(mode & DT_RASTERFILE_MODE_BLUE)  val = MAX(val, buf[base + 2] * normalizer);
+        mask[k] = CLIP(val);
+      }
+    }
+    else
+    {
+      const float normalizer = 1.0f / 65535.0f;
+      DT_OMP_FOR()
+      for(size_t k = 0; k < (size_t)width * height; k++)
+      {
+        const size_t base = 6 * k;
+        const float red = (buf[base] * 256.0f + buf[base + 1]) * normalizer;
+        const float green = (buf[base + 2] * 256.0f + buf[base + 3]) * normalizer;
+        const float blue = (buf[base + 4] * 256.0f + buf[base + 5]) * normalizer;
+        float val = 0.0f;
+        if(mode & DT_RASTERFILE_MODE_RED)   val = MAX(val, red);
+        if(mode & DT_RASTERFILE_MODE_GREEN) val = MAX(val, green);
+        if(mode & DT_RASTERFILE_MODE_BLUE)  val = MAX(val, blue);
+        mask[k] = CLIP(val);
+      }
+    }
+
+    dt_free_align(buf);
+    *swidth = width;
+    *sheight = height;
+    return mask;
+  }
+
   int width, height, channels, error = 0;
   float *image = dt_read_pfm(filename, &error, &width, &height, &channels, 3);
   float *mask = dt_iop_image_alloc(width, height, 1);
@@ -191,14 +274,11 @@ static float *_read_rasterfile(char *filename,
 static int _check_extension(const struct dirent *namestruct)
 {
   const char *filename = namestruct->d_name;
-  int res = 0;
-  if(!filename || !filename[0]) return res;
-  char *p = g_strrstr(filename, ".");
-  if(!p) return res;
-  char *fext = g_ascii_strdown(g_strdup(p), -1);
-  if(!g_strcmp0(fext, ".pfm")) res = 1;
-  g_free(fext);
-  return res;
+  if(!filename || !filename[0]) return 0;
+  const char *p = g_strrstr(filename, ".");
+  return p
+         && (!g_ascii_strcasecmp(p, ".pfm")
+             || !g_ascii_strcasecmp(p, ".png"));
 }
 
 static void _update_filepath(dt_iop_module_t *self)
@@ -263,9 +343,11 @@ static void _fbutton_clicked(GtkWidget *widget, dt_iop_module_t *self)
   gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(filechooser), FALSE);
   gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(filechooser), mfolder);
   GtkFileFilter *filter = GTK_FILE_FILTER(gtk_file_filter_new());
-  // only pfm files yet supported
+  // only pfm/png files yet supported
   gtk_file_filter_add_pattern(filter, "*.pfm");
   gtk_file_filter_add_pattern(filter, "*.PFM");
+  gtk_file_filter_add_pattern(filter, "*.png");
+  gtk_file_filter_add_pattern(filter, "*.PNG");
   gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(filechooser), filter);
   gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(filechooser), filter);
 
@@ -592,7 +674,7 @@ void gui_init(dt_iop_module_t *self)
 
   g->fbutton = dtgtk_button_new(dtgtk_cairo_paint_directory, CPF_NONE, NULL);
   gtk_widget_set_name(g->fbutton, "non-flat");
-  gtk_widget_set_tooltip_text(g->fbutton, _("select the PFM file recorded as a raster mask,\n"
+  gtk_widget_set_tooltip_text(g->fbutton, _("select the PFM/PNG file recorded as a raster mask,\n"
       "CAUTION: path must be set in preferences/processing before choosing"));
   g_signal_connect(G_OBJECT(g->fbutton), "clicked", G_CALLBACK(_fbutton_clicked), self);