callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app/core: Use babl for histogram luminance values

Browse Source 
This replaces the GIMP_RGB_LUMINANCE () macro with
babl_process () to retrieve luminance from pixels
in GimpHistogram. This allows us to consider the
color space during the conversion, rather than assuming
sRGB always.
This commit is contained in:
Alx Sa
2024-11-14 19:29:49 +00:00
parent a24d95d9cb
commit 45d0d4bef2
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/core/gimphistogram.c
View File

@ -984,6 +984,7 @@ gimp_histogram_calculate_area (const GeglRectangle *area,
GimpAsync *async; GimpAsync *async;
CalculateContext *context; CalculateContext *context;
GeglBufferIterator *iter; GeglBufferIterator *iter;
const Babl *fish;
gdouble *values; gdouble *values;
gint n_components; gint n_components;
gint n_bins; gint n_bins;
@ -996,6 +997,8 @@ gimp_histogram_calculate_area (const GeglRectangle *area,
n_bins = context->n_bins; n_bins = context->n_bins;
n_components = context->n_components; n_components = context->n_components;
fish = babl_fish (data->format, babl_format ("Y float"));
values = g_new0 (gdouble, (n_components + N_DERIVED_CHANNELS) * n_bins); values = g_new0 (gdouble, (n_components + N_DERIVED_CHANNELS) * n_bins);
gimp_atomic_slist_push_head (&data->values_list, values); gimp_atomic_slist_push_head (&data->values_list, values);
@ -1093,7 +1096,7 @@ gimp_histogram_calculate_area (const GeglRectangle *area,
max = MAX (data[2], max); max = MAX (data[2], max);
VALUE (0, max) += masked; VALUE (0, max) += masked;
luminance = GIMP_RGB_LUMINANCE (data[0], data[1], data[2]); babl_process (fish, data, &luminance, 1);
VALUE (4, luminance) += masked; VALUE (4, luminance) += masked;
data += n_components; data += n_components;
@ -1118,7 +1121,7 @@ gimp_histogram_calculate_area (const GeglRectangle *area,
max = MAX (data[2], max); max = MAX (data[2], max);
VALUE (0, max) += weight * masked; VALUE (0, max) += weight * masked;
luminance = GIMP_RGB_LUMINANCE (data[0], data[1], data[2]); babl_process (fish, data, &luminance, 1);
VALUE (5, luminance) += weight * masked; VALUE (5, luminance) += weight * masked;
data += n_components; data += n_components;
@ -1169,7 +1172,7 @@ gimp_histogram_calculate_area (const GeglRectangle *area,
max = MAX (data[2], max); max = MAX (data[2], max);
VALUE (0, max) += 1.0; VALUE (0, max) += 1.0;
luminance = GIMP_RGB_LUMINANCE (data[0], data[1], data[2]); babl_process (fish, data, &luminance, 1);
VALUE (4, luminance) += 1.0; VALUE (4, luminance) += 1.0;
data += n_components; data += n_components;
@ -1192,7 +1195,7 @@ gimp_histogram_calculate_area (const GeglRectangle *area,
max = MAX (data[2], max); max = MAX (data[2], max);
VALUE (0, max) += weight; VALUE (0, max) += weight;
luminance = GIMP_RGB_LUMINANCE (data[0], data[1], data[2]); babl_process (fish, data, &luminance, 1);
VALUE (5, luminance) += weight; VALUE (5, luminance) += weight;
data += n_components; data += n_components;