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

app: calculate the histogram in 8 bit rather than creating nonsense

Browse Source
This commit is contained in:
Michael Natterer
2012-04-26 01:07:20 +02:00
parent dc7bc8f292
commit f624d7c16a
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/core/gimphistogram.c
View File

@ -27,6 +27,8 @@
#include "core-types.h" #include "core-types.h"
#include "gegl/gimp-babl.h"
#include "gimphistogram.h" #include "gimphistogram.h"
@ -114,19 +116,23 @@ gimp_histogram_calculate (GimpHistogram *histogram,
{ {
GeglBufferIterator *iter; GeglBufferIterator *iter;
const Babl *format; const Babl *format;
gint bpp; gint n_components;
g_return_if_fail (histogram != NULL); g_return_if_fail (histogram != NULL);
g_return_if_fail (GEGL_IS_BUFFER (buffer)); g_return_if_fail (GEGL_IS_BUFFER (buffer));
g_return_if_fail (buffer_rect != NULL); g_return_if_fail (buffer_rect != NULL);
/* XXX need to analyze the real components here, this code assumes u8 */
format = gegl_buffer_get_format (buffer); format = gegl_buffer_get_format (buffer);
bpp = babl_format_get_bytes_per_pixel (format);
gimp_histogram_alloc_values (histogram, bpp); format = gimp_babl_format (gimp_babl_format_get_base_type (format),
GIMP_PRECISION_U8,
babl_format_has_alpha (format));
iter = gegl_buffer_iterator_new (buffer, buffer_rect, 0, NULL, n_components = babl_format_get_n_components (format),
gimp_histogram_alloc_values (histogram, n_components);
iter = gegl_buffer_iterator_new (buffer, buffer_rect, 0, format,
GEGL_BUFFER_READ, GEGL_ABYSS_NONE); GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
if (mask) if (mask)
@ -145,7 +151,7 @@ gimp_histogram_calculate (GimpHistogram *histogram,
{ {
const gfloat *mask_data = iter->data[1]; const gfloat *mask_data = iter->data[1];
switch (bpp) switch (n_components)
{ {
case 1: case 1:
while (iter->length) while (iter->length)
@ -154,7 +160,7 @@ gimp_histogram_calculate (GimpHistogram *histogram,
VALUE (0, data[0]) += masked; VALUE (0, data[0]) += masked;
data += bpp; data += n_components;
mask_data += 1; mask_data += 1;
} }
break; break;
@ -168,7 +174,7 @@ gimp_histogram_calculate (GimpHistogram *histogram,
VALUE (0, data[0]) += weight * masked; VALUE (0, data[0]) += weight * masked;
VALUE (1, data[1]) += masked; VALUE (1, data[1]) += masked;
data += bpp; data += n_components;
mask_data += 1; mask_data += 1;
} }
break; break;
@ -187,7 +193,7 @@ gimp_histogram_calculate (GimpHistogram *histogram,
VALUE (0, max) += masked; VALUE (0, max) += masked;
data += bpp; data += n_components;
mask_data += 1; mask_data += 1;
} }
break; break;
@ -208,7 +214,7 @@ gimp_histogram_calculate (GimpHistogram *histogram,
VALUE (0, max) += weight * masked; VALUE (0, max) += weight * masked;
data += bpp; data += n_components;
mask_data += 1; mask_data += 1;
} }
break; break;
@ -216,14 +222,14 @@ gimp_histogram_calculate (GimpHistogram *histogram,
} }
else /* no mask */ else /* no mask */
{ {
switch (bpp) switch (n_components)
{ {
case 1: case 1:
while (iter->length--) while (iter->length--)
{ {
VALUE (0, data[0]) += 1.0; VALUE (0, data[0]) += 1.0;
data += bpp; data += n_components;
} }
break; break;
@ -235,7 +241,7 @@ gimp_histogram_calculate (GimpHistogram *histogram,
VALUE (0, data[0]) += weight; VALUE (0, data[0]) += weight;
VALUE (1, data[1]) += 1.0; VALUE (1, data[1]) += 1.0;
data += bpp; data += n_components;
} }
break; break;
@ -251,7 +257,7 @@ gimp_histogram_calculate (GimpHistogram *histogram,
VALUE (0, max) += 1.0; VALUE (0, max) += 1.0;
data += bpp; data += n_components;
} }
break; break;
@ -270,7 +276,7 @@ gimp_histogram_calculate (GimpHistogram *histogram,
VALUE (0, max) += weight; VALUE (0, max) += weight;
data += bpp; data += n_components;
} }
break; break;
} }