Minor code clean-up.

Author: TurboGit

src/iop/rasterfile.c

@@ -292,16 +292,19 @@ static void _update_filepath(dt_iop_module_t *self)
     {
       const char *file = entries[i]->d_name;
       char *normalized_filename = g_locale_to_utf8(file, -1, NULL, NULL, NULL);
-      dt_bauhaus_combobox_add_aligned(g->file, normalized_filename, DT_BAUHAUS_COMBOBOX_ALIGN_LEFT);
+      dt_bauhaus_combobox_add_aligned(g->file, normalized_filename,
+                                      DT_BAUHAUS_COMBOBOX_ALIGN_LEFT);
       free(entries[i]);
       g_free(normalized_filename);
     }
-    if(numentries != -1) free(entries);
+    if(numentries != -1)
+      free(entries);
 
     if(!dt_bauhaus_combobox_set_from_text(g->file, p->file))
     { // file may have disappeared - show it
       char *invalidfilepath = g_strconcat(" ??? ", p->file, NULL);
-      dt_bauhaus_combobox_add_aligned(g->file, invalidfilepath, DT_BAUHAUS_COMBOBOX_ALIGN_LEFT);
+      dt_bauhaus_combobox_add_aligned(g->file, invalidfilepath,
+                                      DT_BAUHAUS_COMBOBOX_ALIGN_LEFT);
       dt_bauhaus_combobox_set_from_text(g->file, invalidfilepath);
       g_free(invalidfilepath);
     }
@@ -388,7 +391,9 @@ static inline dt_hash_t _get_cache_hash(dt_iop_module_t *self)
 {
   dt_hash_t hash = dt_hash(DT_INITHASH, self->params, self->params_size);
   // not technically required but possibly reduces mem footprint
-  hash = dt_hash(hash, &self->dev->image_storage.id, sizeof(self->dev->image_storage.id));
+  hash = dt_hash(hash,
+                 &self->dev->image_storage.id,
+                 sizeof(self->dev->image_storage.id));
   return hash;
 }
 
@@ -407,21 +412,27 @@ static float *_get_rasterfile_mask(dt_dev_pixelpipe_iop_t *piece,
   if(hash != cd->hash)
   {
     _clear_cache(cd);
-    dt_print(DT_DEBUG_PIPE, "read image raster file `%s'", d->filepath);
+    dt_print(DT_DEBUG_PIPE,
+             "read image raster file `%s'", d->filepath);
     cd->mask = _read_rasterfile(d->filepath, d->mode, &cd->width, &cd->height);
     cd->hash = cd->mask ? hash : DT_INVALID_HASH;
-    dt_print(DT_DEBUG_PIPE, "got raster mask data %p %dx%d", cd->mask, cd->width, cd->height);
+    dt_print(DT_DEBUG_PIPE,
+             "got raster mask data %p %dx%d", cd->mask, cd->width, cd->height);
   }
   if(cd->mask)
   {
     const gboolean scale = cd->width != roi->width || cd->height != roi->height;
     float *tmp = scale ? dt_iop_image_alloc(roi->width, roi->height, 1) : cd->mask;
     if(tmp)
     {
-      if(scale) interpolate_bilinear(cd->mask, cd->width, cd->height, tmp, roi->width, roi->height, 1);
+      if(scale)
+        interpolate_bilinear(cd->mask, cd->width, cd->height, tmp,
+                             roi->width, roi->height, 1);
       res = dt_iop_image_alloc(roo->width, roo->height, 1);
-      if(res) self->distort_mask(self, piece, tmp, res, roi, roo);
-      if(scale) dt_free_align(tmp);
+      if(res)
+        self->distort_mask(self, piece, tmp, res, roi, roo);
+      if(scale)
+        dt_free_align(tmp);
     }
   }
 
@@ -504,17 +515,24 @@ void process(dt_iop_module_t *self,
     pipe->mask_display = DT_DEV_PIXELPIPE_DISPLAY_PASSTHRU;
     if(ch == 1)
     {
-      dt_box_mean(out, roi_out->height, roi_out->width, 1, 3, 2); // simple blur to remove CFA colors
+      // simple blur to remove CFA colors:
+      dt_box_mean(out, roi_out->height, roi_out->width, 1, 3, 2);
       DT_OMP_FOR()
       for(size_t k = 0; k < (size_t)roi_out->width * roi_out->height; k++)
-        out[k] = 0.2f * CLAMPF(sqrtf(out[k]), 0.0f, 0.5f) + (mask ? mask[k] : 0.0f);
+        out[k] =
+          0.2f
+          * CLAMPF(sqrtf(out[k]), 0.0f, 0.5f)
+          + (mask ? mask[k] : 0.0f);
     }
     else
     {
       DT_OMP_FOR()
       for(size_t k = 0; k < (size_t)roi_out->width * roi_out->height; k++)
       {
-        float val = 0.2f * CLAMPF(sqrtf(0.33f * (out[4*k] + out[4*k+1]+ out[4*k+2])), 0.0f, 0.5f) + (mask ? mask[k] : 0.0f);
+        const float val =
+          0.2f
+          * CLAMPF(sqrtf(0.33f * (out[4*k] + out[4*k+1]+ out[4*k+2])), 0.0f, 0.5f)
+          + (mask ? mask[k] : 0.0f);
         for_three_channels(m) out[4*k+m] = val;
       }
     }
@@ -558,8 +576,10 @@ void tiling_callback(dt_iop_module_t *self,
 
 void reload_defaults(dt_iop_module_t *self)
 {
-  // we might be called from presets update infrastructure => there is no image
-  if(!self->dev || !dt_is_valid_imgid(self->dev->image_storage.id)) return;
+  // we might be called from presets update infrastructure => there is
+  // no image
+  if(!self->dev || !dt_is_valid_imgid(self->dev->image_storage.id))
+    return;
 
   self->default_enabled = FALSE;
   dt_iop_rasterfile_params_t *dp = self->default_params;
@@ -583,9 +603,13 @@ void distort_mask(dt_iop_module_t *self,
     dt_iop_copy_image_roi(out, in, 1, roi_in, roi_out);
 }
 
-void gui_changed(dt_iop_module_t *self, GtkWidget *w, void *previous)
+void gui_changed(dt_iop_module_t *self,
+                 GtkWidget *w,
+                 void *previous)
 {
   dt_iop_rasterfile_gui_data_t *g = self->gui_data;
+  dt_iop_rasterfile_params_t *p = self->params;
+
   if(!w || w == g->mode)
     _update_filepath(self);
 
@@ -597,7 +621,9 @@ void gui_changed(dt_iop_module_t *self, GtkWidget *w, void *previous)
     const gboolean other = hash != cd->hash;
     if(other) _clear_cache(cd);
     dt_pthread_mutex_unlock(&cd->lock);
-    if(other) dt_dev_reprocess_center(self->dev);
+
+    if(other)
+      dt_dev_reprocess_center(self->dev);
   }
 
   gtk_widget_set_sensitive(g->vectorize, p->path[0] && p->file[0]);
@@ -618,15 +644,19 @@ void init(dt_iop_module_t *self)
 
   /*
     Implementation note and reminder:
+
     Here we allocate per-module-instance memory shared by all pipes.
     To be sure data are valid and access is safe we
-    a) ensure validity via a hash. Here it's just based on the parameters of the module's instance
-        in other situations we might have to use the piece hash
+
+    a) ensure validity via a hash. Here it's just based on the
+       parameters of the module's instance in other situations we
+       might have to use the piece hash
+
     b) **always** access any module->data within a mutex-locked state.
 
-    In this module the data do **not** depend on the using pipe.
-    In other cases, the pipe changing data according to a diffenrent hash must make sure
-    the other pipes get restarted afterwards.
+    In this module the data do **not** depend on the using pipe.  In
+    other cases, the pipe changing data according to a diffenrent hash
+    must make sure the other pipes get restarted afterwards.
   */
 
   dt_rasterfile_cache_t *cd = calloc(1, sizeof(dt_rasterfile_cache_t));
@@ -658,18 +688,26 @@ void gui_init(dt_iop_module_t *self)
   dt_iop_rasterfile_gui_data_t *g = IOP_GUI_ALLOC(rasterfile);
 
   g->mode = dt_bauhaus_combobox_from_params(self, "mode");
-  gtk_widget_set_tooltip_text(g->mode, _("select the RGB channels taken into account to generate the raster mask"));
+  gtk_widget_set_tooltip_text
+    (g->mode,
+     _("select the RGB channels taken into account to generate the raster mask"));
 
   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"
-      "CAUTION: path must be set in preferences/processing before choosing"));
-  g_signal_connect(G_OBJECT(g->fbutton), "clicked", G_CALLBACK(_fbutton_clicked), self);
+  gtk_widget_set_tooltip_text
+    (g->fbutton,
+     _("select the PFM 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);
 
   g->file = dt_bauhaus_combobox_new(self);
   dt_bauhaus_combobox_set_entries_ellipsis(g->file, PANGO_ELLIPSIZE_MIDDLE);
-  gtk_widget_set_tooltip_text(g->file, _("the mask file path is saved with the image history"));
-  g_signal_connect(G_OBJECT(g->file), "value-changed", G_CALLBACK(_file_callback), self);
+  gtk_widget_set_tooltip_text
+    (g->file,
+     _("the mask file path is saved with the image history"));
+  g_signal_connect(G_OBJECT(g->file), "value-changed",
+                   G_CALLBACK(_file_callback), self);
 
   // Vectorize button