dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

defined GimpTransferMode enum. 

2001-08-01  Sven Neumann  <sven@gimp.org>

	* app/core/core-types.h: defined GimpTransferMode enum.

	* app/tools/gimpcolorbalancetool.[ch]
	* app/tools/gimpdodgeburntool.[ch]: use it here instead of defining
	the same enum again. Some GObject porting.

	* app/tools/gimpsmudgetool.h: removed unused enum SmudgeMode.

	* app/pdb/color_cmds.c
	* app/pdb/tools_cmds.c
	* libgimp/gimpenums.h
	* libgimp/gimptools_pdb.[ch]
	* plug-ins/script-fu/script-fu-constants.c
	* tools/pdbgen/Makefile.am
	* tools/pdbgen/enums.pl
	* tools/pdbgen/pdb/color.pdb
	* tools/pdbgen/pdb/tools.pdb: changed accordingly (mostly generated)
This commit is contained in:
Sven Neumann 2001-08-01 02:01:49 +00:00 committed by Sven Neumann
parent b2c676bd74
commit fc12bd9a52
25 changed files with 282 additions and 306 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ChangeLog
View File

@ -1,3 +1,23 @@
2001-08-01 Sven Neumann <sven@gimp.org>
* app/core/core-types.h: defined GimpTransferMode enum.
* app/tools/gimpcolorbalancetool.[ch]
* app/tools/gimpdodgeburntool.[ch]: use it here instead of defining
the same enum again. Some GObject porting.
* app/tools/gimpsmudgetool.h: removed unused enum SmudgeMode.
* app/pdb/color_cmds.c
* app/pdb/tools_cmds.c
* libgimp/gimpenums.h
* libgimp/gimptools_pdb.[ch]
* plug-ins/script-fu/script-fu-constants.c
* tools/pdbgen/Makefile.am
* tools/pdbgen/enums.pl
* tools/pdbgen/pdb/color.pdb
* tools/pdbgen/pdb/tools.pdb: changed accordingly (mostly generated)
2001-08-01 Sven Neumann <sven@gimp.org>
* configure.in: added GTK_DISABLE_COMPAT_H back to CPPFLAGS.

82
app/base/color-balance.c
View File

@ -350,7 +350,7 @@ color_balance_dialog_new (void)
cbd = g_new (ColorBalanceDialog, 1);
cbd->preserve_luminosity = TRUE;
cbd->preview = TRUE;
cbd->application_mode = SHADOWS;
cbd->application_mode = GIMP_SHADOWS;
/* The shell and main vbox */
cbd->shell = gimp_dialog_new (_("Color Balance"), "color_balance",
@ -426,9 +426,9 @@ color_balance_dialog_new (void)
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_table_attach_defaults (GTK_TABLE (table), slider, 1, 2, 0, 1);
gtk_signal_connect (GTK_OBJECT (cbd->cyan_red_data), "value_changed",
GTK_SIGNAL_FUNC (color_balance_cr_adjustment_update),
cbd);
g_signal_connect (G_OBJECT (cbd->cyan_red_data), "value_changed",
G_CALLBACK (color_balance_cr_adjustment_update),
cbd);
end_label = gtk_label_new (_("Red"));
gtk_misc_set_alignment (GTK_MISC (end_label), 0.0, 1.0);
@ -451,9 +451,9 @@ color_balance_dialog_new (void)
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_table_attach_defaults (GTK_TABLE (table), slider, 1, 2, 1, 2);
gtk_signal_connect (GTK_OBJECT (cbd->magenta_green_data), "value_changed",
GTK_SIGNAL_FUNC (color_balance_mg_adjustment_update),
cbd);
g_signal_connect (G_OBJECT (cbd->magenta_green_data), "value_changed",
G_CALLBACK (color_balance_mg_adjustment_update),
cbd);
end_label = gtk_label_new (_("Green"));
gtk_misc_set_alignment (GTK_MISC (end_label), 0.0, 1.0);
@ -476,9 +476,9 @@ color_balance_dialog_new (void)
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_table_attach_defaults (GTK_TABLE (table), slider, 1, 2, 2, 3);
gtk_signal_connect (GTK_OBJECT (cbd->yellow_blue_data), "value_changed",
GTK_SIGNAL_FUNC (color_balance_yb_adjustment_update),
cbd);
g_signal_connect (G_OBJECT (cbd->yellow_blue_data), "value_changed",
G_CALLBACK (color_balance_yb_adjustment_update),
cbd);
end_label = gtk_label_new (_("Blue"));
gtk_misc_set_alignment (GTK_MISC (end_label), 0.0, 1.0);
@ -503,10 +503,11 @@ color_balance_dialog_new (void)
group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio_button));
gtk_box_pack_start (GTK_BOX (hbox), radio_button, TRUE, FALSE, 0);
gtk_object_set_user_data (GTK_OBJECT (radio_button), (gpointer) i);
gtk_signal_connect (GTK_OBJECT (radio_button), "toggled",
GTK_SIGNAL_FUNC (color_balance_range_callback),
cbd);
g_object_set_data (G_OBJECT (radio_button), "transfer_mode",
GINT_TO_POINTER (i));
g_signal_connect (G_OBJECT (radio_button), "toggled",
G_CALLBACK (color_balance_range_callback),
cbd);
gtk_widget_show (radio_button);
}
@ -522,18 +523,18 @@ color_balance_dialog_new (void)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
cbd->preserve_luminosity);
gtk_box_pack_start (GTK_BOX (hbox), toggle, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (color_balance_preserve_update),
cbd);
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (color_balance_preserve_update),
cbd);
gtk_widget_show (toggle);
/* The preview toggle */
toggle = gtk_check_button_new_with_label (_("Preview"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), cbd->preview);
gtk_box_pack_end (GTK_BOX (hbox), toggle, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (color_balance_preview_update),
cbd);
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (color_balance_preview_update),
cbd);
gtk_widget_show (toggle);
gtk_widget_show (hbox);
@ -575,15 +576,15 @@ color_balance_create_lookup_tables (ColorBalanceDialog *cbd)
gint32 r_n, g_n, b_n;
/* Set the transfer arrays (for speed) */
cyan_red_transfer[SHADOWS] = (cbd->cyan_red[SHADOWS] > 0) ? shadows_add : shadows_sub;
cyan_red_transfer[MIDTONES] = (cbd->cyan_red[MIDTONES] > 0) ? midtones_add : midtones_sub;
cyan_red_transfer[HIGHLIGHTS] = (cbd->cyan_red[HIGHLIGHTS] > 0) ? highlights_add : highlights_sub;
magenta_green_transfer[SHADOWS] = (cbd->magenta_green[SHADOWS] > 0) ? shadows_add : shadows_sub;
magenta_green_transfer[MIDTONES] = (cbd->magenta_green[MIDTONES] > 0) ? midtones_add : midtones_sub;
magenta_green_transfer[HIGHLIGHTS] = (cbd->magenta_green[HIGHLIGHTS] > 0) ? highlights_add : highlights_sub;
yellow_blue_transfer[SHADOWS] = (cbd->yellow_blue[SHADOWS] > 0) ? shadows_add : shadows_sub;
yellow_blue_transfer[MIDTONES] = (cbd->yellow_blue[MIDTONES] > 0) ? midtones_add : midtones_sub;
yellow_blue_transfer[HIGHLIGHTS] = (cbd->yellow_blue[HIGHLIGHTS] > 0) ? highlights_add : highlights_sub;
cyan_red_transfer[GIMP_SHADOWS] = (cbd->cyan_red[GIMP_SHADOWS] > 0) ? shadows_add : shadows_sub;
cyan_red_transfer[GIMP_MIDTONES] = (cbd->cyan_red[GIMP_MIDTONES] > 0) ? midtones_add : midtones_sub;
cyan_red_transfer[GIMP_HIGHLIGHTS] = (cbd->cyan_red[GIMP_HIGHLIGHTS] > 0) ? highlights_add : highlights_sub;
magenta_green_transfer[GIMP_SHADOWS] = (cbd->magenta_green[GIMP_SHADOWS] > 0) ? shadows_add : shadows_sub;
magenta_green_transfer[GIMP_MIDTONES] = (cbd->magenta_green[GIMP_MIDTONES] > 0) ? midtones_add : midtones_sub;
magenta_green_transfer[GIMP_HIGHLIGHTS] = (cbd->magenta_green[GIMP_HIGHLIGHTS] > 0) ? highlights_add : highlights_sub;
yellow_blue_transfer[GIMP_SHADOWS] = (cbd->yellow_blue[GIMP_SHADOWS] > 0) ? shadows_add : shadows_sub;
yellow_blue_transfer[GIMP_MIDTONES] = (cbd->yellow_blue[GIMP_MIDTONES] > 0) ? midtones_add : midtones_sub;
yellow_blue_transfer[GIMP_HIGHLIGHTS] = (cbd->yellow_blue[GIMP_HIGHLIGHTS] > 0) ? highlights_add : highlights_sub;
for (i = 0; i < 256; i++)
{
@ -591,25 +592,25 @@ color_balance_create_lookup_tables (ColorBalanceDialog *cbd)
g_n = i;
b_n = i;
r_n += cbd->cyan_red[SHADOWS] * cyan_red_transfer[SHADOWS][r_n];
r_n += cbd->cyan_red[GIMP_SHADOWS] * cyan_red_transfer[GIMP_SHADOWS][r_n];
r_n = CLAMP0255 (r_n);
r_n += cbd->cyan_red[MIDTONES] * cyan_red_transfer[MIDTONES][r_n];
r_n += cbd->cyan_red[GIMP_MIDTONES] * cyan_red_transfer[GIMP_MIDTONES][r_n];
r_n = CLAMP0255 (r_n);
r_n += cbd->cyan_red[HIGHLIGHTS] * cyan_red_transfer[HIGHLIGHTS][r_n];
r_n += cbd->cyan_red[GIMP_HIGHLIGHTS] * cyan_red_transfer[GIMP_HIGHLIGHTS][r_n];
r_n = CLAMP0255 (r_n);
g_n += cbd->magenta_green[SHADOWS] * magenta_green_transfer[SHADOWS][g_n];
g_n += cbd->magenta_green[GIMP_SHADOWS] * magenta_green_transfer[GIMP_SHADOWS][g_n];
g_n = CLAMP0255 (g_n);
g_n += cbd->magenta_green[MIDTONES] * magenta_green_transfer[MIDTONES][g_n];
g_n += cbd->magenta_green[GIMP_MIDTONES] * magenta_green_transfer[GIMP_MIDTONES][g_n];
g_n = CLAMP0255 (g_n);
g_n += cbd->magenta_green[HIGHLIGHTS] * magenta_green_transfer[HIGHLIGHTS][g_n];
g_n += cbd->magenta_green[GIMP_HIGHLIGHTS] * magenta_green_transfer[GIMP_HIGHLIGHTS][g_n];
g_n = CLAMP0255 (g_n);
b_n += cbd->yellow_blue[SHADOWS] * yellow_blue_transfer[SHADOWS][b_n];
b_n += cbd->yellow_blue[GIMP_SHADOWS] * yellow_blue_transfer[GIMP_SHADOWS][b_n];
b_n = CLAMP0255 (b_n);
b_n += cbd->yellow_blue[MIDTONES] * yellow_blue_transfer[MIDTONES][b_n];
b_n += cbd->yellow_blue[GIMP_MIDTONES] * yellow_blue_transfer[GIMP_MIDTONES][b_n];
b_n = CLAMP0255 (b_n);
b_n += cbd->yellow_blue[HIGHLIGHTS] * yellow_blue_transfer[HIGHLIGHTS][b_n];
b_n += cbd->yellow_blue[GIMP_HIGHLIGHTS] * yellow_blue_transfer[GIMP_HIGHLIGHTS][b_n];
b_n = CLAMP0255 (b_n);
cbd->r_lookup[i] = r_n;
@ -716,11 +717,12 @@ color_balance_range_callback (GtkWidget *widget,
gpointer data)
{
ColorBalanceDialog *cbd;
TransferMode range;
GimpTransferMode range;
cbd = (ColorBalanceDialog *) data;
range = (TransferMode) gtk_object_get_user_data (GTK_OBJECT (widget));
range = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget),
"transfer_mode"));
cbd->application_mode = range;
color_balance_update (cbd, ALL);

38
app/base/color-balance.h
View File

@ -23,14 +23,6 @@
#include "gimpimagemaptool.h"
typedef enum
{
SHADOWS,
MIDTONES,
HIGHLIGHTS
} TransferMode;
#define GIMP_TYPE_COLOR_BALANCE_TOOL (gimp_color_balance_tool_get_type ())
#define GIMP_COLOR_BALANCE_TOOL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_COLOR_BALANCE_TOOL, GimpColorBalanceTool))
#define GIMP_IS_COLOR_BALANCE_TOOL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_COLOR_BALANCE_TOOL))
@ -56,26 +48,26 @@ typedef struct _ColorBalanceDialog ColorBalanceDialog;
struct _ColorBalanceDialog
{
GtkWidget *shell;
GtkWidget *shell;
GtkAdjustment *cyan_red_data;
GtkAdjustment *magenta_green_data;
GtkAdjustment *yellow_blue_data;
GtkAdjustment *cyan_red_data;
GtkAdjustment *magenta_green_data;
GtkAdjustment *yellow_blue_data;
GimpDrawable *drawable;
ImageMap *image_map;
GimpDrawable *drawable;
ImageMap *image_map;
gdouble cyan_red[3];
gdouble magenta_green[3];
gdouble yellow_blue[3];
gdouble cyan_red[3];
gdouble magenta_green[3];
gdouble yellow_blue[3];
guchar r_lookup[256];
guchar g_lookup[256];
guchar b_lookup[256];
guchar r_lookup[256];
guchar g_lookup[256];
guchar b_lookup[256];
gboolean preserve_luminosity;
gboolean preview;
TransferMode application_mode;
gboolean preserve_luminosity;
gboolean preview;
GimpTransferMode application_mode;
};

8
app/core/core-types.h
View File

@ -71,6 +71,14 @@ typedef enum
NO_FILL /*< nick=NO_IMAGE_FILL >*/
} GimpFillType;
/* Transfer modes */
typedef enum /*< chop=GIMP_ >*/
{
GIMP_SHADOWS,
GIMP_MIDTONES,
GIMP_HIGHLIGHTS
} GimpTransferMode;
/* base objects */

88
app/paint/gimpdodgeburn.c
View File

@ -55,7 +55,7 @@
#define DODGEBURN_DEFAULT_EXPOSURE 50.0
#define DODGEBURN_DEFAULT_TYPE DODGE
#define DODGEBURN_DEFAULT_MODE DODGEBURN_HIGHLIGHTS
#define DODGEBURN_DEFAULT_MODE GIMP_HIGHLIGHTS
/* the dodgeburn structures */
@ -63,33 +63,33 @@ typedef struct _DodgeBurnOptions DodgeBurnOptions;
struct _DodgeBurnOptions
{
PaintOptions paint_options;
PaintOptions paint_options;
DodgeBurnType type;
DodgeBurnType type_d;
GtkWidget *type_w[2];
DodgeBurnType type;
DodgeBurnType type_d;
GtkWidget *type_w[2];
DodgeBurnMode mode; /*highlights, midtones, shadows*/
DodgeBurnMode mode_d;
GtkWidget *mode_w[3];
GimpTransferMode mode; /*highlights, midtones, shadows*/
GimpTransferMode mode_d;
GtkWidget *mode_w[3];
gdouble exposure;
gdouble exposure_d;
GtkObject *exposure_w;
gdouble exposure;
gdouble exposure_d;
GtkObject *exposure_w;
GimpLut *lut;
GimpLut *lut;
};
static void gimp_dodgeburn_tool_class_init (GimpDodgeBurnToolClass *klass);
static void gimp_dodgeburn_tool_init (GimpDodgeBurnTool *dodgeburn);
static void gimp_dodgeburn_tool_make_luts (GimpPaintTool *paint_tool,
gdouble db_exposure,
DodgeBurnType type,
DodgeBurnMode mode,
GimpLut *lut,
GimpDrawable *drawable);
static void gimp_dodgeburn_tool_make_luts (GimpPaintTool *paint_tool,
gdouble db_exposure,
DodgeBurnType type,
GimpTransferMode mode,
GimpLut *lut,
GimpDrawable *drawable);
static void gimp_dodgeburn_tool_modifier_key (GimpTool *tool,
GdkEventKey *kevent,
@ -215,12 +215,12 @@ gimp_dodgeburn_tool_init (GimpDodgeBurnTool *dodgeburn)
}
static void
gimp_dodgeburn_tool_make_luts (GimpPaintTool *paint_tool,
gdouble db_exposure,
DodgeBurnType type,
DodgeBurnMode mode,
GimpLut *lut,
GimpDrawable *drawable)
gimp_dodgeburn_tool_make_luts (GimpPaintTool *paint_tool,
gdouble db_exposure,
DodgeBurnType type,
GimpTransferMode mode,
GimpLut *lut,
GimpDrawable *drawable)
{
GimpLutFunc lut_func;
gint nchannels = gimp_drawable_bytes (drawable);
@ -234,13 +234,13 @@ gimp_dodgeburn_tool_make_luts (GimpPaintTool *paint_tool,
switch (mode)
{
case DODGEBURN_HIGHLIGHTS:
case GIMP_HIGHLIGHTS:
lut_func = gimp_dodgeburn_tool_highlights_lut_func;
break;
case DODGEBURN_MIDTONES:
case GIMP_MIDTONES:
lut_func = gimp_dodgeburn_tool_midtones_lut_func;
break;
case DODGEBURN_SHADOWS:
case GIMP_SHADOWS:
lut_func = gimp_dodgeburn_tool_shadows_lut_func;
break;
default:
@ -561,7 +561,7 @@ gimp_dodgeburn_tool_non_gui_default (GimpDrawable *drawable,
{
gdouble exposure = DODGEBURN_DEFAULT_EXPOSURE;
DodgeBurnType type = DODGEBURN_DEFAULT_TYPE;
DodgeBurnMode mode = DODGEBURN_DEFAULT_MODE;
GimpTransferMode mode = DODGEBURN_DEFAULT_MODE;
DodgeBurnOptions *options = dodgeburn_options;
if (options)
@ -576,12 +576,12 @@ gimp_dodgeburn_tool_non_gui_default (GimpDrawable *drawable,
}
gboolean
gimp_dodgeburn_tool_non_gui (GimpDrawable *drawable,
gdouble exposure,
DodgeBurnType type,
DodgeBurnMode mode,
gint num_strokes,
gdouble *stroke_array)
gimp_dodgeburn_tool_non_gui (GimpDrawable *drawable,
gdouble exposure,
DodgeBurnType type,
GimpTransferMode mode,
gint num_strokes,
gdouble *stroke_array)
{
static GimpDodgeBurnTool *non_gui_dodgeburn = NULL;
@ -677,9 +677,9 @@ gimp_dodgeburn_tool_options_new (void)
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->exposure_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->exposure);
g_signal_connect (G_OBJECT (options->exposure_w), "value_changed",
G_CALLBACK (gimp_double_adjustment_update),
&options->exposure);
gtk_widget_show (scale);
gtk_widget_show (hbox);
@ -705,13 +705,13 @@ gimp_dodgeburn_tool_options_new (void)
gimp_radio_group_new2 (TRUE, _("Mode"),
G_CALLBACK (gimp_radio_button_update),
&options->mode,
(gpointer) options->mode,
GINT_TO_POINTER (options->mode),
_("Highlights"), (gpointer) DODGEBURN_HIGHLIGHTS,
_("Highlights"), GINT_TO_POINTER (GIMP_HIGHLIGHTS),
&options->mode_w[0],
_("Midtones"), (gpointer) DODGEBURN_MIDTONES,
_("Midtones"), GINT_TO_POINTER (GIMP_MIDTONES),
&options->mode_w[1],
_("Shadows"), (gpointer) DODGEBURN_SHADOWS,
_("Shadows"), GINT_TO_POINTER (GIMP_SHADOWS),
&options->mode_w[2],
NULL);
@ -734,7 +734,9 @@ gimp_dodgeburn_tool_options_reset (GimpToolOptions *tool_options)
gtk_adjustment_set_value (GTK_ADJUSTMENT (options->exposure_w),
options->exposure_d);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->type_w[options->type_d]), TRUE);
gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON (options->type_w[options->type_d]), TRUE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->mode_w[options->mode_d]), TRUE);
gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON (options->mode_w[options->mode_d]), TRUE);
}

23
app/paint/gimpdodgeburn.h
View File

@ -29,13 +29,6 @@ typedef enum
BURN
} DodgeBurnType;
typedef enum
{
DODGEBURN_HIGHLIGHTS,
DODGEBURN_MIDTONES,
DODGEBURN_SHADOWS
} DodgeBurnMode;
#define GIMP_TYPE_DODGEBURN_TOOL (gimp_dodgeburn_tool_get_type ())
#define GIMP_DODGEBURN_TOOL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DODGEBURN_TOOL, GimpDodgeBurnTool))
@ -58,16 +51,16 @@ struct _GimpDodgeBurnToolClass
};
void gimp_dodgeburn_tool_register (Gimp *gimp);
void gimp_dodgeburn_tool_register (Gimp *gimp);
GtkType gimp_dodgeburn_tool_get_type (void);
GType gimp_dodgeburn_tool_get_type (void);
gboolean gimp_dodgeburn_tool_non_gui (GimpDrawable *drawable,
gdouble exposure,
DodgeBurnType type,
DodgeBurnMode mode,
gint num_strokes,
gdouble *stroke_array);
gboolean gimp_dodgeburn_tool_non_gui (GimpDrawable *drawable,
gdouble exposure,
DodgeBurnType type,
GimpTransferMode mode,
gint num_strokes,
gdouble *stroke_array);
gboolean gimp_dodgeburn_tool_non_gui_default (GimpDrawable *drawable,
gint num_strokes,

7
app/paint/gimpsmudge.h
View File

@ -29,13 +29,6 @@ typedef enum
SMUDGE_TYPE_STREAK
} SmudgeType;
typedef enum
{
SMUDGE_MODE_HIGHLIGHTS,
SMUDGE_MODE_MIDTONES,
SMUDGE_MODE_SHADOWS
} SmudgeMode;
#define GIMP_TYPE_SMUDGE_TOOL (gimp_smudge_tool_get_type ())
#define GIMP_SMUDGE_TOOL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SMUDGE_TOOL, GimpSmudgeTool))

3
app/pdb/color_cmds.c
View File

@ -35,6 +35,7 @@
#include "base/lut-funcs.h"
#include "base/pixel-processor.h"
#include "base/pixel-region.h"
#include "core/core-types.h"
#include "core/gimpdrawable-desaturate.h"
#include "core/gimpdrawable-equalize.h"
#include "core/gimpdrawable-invert.h"
@ -805,7 +806,7 @@ color_balance_invoker (Gimp *gimp,
success = FALSE;
transfer_mode = args[1].value.pdb_int;
if (transfer_mode < SHADOWS || transfer_mode > HIGHLIGHTS)
if (transfer_mode < GIMP_SHADOWS || transfer_mode > GIMP_HIGHLIGHTS)
success = FALSE;
preserve_lum = args[2].value.pdb_int ? TRUE : FALSE;

5
app/pdb/tools_cmds.c
View File

@ -32,6 +32,7 @@
#include "appenums.h"
#include "base/base-types.h"
#include "base/tile-manager.h"
#include "core/core-types.h"
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "tools/gimpairbrushtool.h"
@ -1112,7 +1113,7 @@ dodgeburn_invoker (Gimp *gimp,
success = FALSE;
dodgeburn_mode = args[3].value.pdb_int;
if (dodgeburn_mode < DODGEBURN_HIGHLIGHTS || dodgeburn_mode > DODGEBURN_SHADOWS)
if (dodgeburn_mode < GIMP_SHADOWS || dodgeburn_mode > GIMP_HIGHLIGHTS)
success = FALSE;
num_strokes = args[4].value.pdb_int;
@ -1149,7 +1150,7 @@ static ProcArg dodgeburn_inargs[] =
{
GIMP_PDB_INT32,
"dodgeburn_mode",
"The mode: { DODGEBURN_HIGHLIGHTS (0), DODGEBURN_MIDTONES (1), DODGEBURN_SHADOWS (2) }"
"The mode: { SHADOWS (0), MIDTONES (1), HIGHLIGHTS (2) }"
},
{
GIMP_PDB_INT32,

82
app/tools/gimpcolorbalancetool.c
View File

@ -350,7 +350,7 @@ color_balance_dialog_new (void)
cbd = g_new (ColorBalanceDialog, 1);
cbd->preserve_luminosity = TRUE;
cbd->preview = TRUE;
cbd->application_mode = SHADOWS;
cbd->application_mode = GIMP_SHADOWS;
/* The shell and main vbox */
cbd->shell = gimp_dialog_new (_("Color Balance"), "color_balance",
@ -426,9 +426,9 @@ color_balance_dialog_new (void)
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_table_attach_defaults (GTK_TABLE (table), slider, 1, 2, 0, 1);
gtk_signal_connect (GTK_OBJECT (cbd->cyan_red_data), "value_changed",
GTK_SIGNAL_FUNC (color_balance_cr_adjustment_update),
cbd);
g_signal_connect (G_OBJECT (cbd->cyan_red_data), "value_changed",
G_CALLBACK (color_balance_cr_adjustment_update),
cbd);
end_label = gtk_label_new (_("Red"));
gtk_misc_set_alignment (GTK_MISC (end_label), 0.0, 1.0);
@ -451,9 +451,9 @@ color_balance_dialog_new (void)
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_table_attach_defaults (GTK_TABLE (table), slider, 1, 2, 1, 2);
gtk_signal_connect (GTK_OBJECT (cbd->magenta_green_data), "value_changed",
GTK_SIGNAL_FUNC (color_balance_mg_adjustment_update),
cbd);
g_signal_connect (G_OBJECT (cbd->magenta_green_data), "value_changed",
G_CALLBACK (color_balance_mg_adjustment_update),
cbd);
end_label = gtk_label_new (_("Green"));
gtk_misc_set_alignment (GTK_MISC (end_label), 0.0, 1.0);
@ -476,9 +476,9 @@ color_balance_dialog_new (void)
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_table_attach_defaults (GTK_TABLE (table), slider, 1, 2, 2, 3);
gtk_signal_connect (GTK_OBJECT (cbd->yellow_blue_data), "value_changed",
GTK_SIGNAL_FUNC (color_balance_yb_adjustment_update),
cbd);
g_signal_connect (G_OBJECT (cbd->yellow_blue_data), "value_changed",
G_CALLBACK (color_balance_yb_adjustment_update),
cbd);
end_label = gtk_label_new (_("Blue"));
gtk_misc_set_alignment (GTK_MISC (end_label), 0.0, 1.0);
@ -503,10 +503,11 @@ color_balance_dialog_new (void)
group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio_button));
gtk_box_pack_start (GTK_BOX (hbox), radio_button, TRUE, FALSE, 0);
gtk_object_set_user_data (GTK_OBJECT (radio_button), (gpointer) i);
gtk_signal_connect (GTK_OBJECT (radio_button), "toggled",
GTK_SIGNAL_FUNC (color_balance_range_callback),
cbd);
g_object_set_data (G_OBJECT (radio_button), "transfer_mode",
GINT_TO_POINTER (i));
g_signal_connect (G_OBJECT (radio_button), "toggled",
G_CALLBACK (color_balance_range_callback),
cbd);
gtk_widget_show (radio_button);
}
@ -522,18 +523,18 @@ color_balance_dialog_new (void)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
cbd->preserve_luminosity);
gtk_box_pack_start (GTK_BOX (hbox), toggle, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (color_balance_preserve_update),
cbd);
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (color_balance_preserve_update),
cbd);
gtk_widget_show (toggle);
/* The preview toggle */
toggle = gtk_check_button_new_with_label (_("Preview"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), cbd->preview);
gtk_box_pack_end (GTK_BOX (hbox), toggle, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (color_balance_preview_update),
cbd);
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (color_balance_preview_update),
cbd);
gtk_widget_show (toggle);
gtk_widget_show (hbox);
@ -575,15 +576,15 @@ color_balance_create_lookup_tables (ColorBalanceDialog *cbd)
gint32 r_n, g_n, b_n;
/* Set the transfer arrays (for speed) */
cyan_red_transfer[SHADOWS] = (cbd->cyan_red[SHADOWS] > 0) ? shadows_add : shadows_sub;
cyan_red_transfer[MIDTONES] = (cbd->cyan_red[MIDTONES] > 0) ? midtones_add : midtones_sub;
cyan_red_transfer[HIGHLIGHTS] = (cbd->cyan_red[HIGHLIGHTS] > 0) ? highlights_add : highlights_sub;
magenta_green_transfer[SHADOWS] = (cbd->magenta_green[SHADOWS] > 0) ? shadows_add : shadows_sub;
magenta_green_transfer[MIDTONES] = (cbd->magenta_green[MIDTONES] > 0) ? midtones_add : midtones_sub;
magenta_green_transfer[HIGHLIGHTS] = (cbd->magenta_green[HIGHLIGHTS] > 0) ? highlights_add : highlights_sub;
yellow_blue_transfer[SHADOWS] = (cbd->yellow_blue[SHADOWS] > 0) ? shadows_add : shadows_sub;
yellow_blue_transfer[MIDTONES] = (cbd->yellow_blue[MIDTONES] > 0) ? midtones_add : midtones_sub;
yellow_blue_transfer[HIGHLIGHTS] = (cbd->yellow_blue[HIGHLIGHTS] > 0) ? highlights_add : highlights_sub;
cyan_red_transfer[GIMP_SHADOWS] = (cbd->cyan_red[GIMP_SHADOWS] > 0) ? shadows_add : shadows_sub;
cyan_red_transfer[GIMP_MIDTONES] = (cbd->cyan_red[GIMP_MIDTONES] > 0) ? midtones_add : midtones_sub;
cyan_red_transfer[GIMP_HIGHLIGHTS] = (cbd->cyan_red[GIMP_HIGHLIGHTS] > 0) ? highlights_add : highlights_sub;
magenta_green_transfer[GIMP_SHADOWS] = (cbd->magenta_green[GIMP_SHADOWS] > 0) ? shadows_add : shadows_sub;
magenta_green_transfer[GIMP_MIDTONES] = (cbd->magenta_green[GIMP_MIDTONES] > 0) ? midtones_add : midtones_sub;
magenta_green_transfer[GIMP_HIGHLIGHTS] = (cbd->magenta_green[GIMP_HIGHLIGHTS] > 0) ? highlights_add : highlights_sub;
yellow_blue_transfer[GIMP_SHADOWS] = (cbd->yellow_blue[GIMP_SHADOWS] > 0) ? shadows_add : shadows_sub;
yellow_blue_transfer[GIMP_MIDTONES] = (cbd->yellow_blue[GIMP_MIDTONES] > 0) ? midtones_add : midtones_sub;
yellow_blue_transfer[GIMP_HIGHLIGHTS] = (cbd->yellow_blue[GIMP_HIGHLIGHTS] > 0) ? highlights_add : highlights_sub;
for (i = 0; i < 256; i++)
{
@ -591,25 +592,25 @@ color_balance_create_lookup_tables (ColorBalanceDialog *cbd)
g_n = i;
b_n = i;
r_n += cbd->cyan_red[SHADOWS] * cyan_red_transfer[SHADOWS][r_n];
r_n += cbd->cyan_red[GIMP_SHADOWS] * cyan_red_transfer[GIMP_SHADOWS][r_n];
r_n = CLAMP0255 (r_n);
r_n += cbd->cyan_red[MIDTONES] * cyan_red_transfer[MIDTONES][r_n];
r_n += cbd->cyan_red[GIMP_MIDTONES] * cyan_red_transfer[GIMP_MIDTONES][r_n];
r_n = CLAMP0255 (r_n);
r_n += cbd->cyan_red[HIGHLIGHTS] * cyan_red_transfer[HIGHLIGHTS][r_n];
r_n += cbd->cyan_red[GIMP_HIGHLIGHTS] * cyan_red_transfer[GIMP_HIGHLIGHTS][r_n];
r_n = CLAMP0255 (r_n);
g_n += cbd->magenta_green[SHADOWS] * magenta_green_transfer[SHADOWS][g_n];
g_n += cbd->magenta_green[GIMP_SHADOWS] * magenta_green_transfer[GIMP_SHADOWS][g_n];
g_n = CLAMP0255 (g_n);
g_n += cbd->magenta_green[MIDTONES] * magenta_green_transfer[MIDTONES][g_n];
g_n += cbd->magenta_green[GIMP_MIDTONES] * magenta_green_transfer[GIMP_MIDTONES][g_n];
g_n = CLAMP0255 (g_n);
g_n += cbd->magenta_green[HIGHLIGHTS] * magenta_green_transfer[HIGHLIGHTS][g_n];
g_n += cbd->magenta_green[GIMP_HIGHLIGHTS] * magenta_green_transfer[GIMP_HIGHLIGHTS][g_n];
g_n = CLAMP0255 (g_n);
b_n += cbd->yellow_blue[SHADOWS] * yellow_blue_transfer[SHADOWS][b_n];
b_n += cbd->yellow_blue[GIMP_SHADOWS] * yellow_blue_transfer[GIMP_SHADOWS][b_n];
b_n = CLAMP0255 (b_n);
b_n += cbd->yellow_blue[MIDTONES] * yellow_blue_transfer[MIDTONES][b_n];
b_n += cbd->yellow_blue[GIMP_MIDTONES] * yellow_blue_transfer[GIMP_MIDTONES][b_n];
b_n = CLAMP0255 (b_n);
b_n += cbd->yellow_blue[HIGHLIGHTS] * yellow_blue_transfer[HIGHLIGHTS][b_n];
b_n += cbd->yellow_blue[GIMP_HIGHLIGHTS] * yellow_blue_transfer[GIMP_HIGHLIGHTS][b_n];
b_n = CLAMP0255 (b_n);
cbd->r_lookup[i] = r_n;
@ -716,11 +717,12 @@ color_balance_range_callback (GtkWidget *widget,
gpointer data)
{
ColorBalanceDialog *cbd;
TransferMode range;
GimpTransferMode range;
cbd = (ColorBalanceDialog *) data;
range = (TransferMode) gtk_object_get_user_data (GTK_OBJECT (widget));
range = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget),
"transfer_mode"));
cbd->application_mode = range;
color_balance_update (cbd, ALL);

38
app/tools/gimpcolorbalancetool.h
View File

@ -23,14 +23,6 @@
#include "gimpimagemaptool.h"
typedef enum
{
SHADOWS,
MIDTONES,
HIGHLIGHTS
} TransferMode;
#define GIMP_TYPE_COLOR_BALANCE_TOOL (gimp_color_balance_tool_get_type ())
#define GIMP_COLOR_BALANCE_TOOL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_COLOR_BALANCE_TOOL, GimpColorBalanceTool))
#define GIMP_IS_COLOR_BALANCE_TOOL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_COLOR_BALANCE_TOOL))
@ -56,26 +48,26 @@ typedef struct _ColorBalanceDialog ColorBalanceDialog;
struct _ColorBalanceDialog
{
GtkWidget *shell;
GtkWidget *shell;
GtkAdjustment *cyan_red_data;
GtkAdjustment *magenta_green_data;
GtkAdjustment *yellow_blue_data;
GtkAdjustment *cyan_red_data;
GtkAdjustment *magenta_green_data;
GtkAdjustment *yellow_blue_data;
GimpDrawable *drawable;
ImageMap *image_map;
GimpDrawable *drawable;
ImageMap *image_map;
gdouble cyan_red[3];
gdouble magenta_green[3];
gdouble yellow_blue[3];
gdouble cyan_red[3];
gdouble magenta_green[3];
gdouble yellow_blue[3];
guchar r_lookup[256];
guchar g_lookup[256];
guchar b_lookup[256];
guchar r_lookup[256];
guchar g_lookup[256];
guchar b_lookup[256];
gboolean preserve_luminosity;
gboolean preview;
TransferMode application_mode;
gboolean preserve_luminosity;
gboolean preview;
GimpTransferMode application_mode;
};

88
app/tools/gimpdodgeburntool.c
View File

@ -55,7 +55,7 @@
#define DODGEBURN_DEFAULT_EXPOSURE 50.0
#define DODGEBURN_DEFAULT_TYPE DODGE
#define DODGEBURN_DEFAULT_MODE DODGEBURN_HIGHLIGHTS
#define DODGEBURN_DEFAULT_MODE GIMP_HIGHLIGHTS
/* the dodgeburn structures */
@ -63,33 +63,33 @@ typedef struct _DodgeBurnOptions DodgeBurnOptions;
struct _DodgeBurnOptions
{
PaintOptions paint_options;
PaintOptions paint_options;
DodgeBurnType type;
DodgeBurnType type_d;
GtkWidget *type_w[2];
DodgeBurnType type;
DodgeBurnType type_d;
GtkWidget *type_w[2];
DodgeBurnMode mode; /*highlights, midtones, shadows*/
DodgeBurnMode mode_d;
GtkWidget *mode_w[3];
GimpTransferMode mode; /*highlights, midtones, shadows*/
GimpTransferMode mode_d;
GtkWidget *mode_w[3];
gdouble exposure;
gdouble exposure_d;
GtkObject *exposure_w;
gdouble exposure;
gdouble exposure_d;
GtkObject *exposure_w;
GimpLut *lut;
GimpLut *lut;
};
static void gimp_dodgeburn_tool_class_init (GimpDodgeBurnToolClass *klass);
static void gimp_dodgeburn_tool_init (GimpDodgeBurnTool *dodgeburn);
static void gimp_dodgeburn_tool_make_luts (GimpPaintTool *paint_tool,
gdouble db_exposure,
DodgeBurnType type,
DodgeBurnMode mode,
GimpLut *lut,
GimpDrawable *drawable);
static void gimp_dodgeburn_tool_make_luts (GimpPaintTool *paint_tool,
gdouble db_exposure,
DodgeBurnType type,
GimpTransferMode mode,
GimpLut *lut,
GimpDrawable *drawable);
static void gimp_dodgeburn_tool_modifier_key (GimpTool *tool,
GdkEventKey *kevent,
@ -215,12 +215,12 @@ gimp_dodgeburn_tool_init (GimpDodgeBurnTool *dodgeburn)
}
static void
gimp_dodgeburn_tool_make_luts (GimpPaintTool *paint_tool,
gdouble db_exposure,
DodgeBurnType type,
DodgeBurnMode mode,
GimpLut *lut,
GimpDrawable *drawable)
gimp_dodgeburn_tool_make_luts (GimpPaintTool *paint_tool,
gdouble db_exposure,
DodgeBurnType type,
GimpTransferMode mode,
GimpLut *lut,
GimpDrawable *drawable)
{
GimpLutFunc lut_func;
gint nchannels = gimp_drawable_bytes (drawable);
@ -234,13 +234,13 @@ gimp_dodgeburn_tool_make_luts (GimpPaintTool *paint_tool,
switch (mode)
{
case DODGEBURN_HIGHLIGHTS:
case GIMP_HIGHLIGHTS:
lut_func = gimp_dodgeburn_tool_highlights_lut_func;
break;
case DODGEBURN_MIDTONES:
case GIMP_MIDTONES:
lut_func = gimp_dodgeburn_tool_midtones_lut_func;
break;
case DODGEBURN_SHADOWS:
case GIMP_SHADOWS:
lut_func = gimp_dodgeburn_tool_shadows_lut_func;
break;
default:
@ -561,7 +561,7 @@ gimp_dodgeburn_tool_non_gui_default (GimpDrawable *drawable,
{
gdouble exposure = DODGEBURN_DEFAULT_EXPOSURE;
DodgeBurnType type = DODGEBURN_DEFAULT_TYPE;
DodgeBurnMode mode = DODGEBURN_DEFAULT_MODE;
GimpTransferMode mode = DODGEBURN_DEFAULT_MODE;
DodgeBurnOptions *options = dodgeburn_options;
if (options)
@ -576,12 +576,12 @@ gimp_dodgeburn_tool_non_gui_default (GimpDrawable *drawable,
}
gboolean
gimp_dodgeburn_tool_non_gui (GimpDrawable *drawable,
gdouble exposure,
DodgeBurnType type,
DodgeBurnMode mode,
gint num_strokes,
gdouble *stroke_array)
gimp_dodgeburn_tool_non_gui (GimpDrawable *drawable,
gdouble exposure,
DodgeBurnType type,
GimpTransferMode mode,
gint num_strokes,
gdouble *stroke_array)
{
static GimpDodgeBurnTool *non_gui_dodgeburn = NULL;
@ -677,9 +677,9 @@ gimp_dodgeburn_tool_options_new (void)
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->exposure_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->exposure);
g_signal_connect (G_OBJECT (options->exposure_w), "value_changed",
G_CALLBACK (gimp_double_adjustment_update),
&options->exposure);
gtk_widget_show (scale);
gtk_widget_show (hbox);
@ -705,13 +705,13 @@ gimp_dodgeburn_tool_options_new (void)
gimp_radio_group_new2 (TRUE, _("Mode"),
G_CALLBACK (gimp_radio_button_update),
&options->mode,
(gpointer) options->mode,
GINT_TO_POINTER (options->mode),
_("Highlights"), (gpointer) DODGEBURN_HIGHLIGHTS,
_("Highlights"), GINT_TO_POINTER (GIMP_HIGHLIGHTS),
&options->mode_w[0],
_("Midtones"), (gpointer) DODGEBURN_MIDTONES,
_("Midtones"), GINT_TO_POINTER (GIMP_MIDTONES),
&options->mode_w[1],
_("Shadows"), (gpointer) DODGEBURN_SHADOWS,
_("Shadows"), GINT_TO_POINTER (GIMP_SHADOWS),
&options->mode_w[2],
NULL);
@ -734,7 +734,9 @@ gimp_dodgeburn_tool_options_reset (GimpToolOptions *tool_options)
gtk_adjustment_set_value (GTK_ADJUSTMENT (options->exposure_w),
options->exposure_d);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->type_w[options->type_d]), TRUE);
gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON (options->type_w[options->type_d]), TRUE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->mode_w[options->mode_d]), TRUE);
gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON (options->mode_w[options->mode_d]), TRUE);
}

23
app/tools/gimpdodgeburntool.h
View File

@ -29,13 +29,6 @@ typedef enum
BURN
} DodgeBurnType;
typedef enum
{
DODGEBURN_HIGHLIGHTS,
DODGEBURN_MIDTONES,
DODGEBURN_SHADOWS
} DodgeBurnMode;
#define GIMP_TYPE_DODGEBURN_TOOL (gimp_dodgeburn_tool_get_type ())
#define GIMP_DODGEBURN_TOOL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DODGEBURN_TOOL, GimpDodgeBurnTool))
@ -58,16 +51,16 @@ struct _GimpDodgeBurnToolClass
};
void gimp_dodgeburn_tool_register (Gimp *gimp);
void gimp_dodgeburn_tool_register (Gimp *gimp);
GtkType gimp_dodgeburn_tool_get_type (void);
GType gimp_dodgeburn_tool_get_type (void);
gboolean gimp_dodgeburn_tool_non_gui (GimpDrawable *drawable,
gdouble exposure,
DodgeBurnType type,
DodgeBurnMode mode,
gint num_strokes,
gdouble *stroke_array);
gboolean gimp_dodgeburn_tool_non_gui (GimpDrawable *drawable,
gdouble exposure,
DodgeBurnType type,
GimpTransferMode mode,
gint num_strokes,
gdouble *stroke_array);
gboolean gimp_dodgeburn_tool_non_gui_default (GimpDrawable *drawable,
gint num_strokes,

7
app/tools/gimpsmudgetool.h
View File

@ -29,13 +29,6 @@ typedef enum
SMUDGE_TYPE_STREAK
} SmudgeType;
typedef enum
{
SMUDGE_MODE_HIGHLIGHTS,
SMUDGE_MODE_MIDTONES,
SMUDGE_MODE_SHADOWS
} SmudgeMode;
#define GIMP_TYPE_SMUDGE_TOOL (gimp_smudge_tool_get_type ())
#define GIMP_SMUDGE_TOOL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SMUDGE_TOOL, GimpSmudgeTool))

21
libgimp/gimpenums.h
View File

@ -122,13 +122,6 @@ typedef enum
GIMP_CUSTOM_CONVOLVE
} GimpConvolveType;
typedef enum
{
GIMP_DODGEBURN_HIGHLIGHTS,
GIMP_DODGEBURN_MIDTONES,
GIMP_DODGEBURN_SHADOWS
} GimpDodgeBurnMode;
typedef enum
{
GIMP_DODGE,
@ -167,6 +160,13 @@ typedef enum
GIMP_OFFSET_TRANSPARENT
} GimpOffsetType;
typedef enum
{
GIMP_SHADOWS,
GIMP_MIDTONES,
GIMP_HIGHLIGHTS
} GimpTransferMode;
typedef enum
{
GIMP_ONCE_FORWARD,
@ -293,13 +293,6 @@ typedef enum
GIMP_STACK_TRACE_ALWAYS
} GimpStackTraceMode;
typedef enum
{
GIMP_SHADOWS,
GIMP_MIDTONES,
GIMP_HIGHLIGHTS
} GimpTransferMode;
#ifdef __cplusplus
}
#endif /* __cplusplus */

2
libgimp/gimptools_pdb.c
View File

@ -566,7 +566,7 @@ gboolean
gimp_dodgeburn (gint32 drawable_ID,
gdouble exposure,
GimpDodgeBurnType dodgeburn_type,
GimpDodgeBurnMode dodgeburn_mode,
GimpTransferMode dodgeburn_mode,
gint num_strokes,
gdouble *strokes)
{

2
libgimp/gimptools_pdb.h
View File

@ -98,7 +98,7 @@ gboolean gimp_convolve_default (gint32 drawable_ID,
gboolean gimp_dodgeburn (gint32 drawable_ID,
gdouble exposure,
GimpDodgeBurnType dodgeburn_type,
GimpDodgeBurnMode dodgeburn_mode,
GimpTransferMode dodgeburn_mode,
gint num_strokes,
gdouble *strokes);
gboolean gimp_dodgeburn_default (gint32 drawable_ID,

12
plug-ins/script-fu/script-fu-constants.c
View File

@ -83,10 +83,6 @@ init_generated_constants (void)
setvar (cintern ("SHARPEN-CONVOLVE"), flocons (1), NIL);
setvar (cintern ("CUSTOM-CONVOLVE"), flocons (2), NIL);
setvar (cintern ("DODGEBURN-HIGHLIGHTS"), flocons (0), NIL);
setvar (cintern ("DODGEBURN-MIDTONES"), flocons (1), NIL);
setvar (cintern ("DODGEBURN-SHADOWS"), flocons (2), NIL);
setvar (cintern ("DODGE"), flocons (0), NIL);
setvar (cintern ("BURN"), flocons (1), NIL);
@ -145,6 +141,10 @@ init_generated_constants (void)
setvar (cintern ("PDB-SUCCESS"), flocons (3), NIL);
setvar (cintern ("PDB-CANCEL"), flocons (4), NIL);
setvar (cintern ("SHADOWS"), flocons (0), NIL);
setvar (cintern ("MIDTONES"), flocons (1), NIL);
setvar (cintern ("HIGHLIGHTS"), flocons (2), NIL);
setvar (cintern ("UNIT-PIXEL"), flocons (0), NIL);
setvar (cintern ("UNIT-INCH"), flocons (1), NIL);
setvar (cintern ("UNIT-MM"), flocons (2), NIL);
@ -236,9 +236,5 @@ init_generated_constants (void)
setvar (cintern ("STACK-TRACE-QUERY"), flocons (1), NIL);
setvar (cintern ("STACK-TRACE-ALWAYS"), flocons (2), NIL);
setvar (cintern ("SHADOWS"), flocons (0), NIL);
setvar (cintern ("MIDTONES"), flocons (1), NIL);
setvar (cintern ("HIGHLIGHTS"), flocons (2), NIL);
return;
}

1
tools/pdbgen/Makefile.am
View File

@ -59,7 +59,6 @@ enum_headers = \
../../app/tools/gimpblendtool.h \
../../app/tools/gimpbucketfilltool.h \
../../app/tools/gimpclonetool.h \
../../app/tools/gimpcolorbalancetool.h \
../../app/tools/gimpconvolvetool.h \
../../app/tools/gimpdodgeburntool.h \
../../app/tools/gimphuesaturationtool.h \

28
tools/pdbgen/enums.pl
View File

@ -336,6 +336,17 @@ package Gimp::CodeGen::enums;
TRANSPARENT_FILL => 'TRANS_IMAGE_FILL',
NO_FILL => 'NO_IMAGE_FILL' }
},
GimpTransferMode =>
{ contig => 1,
header => 'core/core-types.h',
symbols => [ qw(GIMP_SHADOWS GIMP_MIDTONES GIMP_HIGHLIGHTS) ],
mapping => { GIMP_SHADOWS => '0',
GIMP_MIDTONES => '1',
GIMP_HIGHLIGHTS => '2' },
nicks => { GIMP_SHADOWS => 'SHADOWS',
GIMP_MIDTONES => 'MIDTONES',
GIMP_HIGHLIGHTS => 'HIGHLIGHTS' }
},
GimpOffsetType =>
{ contig => 1,
header => 'core/gimpdrawable-offset.h',
@ -431,14 +442,6 @@ package Gimp::CodeGen::enums;
mapping => { IMAGE_CLONE => '0',
PATTERN_CLONE => '1' }
},
TransferMode =>
{ contig => 1,
header => 'tools/gimpcolorbalancetool.h',
symbols => [ qw(SHADOWS MIDTONES HIGHLIGHTS) ],
mapping => { SHADOWS => '0',
MIDTONES => '1',
HIGHLIGHTS => '2' }
},
ConvolveType =>
{ contig => 1,
header => 'tools/gimpconvolvetool.h',
@ -454,15 +457,6 @@ package Gimp::CodeGen::enums;
mapping => { DODGE => '0',
BURN => '1' }
},
DodgeBurnMode =>
{ contig => 1,
header => 'tools/gimpdodgeburntool.h',
symbols => [ qw(DODGEBURN_HIGHLIGHTS DODGEBURN_MIDTONES
DODGEBURN_SHADOWS) ],
mapping => { DODGEBURN_HIGHLIGHTS => '0',
DODGEBURN_MIDTONES => '1',
DODGEBURN_SHADOWS => '2' }
},
HueRange =>
{ contig => 1,
header => 'tools/gimphuesaturationtool.h',

2
tools/pdbgen/pdb/color.pdb
View File

@ -480,7 +480,7 @@ HELP
@inargs = (
&drawable_arg,
{ name => 'transfer_mode', type => 'enum TransferMode',
{ name => 'transfer_mode', type => 'enum GimpTransferMode',
desc => 'Transfer mode: { %%desc%% }' },
{ name => 'preserve_lum', type => 'boolean',
desc => 'Preserve luminosity values at each pixel' }

2
tools/pdbgen/pdb/misc_tools.pdb
View File

@ -1440,7 +1440,7 @@ HELP
desc => 'The exposer of the strokes (%%desc%%)' },
{ name => 'dodgeburn_type', type => 'enum DodgeBurnType',
desc => 'The type either dodge or burn: { %%desc%% }' },
{ name => 'dodgeburn_mode', type => 'enum DodgeBurnMode',
{ name => 'dodgeburn_mode', type => 'enum GimpTransferMode',
desc => 'The mode: { %%desc%% }' },
&stroke_arg
);

2
tools/pdbgen/pdb/paint_tools.pdb
View File

@ -1440,7 +1440,7 @@ HELP
desc => 'The exposer of the strokes (%%desc%%)' },
{ name => 'dodgeburn_type', type => 'enum DodgeBurnType',
desc => 'The type either dodge or burn: { %%desc%% }' },
{ name => 'dodgeburn_mode', type => 'enum DodgeBurnMode',
{ name => 'dodgeburn_mode', type => 'enum GimpTransferMode',
desc => 'The mode: { %%desc%% }' },
&stroke_arg
);

2
tools/pdbgen/pdb/tools.pdb
View File

@ -1440,7 +1440,7 @@ HELP
desc => 'The exposer of the strokes (%%desc%%)' },
{ name => 'dodgeburn_type', type => 'enum DodgeBurnType',
desc => 'The type either dodge or burn: { %%desc%% }' },
{ name => 'dodgeburn_mode', type => 'enum DodgeBurnMode',
{ name => 'dodgeburn_mode', type => 'enum GimpTransferMode',
desc => 'The mode: { %%desc%% }' },
&stroke_arg
);

2
tools/pdbgen/pdb/transform_tools.pdb
View File

@ -1440,7 +1440,7 @@ HELP
desc => 'The exposer of the strokes (%%desc%%)' },
{ name => 'dodgeburn_type', type => 'enum DodgeBurnType',
desc => 'The type either dodge or burn: { %%desc%% }' },
{ name => 'dodgeburn_mode', type => 'enum DodgeBurnMode',
{ name => 'dodgeburn_mode', type => 'enum GimpTransferMode',
desc => 'The mode: { %%desc%% }' },
&stroke_arg
);