ryb vectorscope: revisit ryb parameters

darktable-org · Sep 3, 2021 · 9403fda · 9403fda
1 parent 6854030
commit 9403fda
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/src/libs/histogram.c b/src/libs/histogram.c
@@ -305,21 +305,21 @@ const float x_vtx[7] = {0.0, 0.166667, 0.333333, 0.5, 0.666667, 0.833333, 1.0};
 const float rgb_y_vtx[7] = {0.0, 0.083333, 0.166667, 0.383838, 0.586575, 0.833333, 1.0};
 const float ryb_y_vtx[] = {0.0, 0.333333, 0.472217, 0.611105, 0.715271, 0.833333, 1.0};
 
-static void _ryb2rgb(const dt_aligned_pixel_t ryb, dt_aligned_pixel_t rgb, dt_lib_histogram_t *d)
+static void _ryb2rgb(const dt_aligned_pixel_t ryb, dt_aligned_pixel_t rgb, const float *ryb2rgb_ypp)
 {
   dt_aligned_pixel_t HSV;
   dt_RGB_2_HSV(ryb, HSV);
   HSV[0] = interpolate_val(sizeof(x_vtx)/sizeof(float), (float *)x_vtx, HSV[0],
-                           (float *)rgb_y_vtx, d->ryb2rgb_ypp, CUBIC_SPLINE);
+                           (float *)rgb_y_vtx, (float *)ryb2rgb_ypp, CUBIC_SPLINE);
   dt_HSV_2_RGB(HSV, rgb);
 }
 
-static void _rgb2ryb(const dt_aligned_pixel_t rgb, dt_aligned_pixel_t ryb, dt_lib_histogram_t *d)
+static void _rgb2ryb(const dt_aligned_pixel_t rgb, dt_aligned_pixel_t ryb, const float *rgb2ryb_ypp)
 {
   dt_aligned_pixel_t HSV;
   dt_RGB_2_HSV(rgb, HSV);
   HSV[0] = interpolate_val(sizeof(x_vtx)/sizeof(float), (float *)x_vtx, HSV[0],
-                           (float *)ryb_y_vtx, d->rgb2ryb_ypp, CUBIC_SPLINE);
+                           (float *)ryb_y_vtx, (float *)rgb2ryb_ypp, CUBIC_SPLINE);
   dt_HSV_2_RGB(HSV, ryb);
 }
 
@@ -412,7 +412,7 @@ static void _lib_histogram_vectorscope_bkgd(dt_lib_histogram_t *d, const dt_iop_
       else
       {
         // get the color to be displayed
-        _ryb2rgb(rgb_scope, rgb_display, d);
+        _ryb2rgb(rgb_scope, rgb_display, d->ryb2rgb_ypp);
         const float alpha = M_PI * (0.33333 * ((float)k + (float)i / VECTORSCOPE_HUES));
         chromaticity[1] = cosf(alpha) * 0.01;
         chromaticity[2] = sinf(alpha) * 0.01;
@@ -508,7 +508,7 @@ static void _lib_histogram_vectorscope_bkgd(dt_lib_histogram_t *d, const dt_iop_
 static  void _get_chromaticity(const dt_aligned_pixel_t RGB, dt_aligned_pixel_t chromaticity,
                                const dt_lib_histogram_vectorscope_type_t vs_type,
                                const dt_iop_order_iccprofile_info_t *vs_prof,
-                               dt_lib_histogram_t *d)
+                               const float *rgb2ryb_ypp)
 {
   dt_aligned_pixel_t XYZ_D50;
   if(vs_type != DT_LIB_HISTOGRAM_VECTORSCOPE_RYB)
@@ -545,7 +545,7 @@ static  void _get_chromaticity(const dt_aligned_pixel_t RGB, dt_aligned_pixel_t
     // gamma corrected sRGB -> linear sRGB
     for_each_channel(ch, aligned(rgb, RGB:16))
       rgb[ch] = RGB[ch] <= 0.04045f ? RGB[ch] / 12.92f : powf((RGB[ch] + 0.055f) / (1.0f + 0.055f), 2.4f);
-    _rgb2ryb(rgb, RYB, d);
+    _rgb2ryb(rgb, RYB, rgb2ryb_ypp);
     dt_RGB_2_HCV(RYB, HCV);
     const float alpha = 2.0 * M_PI * HCV[0];
     chromaticity[1] = cosf(alpha) * HCV[1] * 0.01;
@@ -625,7 +625,7 @@ static void _lib_histogram_process_vectorscope(dt_lib_histogram_t *d, const floa
           for_each_channel(ch, aligned(px,RGB:16))
             RGB[ch] += px[4U * (yy * roi->width + xx) + ch] * 0.25f;
 
-      _get_chromaticity(RGB, chromaticity, vs_type, vs_prof, d);
+      _get_chromaticity(RGB, chromaticity, vs_type, vs_prof, d->rgb2ryb_ypp);
       // FIXME: we ignore the L or Jz components -- do they optimize out of the above code, or would in particular a XYZ_2_AzBz but helpful?
       if(vs_scale == DT_LIB_HISTOGRAM_SCALE_LOGARITHMIC)
         log_scale(&chromaticity[1], &chromaticity[2], max_radius);
@@ -666,7 +666,7 @@ static void _lib_histogram_process_vectorscope(dt_lib_histogram_t *d, const floa
     }
   }
 
-  _get_chromaticity(RGB, chromaticity, vs_type, vs_prof, d);
+  _get_chromaticity(RGB, chromaticity, vs_type, vs_prof, d->rgb2ryb_ypp);
 
   if(vs_scale == DT_LIB_HISTOGRAM_SCALE_LOGARITHMIC)
     log_scale(&chromaticity[1], &chromaticity[2], max_radius);
@@ -715,7 +715,7 @@ static void _lib_histogram_process_vectorscope(dt_lib_histogram_t *d, const floa
         }
       }
 
-      _get_chromaticity(RGB, chromaticity, vs_type, vs_prof, d);
+      _get_chromaticity(RGB, chromaticity, vs_type, vs_prof, d->rgb2ryb_ypp);
 
       if(vs_scale == DT_LIB_HISTOGRAM_SCALE_LOGARITHMIC)
         log_scale(&chromaticity[1], &chromaticity[2], max_radius);
@@ -1096,7 +1096,7 @@ static void _lib_histogram_draw_vectorscope(dt_lib_histogram_t *d, cairo_t *cr,
   cairo_set_source_rgba(cr, 1.0, 1.0, 1.0, 0.55);
   cairo_mask(cr, graph_pat);
   cairo_pattern_destroy(bkgd_pat);
-  
+
   cairo_surface_destroy(bkgd_surface);
   cairo_pattern_destroy(graph_pat);
   cairo_surface_destroy(graph_surface);