wb: removed 'as-shot to reference' (same as 'as shot' + 'prepare data for color calibration' (late_correction)); fixed behaviour when WB disabled; removed unused code

Author: kofa73

src/common/exif.cc

@@ -2057,7 +2057,7 @@ static bool _exif_decode_exif_data(dt_image_t *img, Exiv2::ExifData &exifData)
       dt_dng_illuminant_t illu[3] = { DT_LS_Unknown, DT_LS_Unknown, DT_LS_Unknown };
 
       // make sure for later testing fallback later via
-      // `find_temperature_from_raw_coeffs` if there is no valid illuminant
+      // `find_illuminant_xy_from_as_shot_coeffs` if there is no valid illuminant
       dt_mark_colormatrix_invalid(&img->d65_color_matrix[0]);
 
 #if EXIV2_TEST_VERSION(0,27,4)

src/common/illuminants.h

@@ -513,31 +513,6 @@ static inline float planckian_normal(const float x, const float t)
 }
 
 
-DT_OMP_DECLARE_SIMD()
-static inline void blackbody_xy_to_tinted_xy(const float x, const float y, const float t, const float tint,
-                                             float *x_out, float *y_out)
-{
-  // Move further away from planckian locus in the orthogonal direction, by an amount of "tint"
-  const float n = planckian_normal(x, t);
-  const float norm = sqrtf(1.f + n * n);
-  *x_out = x + tint * n / norm;
-  *y_out = y - tint / norm;
-}
-
-
-DT_OMP_DECLARE_SIMD()
-static inline float get_tint_from_tinted_xy(const float x, const float y, const float t)
-{
-  // Find the distance between planckian locus and arbitrary x y chromaticity in the orthogonal direction
-  const float n = planckian_normal(x, t);
-  const float norm = sqrtf(1.f + n * n);
-  float x_bb, y_bb;
-  CCT_to_xy_blackbody(t, &x_bb, &y_bb);
-  const float tint = -(y - y_bb) * norm;
-  return tint;
-}
-
-
 DT_OMP_DECLARE_SIMD()
 static inline void xy_to_uv(const float xy[2], float uv[2])
 {

src/develop/develop.h

@@ -147,8 +147,8 @@ typedef struct dt_dev_viewport_t
       - the currently used wb_coeffs in temperature module
       - D65coeffs and as_shot are read from exif data
   f)  - late_correction set by temperature if we want to process data as following
-      If we use the new DT_IOP_TEMP_D65_LATE mode or enable this in user modes of temperature.c
-      and don't have any temp parameters changes later we can calc correction ratios
+      If we enable this for non-D65 modes of temperature.c and don't have any
+      temp parameters changes later we can calc correction ratios
       to take white-balanced (neutralized) data to D65
 */
 typedef struct dt_dev_chroma_t

src/iop/temperature.c

@@ -53,15 +53,14 @@ DT_MODULE_INTROSPECTION(5, dt_iop_temperature_params_t)
 #define DT_IOP_LOWEST_TINT 0.135
 #define DT_IOP_HIGHEST_TINT 2.326
 
-#define DT_IOP_NUM_OF_STD_TEMP_PRESETS 5
+#define DT_IOP_NUM_OF_STD_TEMP_PRESETS 4
 
 // If you reorder presets combo, change this consts
 #define DT_IOP_TEMP_UNKNOWN -1
 #define DT_IOP_TEMP_AS_SHOT 0
 #define DT_IOP_TEMP_SPOT 1
 #define DT_IOP_TEMP_USER 2
 #define DT_IOP_TEMP_D65 3
-#define DT_IOP_TEMP_D65_LATE 4
 
 static void _gui_sliders_update(dt_iop_module_t *self);
 
@@ -85,9 +84,7 @@ typedef struct dt_iop_temperature_gui_data_t
   GtkWidget *btn_asshot; //As Shot
   GtkWidget *btn_user;
   GtkWidget *btn_d65;
-  GtkWidget *btn_d65_late;
   GtkWidget *temp_label;
-  GtkWidget *balance_label;
   GtkWidget *check_late_correction;
   int preset_cnt;
   int preset_num[54];
@@ -194,11 +191,21 @@ int legacy_params(dt_iop_module_t *self,
   }
   if(old_version == 4)
   {
+    const int legacy_d65_late = 4;
     const dt_iop_temperature_params_v4_t *o = (dt_iop_temperature_params_v4_t *)old_params;
     dt_iop_temperature_params_v5_t *n = malloc(sizeof(dt_iop_temperature_params_v5_t));
 
     memcpy(n, o, sizeof(dt_iop_temperature_params_v4_t));
-    n->late_correction = FALSE;
+    if(o->preset == legacy_d65_late)
+    {
+      n->preset = DT_IOP_TEMP_AS_SHOT;
+      n->late_correction = TRUE;
+    }
+    else
+    {
+      n->preset = o->preset > legacy_d65_late ? o->preset - 1 : o->preset;
+      n->late_correction = FALSE;
+    }
     *new_params = n;
     *new_params_size = sizeof(dt_iop_temperature_params_v5_t);
     *new_version = 5;
@@ -742,30 +749,21 @@ void commit_params(dt_iop_module_t *self,
 
   d->preset = p->preset;
 
-  gboolean effective_late_correction = FALSE;
-
-  if(p->preset == DT_IOP_TEMP_D65_LATE)
-    effective_late_correction = TRUE;
-  else if(p->preset == DT_IOP_TEMP_D65)
-    effective_late_correction = FALSE;
-  else
-    effective_late_correction = p->late_correction;
+  const gboolean effective_late_correction =
+    p->preset == DT_IOP_TEMP_D65 ? FALSE : p->late_correction;
 
   d->late_correction = effective_late_correction;
-  chr->late_correction = effective_late_correction;
+  // When the WB module is disabled it applies no coefficients (wb_coeffs are
+  // published as 1.0 above), so it makes no promise that the data is white
+  // balanced. Do not ask colorin (or any other consumer) to "finish" a
+  // correction that never started, otherwise disabling WB would still pull the
+  // image to D65 via D65coeffs/1.0.
+  chr->late_correction = piece->enabled ? effective_late_correction : FALSE;
 
-  chr->temperature = piece->enabled ? self : NULL;
   /* Make sure the chroma information stuff is valid
      If piece is disabled we always clear the trouble message and
      make sure chroma does know there is no temperature module.
   */
-  if(p->preset == DT_IOP_TEMP_D65_LATE)
-    chr->late_correction = TRUE;
-  else if(p->preset == DT_IOP_TEMP_D65)
-    chr->late_correction = FALSE;
-  else
-    chr->late_correction = p->late_correction;
-
   chr->temperature = piece->enabled ? self : NULL;
   if(dt_pipe_is_preview(pipe) && !piece->enabled)
     dt_iop_set_module_trouble_message(self, NULL, NULL, NULL);
@@ -1198,7 +1196,6 @@ static inline const char *_preset_to_str(const int preset)
     case DT_IOP_TEMP_SPOT:      return "by spot";
     case DT_IOP_TEMP_USER:      return "user defined";
     case DT_IOP_TEMP_D65:       return "camera reference";
-    case DT_IOP_TEMP_D65_LATE:  return "as shot to reference";
     default:                    return "other";
   }
 }
@@ -1209,10 +1206,8 @@ static void _update_preset(dt_iop_module_t *self, int mode)
   dt_dev_chroma_t *chr = &self->dev->chroma;
   dt_iop_temperature_gui_data_t *g = self->gui_data;
 
-  const gboolean is_current_reference = (p->preset == DT_IOP_TEMP_D65_LATE) ||
-                                        (p->preset == DT_IOP_TEMP_D65);
-  const gboolean is_new_mode_manual = (mode != DT_IOP_TEMP_D65_LATE) &&
-                                    (mode != DT_IOP_TEMP_D65);
+  const gboolean is_current_reference = p->preset == DT_IOP_TEMP_D65;
+  const gboolean is_new_mode_manual = mode != DT_IOP_TEMP_D65;
 
   if(is_current_reference && is_new_mode_manual)
   {
@@ -1222,17 +1217,13 @@ static void _update_preset(dt_iop_module_t *self, int mode)
 
   p->preset = mode;
 
-  if(mode == DT_IOP_TEMP_D65_LATE)
-  {
-    chr->late_correction = TRUE;
-  }
-  else if(mode == DT_IOP_TEMP_D65)
+  if(mode == DT_IOP_TEMP_D65)
   {
     chr->late_correction = FALSE;
   }
   else
   {
-    // For manual modes, use the parameter
+    // For non-D65 modes, use the parameter
     chr->late_correction = p->late_correction;
   }
 
@@ -1250,9 +1241,6 @@ void gui_update(dt_iop_module_t *self)
 {
   dt_iop_temperature_gui_data_t *g = self->gui_data;
   dt_iop_temperature_params_t *p = self->params;
-  dt_iop_temperature_params_t *d = self->default_params;
-
-  d->preset = dt_is_scene_referred() ? DT_IOP_TEMP_D65_LATE : DT_IOP_TEMP_AS_SHOT;
 
   const gboolean true_monochrome =
     dt_image_monochrome_flags(&self->dev->image_storage) & DT_IMAGE_MONOCHROME;
@@ -1285,13 +1273,7 @@ void gui_update(dt_iop_module_t *self)
   gboolean found = FALSE;
   const dt_dev_chroma_t *chr = &self->dev->chroma;
   // is this a "as shot" white balance?
-  if(dt_dev_equal_chroma((float *)p, chr->as_shot) && (p->preset == DT_IOP_TEMP_D65_LATE))
-  {
-    dt_bauhaus_combobox_set(g->presets, DT_IOP_TEMP_D65_LATE);
-    found = TRUE;
-  }
-
-  else if(dt_dev_equal_chroma((float *)p, chr->as_shot))
+  if(dt_dev_equal_chroma((float *)p, chr->as_shot))
   {
     dt_bauhaus_combobox_set(g->presets, DT_IOP_TEMP_AS_SHOT);
     p->preset = DT_IOP_TEMP_AS_SHOT;
@@ -1439,8 +1421,6 @@ void gui_update(dt_iop_module_t *self)
                                p->preset == DT_IOP_TEMP_USER);
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g->btn_d65),
                                p->preset == DT_IOP_TEMP_D65);
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g->btn_d65_late),
-                               p->preset == DT_IOP_TEMP_D65_LATE);
 
   _color_temptint_sliders(self);
   _color_rgb_sliders(self);
@@ -1593,8 +1573,8 @@ void reload_defaults(dt_iop_module_t *self)
   dt_iop_temperature_params_t *d = self->default_params;
   dt_iop_temperature_params_t *p = self->params;
 
-  d->preset = dt_is_scene_referred() ? DT_IOP_TEMP_D65_LATE : DT_IOP_TEMP_AS_SHOT;
-  d->late_correction = dt_is_scene_referred();
+  d->preset = p->preset = DT_IOP_TEMP_AS_SHOT;
+  d->late_correction = p->late_correction = dt_is_scene_referred();
 
   float *dcoeffs = (float *)d;
   for_four_channels(k)
@@ -1703,7 +1683,8 @@ void reload_defaults(dt_iop_module_t *self)
       {
         for_four_channels(k)
           dcoeffs[k] = as_shot[k];
-        d->preset = p->preset = DT_IOP_TEMP_D65_LATE;
+        d->preset = p->preset = DT_IOP_TEMP_AS_SHOT;
+        d->late_correction = p->late_correction = TRUE;
       }
       else
       {
@@ -1713,6 +1694,7 @@ void reload_defaults(dt_iop_module_t *self)
         dcoeffs[2] = coeffs[2]/coeffs[1];
         dcoeffs[3] = coeffs[3]/coeffs[1];
         dcoeffs[1] = 1.0f;
+        d->late_correction = p->late_correction = FALSE;
       }
     }
   }
@@ -1750,7 +1732,6 @@ void reload_defaults(dt_iop_module_t *self)
     dt_bauhaus_combobox_add(g->presets, C_("white balance", "user modified"));
     // old "camera neutral", reason: better matches intent
     dt_bauhaus_combobox_add(g->presets, C_("white balance", "camera reference"));
-    dt_bauhaus_combobox_add(g->presets, C_("white balance", "as shot to reference"));
 
     g->preset_cnt = DT_IOP_NUM_OF_STD_TEMP_PRESETS;
     memset(g->preset_num, 0, sizeof(g->preset_num));
@@ -1760,7 +1741,6 @@ void reload_defaults(dt_iop_module_t *self)
     _gui_sliders_update(self);
 
     dt_bauhaus_combobox_set(g->presets, p->preset);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g->btn_d65_late), p->preset == DT_IOP_TEMP_D65_LATE);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g->btn_asshot), p->preset == DT_IOP_TEMP_AS_SHOT);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g->btn_user), FALSE);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g->btn_d65), FALSE);
@@ -1836,7 +1816,6 @@ static gboolean _btn_toggled(GtkWidget *togglebutton,
 
   const int preset = togglebutton == g->btn_asshot ? DT_IOP_TEMP_AS_SHOT :
                      togglebutton == g->btn_d65 ? DT_IOP_TEMP_D65 :
-                     togglebutton == g->btn_d65_late ? DT_IOP_TEMP_D65_LATE :
                      togglebutton == g->btn_user ? DT_IOP_TEMP_USER : 0;
 
   if(!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(togglebutton)))
@@ -1879,8 +1858,6 @@ static void _preset_tune_callback(GtkWidget *widget, dt_iop_module_t *self)
                                pos == DT_IOP_TEMP_USER);
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g->btn_d65),
                                pos == DT_IOP_TEMP_D65);
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g->btn_d65_late),
-                               pos == DT_IOP_TEMP_D65_LATE);
 
   gboolean show_finetune = FALSE;
   dt_dev_chroma_t *chr = &self->dev->chroma;
@@ -1910,9 +1887,6 @@ static void _preset_tune_callback(GtkWidget *widget, dt_iop_module_t *self)
     case DT_IOP_TEMP_D65: // camera reference d65
       _temp_params_from_array(p, chr->D65coeffs);
       break;
-    case DT_IOP_TEMP_D65_LATE: // as shot wb just for now
-        _temp_params_from_array(p, chr->as_shot);
-      break;
     default: // camera WB presets
     {
       gboolean found = FALSE;
@@ -2188,21 +2162,11 @@ void gui_init(dt_iop_module_t *self)
     (g->btn_d65,
      _("set white balance to camera reference point\nin most cases it should be D65"));
 
-  g->btn_d65_late = dt_iop_togglebutton_new(self,
-                                            N_("settings"),
-                                            N_("as shot to reference"), NULL,
-                                            G_CALLBACK(_btn_toggled), FALSE, 0, 0,
-                                            dtgtk_cairo_paint_bulb_mod, NULL);
-  gtk_widget_set_tooltip_text
-    (g->btn_d65_late,
-     _("set white balance to as shot and later correct to camera reference point,\nin most cases it should be D65"));
-
   // put buttons at top. fill later.
   g->buttonbar = dt_gui_hbox(dt_gui_expand(g->btn_asshot),
                              dt_gui_expand(g->colorpicker),
                              dt_gui_expand(g->btn_user),
-                             dt_gui_expand(g->btn_d65),
-                             dt_gui_expand(g->btn_d65_late));
+                             dt_gui_expand(g->btn_d65));
   dt_gui_add_class(g->buttonbar, "dt_iop_toggle");
 
   g->presets = dt_bauhaus_combobox_new(self);
@@ -2253,7 +2217,7 @@ void gui_init(dt_iop_module_t *self)
 
   gtk_widget_set_tooltip_text(g->check_late_correction,
       _("ensures the white balance coefficients are treated as a reference for the color calibration module.\n"
-        "keep this checked if you use the modern scene-referred workflow but want to manually adjust white balance."));
+        "keep this checked for non-reference white balance in the modern scene-referred workflow."));
 
   GtkWidget *box_enabled = dt_gui_vbox(g->buttonbar,
                                        g->check_late_correction,
@@ -2318,9 +2282,9 @@ void gui_cleanup(dt_iop_module_t *self)
 void gui_reset(dt_iop_module_t *self)
 {
   dt_iop_temperature_gui_data_t *g = self->gui_data;
-  dt_iop_temperature_params_t *d = self->default_params;
+  dt_iop_temperature_params_t *p = self->params;
 
-  const int preset = d->preset = dt_is_scene_referred() ? DT_IOP_TEMP_D65_LATE : DT_IOP_TEMP_AS_SHOT;
+  const int preset = p->preset;
   dt_iop_color_picker_reset(self, TRUE);
 
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g->btn_asshot),
@@ -2329,8 +2293,6 @@ void gui_reset(dt_iop_module_t *self)
                                preset == DT_IOP_TEMP_USER);
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g->btn_d65),
                                preset == DT_IOP_TEMP_D65);
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g->btn_d65_late),
-                               preset == DT_IOP_TEMP_D65_LATE);
 
   _color_finetuning_slider(self);
   _color_rgb_sliders(self);