graphics/gimp
graphics/gimp
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp synced 2024-10-22 04:22:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

new utility function which maps a single value.

Browse source 
2008-01-23  Michael Natterer  <mitch@gimp.org>

	* app/gegl/gimpoperationlevels.[ch]
	(gimp_operation_levels_map_input): new utility function which maps
	a single value.

	* app/tools/gimplevelstool.[ch] (levels_update_adjustments): use the
	new function to create the input arrays for gimp_color_bar_set_buffer().

	Removed the Levels struct from the GimpLevelsTool struct and only
	use it in map() when needed.

	* app/base/levels.[ch]: remove obsolete API and struct members.


svn path=/trunk/; revision=24682
This commit is contained in:
Michael Natterer 2008-01-23 08:48:29 +00:00 committed by Michael Natterer
parent ffab5cc9db
commit 5d07620d58
7 changed files with 94 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ChangeLog
View file

@ -1,3 +1,17 @@
2008-01-23 Michael Natterer <mitch@gimp.org>
* app/gegl/gimpoperationlevels.[ch]
(gimp_operation_levels_map_input): new utility function which maps
a single value.
* app/tools/gimplevelstool.[ch] (levels_update_adjustments): use the
new function to create the input arrays for gimp_color_bar_set_buffer().
Removed the Levels struct from the GimpLevelsTool struct and only
use it in map() when needed.
* app/base/levels.[ch]: remove obsolete API and struct members.
2008-01-22 Sven Neumann <sven@gimp.org>
* app/core/gimpprojection.c (gimp_projection_idle_render_init):

34
app/base/levels.c
View file

@ -51,40 +51,6 @@ levels_init (Levels *levels)
}
}
void
levels_calculate_transfers (Levels *levels)
{
gdouble inten;
gint i, j;
g_return_if_fail (levels != NULL);
/* Recalculate the levels arrays */
for (j = 0; j < 5; j++)
{
for (i = 0; i < 256; i++)
{
/* determine input intensity */
if (levels->high_input[j] != levels->low_input[j])
{
inten = ((gdouble) (i - levels->low_input[j]) /
(double) (levels->high_input[j] - levels->low_input[j]));
}
else
{
inten = (gdouble) (i - levels->low_input[j]);
}
inten = CLAMP (inten, 0.0, 1.0);
if (levels->gamma[j] != 0.0)
inten = pow (inten, (1.0 / levels->gamma[j]));
levels->input[j][i] = (guchar) (inten * 255.0 + 0.5);
}
}
}
gfloat
levels_lut_func (Levels *levels,
gint n_channels,

13
app/base/levels.h
View file

@ -29,17 +29,14 @@ struct _Levels
gint low_output[5];
gint high_output[5];
guchar input[5][256]; /* this is used only by the gui */
};
void levels_init (Levels *levels);
void levels_calculate_transfers (Levels *levels);
gfloat levels_lut_func (Levels *levels,
gint n_channels,
gint channel,
gfloat value);
void levels_init (Levels *levels);
gfloat levels_lut_func (Levels *levels,
gint n_channels,
gint channel,
gfloat value);
#endif /* __LEVELS_H__ */

28
app/gegl/gimpoperationlevels.c
View file

@ -225,3 +225,31 @@ gimp_operation_levels_process (GeglOperation *operation,
return TRUE;
}
/* public functions */
gdouble
gimp_operation_levels_map_input (GimpLevelsConfig *config,
GimpHistogramChannel channel,
gdouble value)
{
g_return_val_if_fail (GIMP_IS_LEVELS_CONFIG (config), 0.0);
/* determine input intensity */
if (config->high_input[channel] != config->low_input[channel])
value = ((value - config->low_input[channel]) /
(config->high_input[channel] - config->low_input[channel]));
else
value = (value - config->low_input[channel]);
value = CLAMP (value, 0.0, 1.0);
if (config->gamma[channel] != 0.0)
{
value = pow (value, 1.0 / config->gamma[channel]);
}
return value;
}

6
app/gegl/gimpoperationlevels.h
View file

@ -50,7 +50,11 @@ struct _GimpOperationLevelsClass
};
GType gimp_operation_levels_get_type (void) G_GNUC_CONST;
GType gimp_operation_levels_get_type (void) G_GNUC_CONST;
gdouble gimp_operation_levels_map_input (GimpLevelsConfig *config,
GimpHistogramChannel channel,
gdouble value);
#endif /* __GIMP_OPERATION_LEVELS_H__ */

62
app/tools/gimplevelstool.c
View file

@ -38,6 +38,7 @@
#include "base/levels.h"
#include "gegl/gimplevelsconfig.h"
#include "gegl/gimpoperationlevels.h"
#include "core/gimpdrawable.h"
#include "core/gimpdrawable-histogram.h"
@ -180,13 +181,10 @@ gimp_levels_tool_init (GimpLevelsTool *tool)
GimpImageMapTool *im_tool = GIMP_IMAGE_MAP_TOOL (tool);
tool->lut = gimp_lut_new ();
tool->levels = g_slice_new0 (Levels);
tool->hist = NULL;
tool->channel = GIMP_HISTOGRAM_VALUE;
tool->active_picker = NULL;
levels_init (tool->levels);
im_tool->apply_func = (GimpImageMapApplyFunc) gimp_lut_process;
im_tool->apply_data = tool->lut;
}
@ -196,15 +194,14 @@ gimp_levels_tool_finalize (GObject *object)
{
GimpLevelsTool *tool = GIMP_LEVELS_TOOL (object);
gimp_lut_free (tool->lut);
g_slice_free (Levels, tool->levels);
if (tool->config)
{
g_object_unref (tool->config);
tool->config = NULL;
}
gimp_lut_free (tool->lut);
if (tool->hist)
{
gimp_histogram_free (tool->hist);
@ -285,12 +282,13 @@ static void
gimp_levels_tool_map (GimpImageMapTool *image_map_tool)
{
GimpLevelsTool *tool = GIMP_LEVELS_TOOL (image_map_tool);
Levels levels;
gimp_levels_config_to_levels_cruft (tool->config, tool->levels, tool->color);
gimp_levels_config_to_levels_cruft (tool->config, &levels, tool->color);
gimp_lut_setup (tool->lut,
(GimpLutFunc) levels_lut_func,
tool->levels,
&levels,
gimp_drawable_bytes (image_map_tool->drawable));
}
@ -830,28 +828,52 @@ levels_update_adjustments (GimpLevelsTool *tool)
static void
levels_update_input_bar (GimpLevelsTool *tool)
{
/* Recalculate the transfer arrays */
gimp_levels_config_to_levels_cruft (tool->config, tool->levels, tool->color);
levels_calculate_transfers (tool->levels);
switch (tool->channel)
{
case GIMP_HISTOGRAM_VALUE:
case GIMP_HISTOGRAM_ALPHA:
case GIMP_HISTOGRAM_RGB:
gimp_color_bar_set_buffers (GIMP_COLOR_BAR (tool->input_bar),
tool->levels->input[tool->channel],
tool->levels->input[tool->channel],
tool->levels->input[tool->channel]);
{
guchar v[256];
gint i;
for (i = 0; i < 256; i++)
{
v[i] = gimp_operation_levels_map_input (tool->config,
tool->channel,
i / 255.0) * 255.999;
}
gimp_color_bar_set_buffers (GIMP_COLOR_BAR (tool->input_bar),
v, v, v);
}
break;
case GIMP_HISTOGRAM_RED:
case GIMP_HISTOGRAM_GREEN:
case GIMP_HISTOGRAM_BLUE:
gimp_color_bar_set_buffers (GIMP_COLOR_BAR (tool->input_bar),
tool->levels->input[GIMP_HISTOGRAM_RED],
tool->levels->input[GIMP_HISTOGRAM_GREEN],
tool->levels->input[GIMP_HISTOGRAM_BLUE]);
{
guchar r[256];
guchar g[256];
guchar b[256];
gint i;
for (i = 0; i < 256; i++)
{
r[i] = gimp_operation_levels_map_input (tool->config,
GIMP_HISTOGRAM_RED,
i / 255.0) * 255.999;
g[i] = gimp_operation_levels_map_input (tool->config,
GIMP_HISTOGRAM_GREEN,
i / 255.0) * 255.999;
b[i] = gimp_operation_levels_map_input (tool->config,
GIMP_HISTOGRAM_BLUE,
i / 255.0) * 255.999;
}
gimp_color_bar_set_buffers (GIMP_COLOR_BAR (tool->input_bar),
r, g, b);
}
break;
}
}

1
app/tools/gimplevelstool.h
View file

@ -40,7 +40,6 @@ struct _GimpLevelsTool
GimpLevelsConfig *config;
GimpLut *lut;
Levels *levels;
/* dialog */
gboolean color;