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

app/apptypes.h app/brush_select_cmds.c app/brushes_cmds.c app/layer_cmds.c

Browse Source 
2001-01-09  Sven Neumann  <sven@gimp.org>

	* app/apptypes.h
	* app/brush_select_cmds.c
	* app/brushes_cmds.c
	* app/layer_cmds.c
	* app/layers_dialog.c
	* app/paint_funcs.c
	* app/tool_options.c
	* app/tools_cmds.c
	* libgimp/gimpenums.h
	* plug-ins/script-fu/script-fu-constants.c
	* tools/pdbgen/enums.pl: applied patch from <oliver@zeroknowledge.com>
	that adds new blending modes (Dodge/Burn/Hardlight). Please play with
	these new modes and check if they are useful and well-implemented.
This commit is contained in:
Sven Neumann
2001-01-09 02:45:27 +00:00
committed by Sven Neumann
parent d701e44276
commit 99e80ca55c
16 changed files with 331 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,3 +1,19 @@
2001-01-09 Sven Neumann <sven@gimp.org>
* app/apptypes.h
* app/brush_select_cmds.c
* app/brushes_cmds.c
* app/layer_cmds.c
* app/layers_dialog.c
* app/paint_funcs.c
* app/tool_options.c
* app/tools_cmds.c
* libgimp/gimpenums.h
* plug-ins/script-fu/script-fu-constants.c
* tools/pdbgen/enums.pl: applied patch from <oliver@zeroknowledge.com>
that adds new blending modes (Dodge/Burn/Hardlight). Please play with
these new modes and check if they are useful and well-implemented.
2001-01-09 Sven Neumann <sven@gimp.org>
* HACKING: added notice about autogenerated files.

3
app/apptypes.h
View File

@ -88,6 +88,9 @@ typedef enum
COLOR_MODE,
VALUE_MODE,
DIVIDE_MODE,
DODGE_MODE,
BURN_MODE,
HARDLIGHT_MODE,
ERASE_MODE, /*< skip >*/
REPLACE_MODE, /*< skip >*/
ANTI_ERASE_MODE /*< skip >*/

8
app/brush_select_cmds.c
View File

@ -88,7 +88,7 @@ brushes_popup_invoker (Argument *args)
spacing = args[4].value.pdb_int;
paint_mode = args[5].value.pdb_int;
if (paint_mode < NORMAL_MODE || paint_mode > DIVIDE_MODE)
if (paint_mode < NORMAL_MODE || paint_mode > HARDLIGHT_MODE)
success = FALSE;
if (success)
@ -141,7 +141,7 @@ static ProcArg brushes_popup_inargs[] =
{
PDB_INT32,
"paint_mode",
"The initial paint mode: { NORMAL_MODE (0), DISSOLVE_MODE (1), BEHIND_MODE (2), MULTIPLY_MODE (3), SCREEN_MODE (4), OVERLAY_MODE (5), DIFFERENCE_MODE (6), ADDITION_MODE (7), SUBTRACT_MODE (8), DARKEN_ONLY_MODE (9), LIGHTEN_ONLY_MODE (10), HUE_MODE (11), SATURATION_MODE (12), COLOR_MODE (13), VALUE_MODE (14), DIVIDE_MODE (15) }"
"The initial paint mode: { NORMAL_MODE (0), DISSOLVE_MODE (1), BEHIND_MODE (2), MULTIPLY_MODE (3), SCREEN_MODE (4), OVERLAY_MODE (5), DIFFERENCE_MODE (6), ADDITION_MODE (7), SUBTRACT_MODE (8), DARKEN_ONLY_MODE (9), LIGHTEN_ONLY_MODE (10), HUE_MODE (11), SATURATION_MODE (12), COLOR_MODE (13), VALUE_MODE (14), DIVIDE_MODE (15), DODGE_MODE (16), BURN_MODE (17), HARDLIGHT_MODE (18) }"
}
};
@ -245,7 +245,7 @@ brushes_set_popup_invoker (Argument *args)
spacing = args[3].value.pdb_int;
paint_mode = args[4].value.pdb_int;
if (paint_mode < NORMAL_MODE || paint_mode > DIVIDE_MODE)
if (paint_mode < NORMAL_MODE || paint_mode > HARDLIGHT_MODE)
success = FALSE;
if (success)
@ -300,7 +300,7 @@ static ProcArg brushes_set_popup_inargs[] =
{
PDB_INT32,
"paint_mode",
"The initial paint mode: { NORMAL_MODE (0), DISSOLVE_MODE (1), BEHIND_MODE (2), MULTIPLY_MODE (3), SCREEN_MODE (4), OVERLAY_MODE (5), DIFFERENCE_MODE (6), ADDITION_MODE (7), SUBTRACT_MODE (8), DARKEN_ONLY_MODE (9), LIGHTEN_ONLY_MODE (10), HUE_MODE (11), SATURATION_MODE (12), COLOR_MODE (13), VALUE_MODE (14), DIVIDE_MODE (15) }"
"The initial paint mode: { NORMAL_MODE (0), DISSOLVE_MODE (1), BEHIND_MODE (2), MULTIPLY_MODE (3), SCREEN_MODE (4), OVERLAY_MODE (5), DIFFERENCE_MODE (6), ADDITION_MODE (7), SUBTRACT_MODE (8), DARKEN_ONLY_MODE (9), LIGHTEN_ONLY_MODE (10), HUE_MODE (11), SATURATION_MODE (12), COLOR_MODE (13), VALUE_MODE (14), DIVIDE_MODE (15), DODGE_MODE (16), BURN_MODE (17), HARDLIGHT_MODE (18) }"
}
};

8
app/brushes_cmds.c
View File

@ -374,7 +374,7 @@ static ProcArg brushes_get_paint_mode_outargs[] =
{
PDB_INT32,
"paint_mode",
"The paint mode: { NORMAL_MODE (0), DISSOLVE_MODE (1), BEHIND_MODE (2), MULTIPLY_MODE (3), SCREEN_MODE (4), OVERLAY_MODE (5), DIFFERENCE_MODE (6), ADDITION_MODE (7), SUBTRACT_MODE (8), DARKEN_ONLY_MODE (9), LIGHTEN_ONLY_MODE (10), HUE_MODE (11), SATURATION_MODE (12), COLOR_MODE (13), VALUE_MODE (14), DIVIDE_MODE (15) }"
"The paint mode: { NORMAL_MODE (0), DISSOLVE_MODE (1), BEHIND_MODE (2), MULTIPLY_MODE (3), SCREEN_MODE (4), OVERLAY_MODE (5), DIFFERENCE_MODE (6), ADDITION_MODE (7), SUBTRACT_MODE (8), DARKEN_ONLY_MODE (9), LIGHTEN_ONLY_MODE (10), HUE_MODE (11), SATURATION_MODE (12), COLOR_MODE (13), VALUE_MODE (14), DIVIDE_MODE (15), DODGE_MODE (16), BURN_MODE (17), HARDLIGHT_MODE (18) }"
}
};
@ -401,7 +401,7 @@ brushes_set_paint_mode_invoker (Argument *args)
gint32 paint_mode;
paint_mode = args[0].value.pdb_int;
if (paint_mode < NORMAL_MODE || paint_mode > DIVIDE_MODE)
if (paint_mode < NORMAL_MODE || paint_mode > HARDLIGHT_MODE)
success = FALSE;
if (success)
@ -415,7 +415,7 @@ static ProcArg brushes_set_paint_mode_inargs[] =
{
PDB_INT32,
"paint_mode",
"The paint mode: { NORMAL_MODE (0), DISSOLVE_MODE (1), BEHIND_MODE (2), MULTIPLY_MODE (3), SCREEN_MODE (4), OVERLAY_MODE (5), DIFFERENCE_MODE (6), ADDITION_MODE (7), SUBTRACT_MODE (8), DARKEN_ONLY_MODE (9), LIGHTEN_ONLY_MODE (10), HUE_MODE (11), SATURATION_MODE (12), COLOR_MODE (13), VALUE_MODE (14), DIVIDE_MODE (15) }"
"The paint mode: { NORMAL_MODE (0), DISSOLVE_MODE (1), BEHIND_MODE (2), MULTIPLY_MODE (3), SCREEN_MODE (4), OVERLAY_MODE (5), DIFFERENCE_MODE (6), ADDITION_MODE (7), SUBTRACT_MODE (8), DARKEN_ONLY_MODE (9), LIGHTEN_ONLY_MODE (10), HUE_MODE (11), SATURATION_MODE (12), COLOR_MODE (13), VALUE_MODE (14), DIVIDE_MODE (15), DODGE_MODE (16), BURN_MODE (17), HARDLIGHT_MODE (18) }"
}
};
@ -585,7 +585,7 @@ static ProcArg brushes_get_brush_data_outargs[] =
{
PDB_INT32,
"paint_mode",
"The paint mode: { NORMAL_MODE (0), DISSOLVE_MODE (1), BEHIND_MODE (2), MULTIPLY_MODE (3), SCREEN_MODE (4), OVERLAY_MODE (5), DIFFERENCE_MODE (6), ADDITION_MODE (7), SUBTRACT_MODE (8), DARKEN_ONLY_MODE (9), LIGHTEN_ONLY_MODE (10), HUE_MODE (11), SATURATION_MODE (12), COLOR_MODE (13), VALUE_MODE (14), DIVIDE_MODE (15) }"
"The paint mode: { NORMAL_MODE (0), DISSOLVE_MODE (1), BEHIND_MODE (2), MULTIPLY_MODE (3), SCREEN_MODE (4), OVERLAY_MODE (5), DIFFERENCE_MODE (6), ADDITION_MODE (7), SUBTRACT_MODE (8), DARKEN_ONLY_MODE (9), LIGHTEN_ONLY_MODE (10), HUE_MODE (11), SATURATION_MODE (12), COLOR_MODE (13), VALUE_MODE (14), DIVIDE_MODE (15), DODGE_MODE (16), BURN_MODE (17), HARDLIGHT_MODE (18) }"
},
{
PDB_INT32,

7
app/core/gimptooloptions.c
View File

@ -948,10 +948,13 @@ paint_mode_menu_new (GtkSignalFunc callback,
_("Normal"), (gpointer) NORMAL_MODE, NULL,
_("Dissolve"), (gpointer) DISSOLVE_MODE, NULL,
_("Behind"), (gpointer) BEHIND_MODE, NULL,
_("Multiply (Burn)"), (gpointer) MULTIPLY_MODE, NULL,
_("Divide (Dodge)"), (gpointer) DIVIDE_MODE, NULL,
_("Multiply"), (gpointer) MULTIPLY_MODE, NULL,
_("Divide"), (gpointer) DIVIDE_MODE, NULL,
_("Screen"), (gpointer) SCREEN_MODE, NULL,
_("Overlay"), (gpointer) OVERLAY_MODE, NULL,
_("Dodge"), (gpointer) DODGE_MODE, NULL,
_("Burn"), (gpointer) BURN_MODE, NULL,
_("Hard Light"), (gpointer) HARDLIGHT_MODE, NULL,
_("Difference"), (gpointer) DIFFERENCE_MODE, NULL,
_("Addition"), (gpointer) ADDITION_MODE, NULL,
_("Subtract"), (gpointer) SUBTRACT_MODE, NULL,

7
app/gui/layers-dialog.c
View File

@ -378,10 +378,13 @@ layers_dialog_create (void)
NULL, (gpointer) NORMAL_MODE,
_("Normal"), (gpointer) NORMAL_MODE, NULL,
_("Dissolve"), (gpointer) DISSOLVE_MODE, NULL,
_("Multiply (Burn)"), (gpointer) MULTIPLY_MODE, NULL,
_("Divide (Dodge)"), (gpointer) DIVIDE_MODE, NULL,
_("Multiply"), (gpointer) MULTIPLY_MODE, NULL,
_("Divide"), (gpointer) DIVIDE_MODE, NULL,
_("Screen"), (gpointer) SCREEN_MODE, NULL,
_("Overlay"), (gpointer) OVERLAY_MODE, NULL,
_("Dodge"), (gpointer) DODGE_MODE, NULL,
_("Burn"), (gpointer) BURN_MODE, NULL,
_("Hard Light"), (gpointer) HARDLIGHT_MODE, NULL,
_("Difference"), (gpointer) DIFFERENCE_MODE, NULL,
_("Addition"), (gpointer) ADDITION_MODE, NULL,
_("Subtract"), (gpointer) SUBTRACT_MODE, NULL,

6
app/layer_cmds.c
View File

@ -139,7 +139,7 @@ layer_new_invoker (Argument *args)
success = FALSE;
mode = args[6].value.pdb_int;
if (mode < NORMAL_MODE || mode > DIVIDE_MODE)
if (mode < NORMAL_MODE || mode > HARDLIGHT_MODE)
success = FALSE;
if (success)
@ -192,7 +192,7 @@ static ProcArg layer_new_inargs[] =
{
PDB_INT32,
"mode",
"The layer combination mode: { NORMAL_MODE (0), DISSOLVE_MODE (1), BEHIND_MODE (2), MULTIPLY_MODE (3), SCREEN_MODE (4), OVERLAY_MODE (5), DIFFERENCE_MODE (6), ADDITION_MODE (7), SUBTRACT_MODE (8), DARKEN_ONLY_MODE (9), LIGHTEN_ONLY_MODE (10), HUE_MODE (11), SATURATION_MODE (12), COLOR_MODE (13), VALUE_MODE (14), DIVIDE_MODE (15) }"
"The layer combination mode: { NORMAL_MODE (0), DISSOLVE_MODE (1), BEHIND_MODE (2), MULTIPLY_MODE (3), SCREEN_MODE (4), OVERLAY_MODE (5), DIFFERENCE_MODE (6), ADDITION_MODE (7), SUBTRACT_MODE (8), DARKEN_ONLY_MODE (9), LIGHTEN_ONLY_MODE (10), HUE_MODE (11), SATURATION_MODE (12), COLOR_MODE (13), VALUE_MODE (14), DIVIDE_MODE (15), DODGE_MODE (16), BURN_MODE (17), HARDLIGHT_MODE (18) }"
}
};
@ -1688,7 +1688,7 @@ layer_set_mode_invoker (Argument *args)
success = FALSE;
mode = args[1].value.pdb_int;
if (mode < NORMAL_MODE || mode > DIVIDE_MODE)
if (mode < NORMAL_MODE || mode > HARDLIGHT_MODE)
success = FALSE;
if (success)

7
app/layers_dialog.c
View File

@ -378,10 +378,13 @@ layers_dialog_create (void)
NULL, (gpointer) NORMAL_MODE,
_("Normal"), (gpointer) NORMAL_MODE, NULL,
_("Dissolve"), (gpointer) DISSOLVE_MODE, NULL,
_("Multiply (Burn)"), (gpointer) MULTIPLY_MODE, NULL,
_("Divide (Dodge)"), (gpointer) DIVIDE_MODE, NULL,
_("Multiply"), (gpointer) MULTIPLY_MODE, NULL,
_("Divide"), (gpointer) DIVIDE_MODE, NULL,
_("Screen"), (gpointer) SCREEN_MODE, NULL,
_("Overlay"), (gpointer) OVERLAY_MODE, NULL,
_("Dodge"), (gpointer) DODGE_MODE, NULL,
_("Burn"), (gpointer) BURN_MODE, NULL,
_("Hard Light"), (gpointer) HARDLIGHT_MODE, NULL,
_("Difference"), (gpointer) DIFFERENCE_MODE, NULL,
_("Addition"), (gpointer) ADDITION_MODE, NULL,
_("Subtract"), (gpointer) SUBTRACT_MODE, NULL,

129
app/paint-funcs/paint-funcs.c
View File

@ -106,7 +106,10 @@ LayerMode layer_modes[] = /* This must obviously be in the same
{ 0, 0, 0, N_("Divide (Dodge)") },
{ 1, 0, 1, N_("Erase") },
{ 1, 1, 1, N_("Replace") },
{ 1, 0, 1, N_("Anti Erase") }
{ 1, 0, 1, N_("Anti Erase") },
{ 0, 0, 0, N_("Dodge") },
{ 0, 0, 0, N_("Burn") },
{ 0, 0, 0, N_("Hard Light") }
};
/* ColorHash structure */
@ -1026,6 +1029,118 @@ overlay_pixels (const guchar *src1,
}
void
dodge_pixels (const guchar *src1,
const guchar *src2,
guchar *dest,
gint length,
gint b1,
gint b2,
gint ha1,
gint ha2)
{
gint alpha, b;
int tmp1;
alpha = (ha1 || ha2) ? MAX (b1, b2) - 1 : b1;
while (length --)
{
for (b = 0; b < alpha; b++)
{
tmp1 = src1[b] << 8;
tmp1 /= 256 - src2[b];
dest[b] = (guchar) CLAMP (tmp1, 0, 255);
}
if (ha1 && ha2)
dest[alpha] = MIN (src1[alpha], src2[alpha]);
else if (ha2)
dest[alpha] = src2[alpha];
src1 += b1;
src2 += b2;
dest += b2;
}
}
void
burn_pixels (const guchar *src1,
const guchar *src2,
guchar *dest,
gint length,
gint b1,
gint b2,
gint ha1,
gint ha2)
{
gint alpha, b;
gint tmp1;
alpha = (ha1 || ha2) ? MAX (b1, b2) - 1 : b1;
while (length --)
{
for (b = 0; b < alpha; b++)
{
tmp1 = (255 - src1[b]) << 8;
tmp1 /= src2[b] + 1;
dest[b] = (guchar) CLAMP (255 - tmp1, 0, 255);
}
if (ha1 && ha2)
dest[alpha] = MIN (src1[alpha], src2[alpha]);
else if (ha2)
dest[alpha] = src2[alpha];
src1 += b1;
src2 += b2;
dest += b2;
}
}
void
hardlight_pixels (const guchar *src1,
const guchar *src2,
guchar *dest,
gint length,
gint b1,
gint b2,
gint ha1,
gint ha2)
{
gint alpha, b;
gint tmp1;
alpha = (ha1 || ha2) ? MAX (b1, b2) - 1 : b1;
while (length --)
{
for (b = 0; b < alpha; b++)
{
if (src2[b] > 128) {
tmp1 = ((gint)255 - src1[b]) * ((gint)255 - ((src2[b] - 128) << 1));
dest[b] = (guchar)CLAMP(255 - (tmp1 >> 8), 0, 255);
} else {
tmp1 = (gint)src1[b] * ((gint)src2[b] << 1);
dest[b] = (guchar)CLAMP(tmp1 >> 8, 0, 255);
}
}
if (ha1 && ha2)
dest[alpha] = MIN (src1[alpha], src2[alpha]);
else if (ha2)
dest[alpha] = src2[alpha];
src1 += b1;
src2 += b2;
dest += b2;
}
}
void
add_pixels (const guchar *src1,
const guchar *src2,
@ -5957,6 +6072,18 @@ apply_layer_mode (guchar *src1,
combine = (has_alpha1 && has_alpha2) ? ANTI_ERASE_INTEN : combine;
break;
case DODGE_MODE:
dodge_pixels (src1, src2, *dest, length, bytes1, bytes2, has_alpha1, has_alpha2);
break;
case BURN_MODE:
burn_pixels (src1, src2, *dest, length, bytes1, bytes2, has_alpha1, has_alpha2);
break;
case HARDLIGHT_MODE:
hardlight_pixels (src1, src2, *dest, length, bytes1, bytes2, has_alpha1, has_alpha2);
break;
default :
break;
}

129
app/paint_funcs.c
View File

@ -106,7 +106,10 @@ LayerMode layer_modes[] = /* This must obviously be in the same
{ 0, 0, 0, N_("Divide (Dodge)") },
{ 1, 0, 1, N_("Erase") },
{ 1, 1, 1, N_("Replace") },
{ 1, 0, 1, N_("Anti Erase") }
{ 1, 0, 1, N_("Anti Erase") },
{ 0, 0, 0, N_("Dodge") },
{ 0, 0, 0, N_("Burn") },
{ 0, 0, 0, N_("Hard Light") }
};
/* ColorHash structure */
@ -1026,6 +1029,118 @@ overlay_pixels (const guchar *src1,
}
void
dodge_pixels (const guchar *src1,
const guchar *src2,
guchar *dest,
gint length,
gint b1,
gint b2,
gint ha1,
gint ha2)
{
gint alpha, b;
int tmp1;
alpha = (ha1 || ha2) ? MAX (b1, b2) - 1 : b1;
while (length --)
{
for (b = 0; b < alpha; b++)
{
tmp1 = src1[b] << 8;
tmp1 /= 256 - src2[b];
dest[b] = (guchar) CLAMP (tmp1, 0, 255);
}
if (ha1 && ha2)
dest[alpha] = MIN (src1[alpha], src2[alpha]);
else if (ha2)
dest[alpha] = src2[alpha];
src1 += b1;
src2 += b2;
dest += b2;
}
}
void
burn_pixels (const guchar *src1,
const guchar *src2,
guchar *dest,
gint length,
gint b1,
gint b2,
gint ha1,
gint ha2)
{
gint alpha, b;
gint tmp1;
alpha = (ha1 || ha2) ? MAX (b1, b2) - 1 : b1;
while (length --)
{
for (b = 0; b < alpha; b++)
{
tmp1 = (255 - src1[b]) << 8;
tmp1 /= src2[b] + 1;
dest[b] = (guchar) CLAMP (255 - tmp1, 0, 255);
}
if (ha1 && ha2)
dest[alpha] = MIN (src1[alpha], src2[alpha]);
else if (ha2)
dest[alpha] = src2[alpha];
src1 += b1;
src2 += b2;
dest += b2;
}
}
void
hardlight_pixels (const guchar *src1,
const guchar *src2,
guchar *dest,
gint length,
gint b1,
gint b2,
gint ha1,
gint ha2)
{
gint alpha, b;
gint tmp1;
alpha = (ha1 || ha2) ? MAX (b1, b2) - 1 : b1;
while (length --)
{
for (b = 0; b < alpha; b++)
{
if (src2[b] > 128) {
tmp1 = ((gint)255 - src1[b]) * ((gint)255 - ((src2[b] - 128) << 1));
dest[b] = (guchar)CLAMP(255 - (tmp1 >> 8), 0, 255);
} else {
tmp1 = (gint)src1[b] * ((gint)src2[b] << 1);
dest[b] = (guchar)CLAMP(tmp1 >> 8, 0, 255);
}
}
if (ha1 && ha2)
dest[alpha] = MIN (src1[alpha], src2[alpha]);
else if (ha2)
dest[alpha] = src2[alpha];
src1 += b1;
src2 += b2;
dest += b2;
}
}
void
add_pixels (const guchar *src1,
const guchar *src2,
@ -5957,6 +6072,18 @@ apply_layer_mode (guchar *src1,
combine = (has_alpha1 && has_alpha2) ? ANTI_ERASE_INTEN : combine;
break;
case DODGE_MODE:
dodge_pixels (src1, src2, *dest, length, bytes1, bytes2, has_alpha1, has_alpha2);
break;
case BURN_MODE:
burn_pixels (src1, src2, *dest, length, bytes1, bytes2, has_alpha1, has_alpha2);
break;
case HARDLIGHT_MODE:
hardlight_pixels (src1, src2, *dest, length, bytes1, bytes2, has_alpha1, has_alpha2);
break;
default :
break;
}

7
app/tool_options.c
View File

@ -948,10 +948,13 @@ paint_mode_menu_new (GtkSignalFunc callback,
_("Normal"), (gpointer) NORMAL_MODE, NULL,
_("Dissolve"), (gpointer) DISSOLVE_MODE, NULL,
_("Behind"), (gpointer) BEHIND_MODE, NULL,
_("Multiply (Burn)"), (gpointer) MULTIPLY_MODE, NULL,
_("Divide (Dodge)"), (gpointer) DIVIDE_MODE, NULL,
_("Multiply"), (gpointer) MULTIPLY_MODE, NULL,
_("Divide"), (gpointer) DIVIDE_MODE, NULL,
_("Screen"), (gpointer) SCREEN_MODE, NULL,
_("Overlay"), (gpointer) OVERLAY_MODE, NULL,
_("Dodge"), (gpointer) DODGE_MODE, NULL,
_("Burn"), (gpointer) BURN_MODE, NULL,
_("Hard Light"), (gpointer) HARDLIGHT_MODE, NULL,
_("Difference"), (gpointer) DIFFERENCE_MODE, NULL,
_("Addition"), (gpointer) ADDITION_MODE, NULL,
_("Subtract"), (gpointer) SUBTRACT_MODE, NULL,

7
app/tools/tool_options.c
View File

@ -948,10 +948,13 @@ paint_mode_menu_new (GtkSignalFunc callback,
_("Normal"), (gpointer) NORMAL_MODE, NULL,
_("Dissolve"), (gpointer) DISSOLVE_MODE, NULL,
_("Behind"), (gpointer) BEHIND_MODE, NULL,
_("Multiply (Burn)"), (gpointer) MULTIPLY_MODE, NULL,
_("Divide (Dodge)"), (gpointer) DIVIDE_MODE, NULL,
_("Multiply"), (gpointer) MULTIPLY_MODE, NULL,
_("Divide"), (gpointer) DIVIDE_MODE, NULL,
_("Screen"), (gpointer) SCREEN_MODE, NULL,
_("Overlay"), (gpointer) OVERLAY_MODE, NULL,
_("Dodge"), (gpointer) DODGE_MODE, NULL,
_("Burn"), (gpointer) BURN_MODE, NULL,
_("Hard Light"), (gpointer) HARDLIGHT_MODE, NULL,
_("Difference"), (gpointer) DIFFERENCE_MODE, NULL,
_("Addition"), (gpointer) ADDITION_MODE, NULL,
_("Subtract"), (gpointer) SUBTRACT_MODE, NULL,

8
app/tools_cmds.c
View File

@ -282,7 +282,7 @@ blend_invoker (Argument *args)
success = FALSE;
paint_mode = args[2].value.pdb_int;
if (paint_mode < NORMAL_MODE || paint_mode > DIVIDE_MODE)
if (paint_mode < NORMAL_MODE || paint_mode > HARDLIGHT_MODE)
success = FALSE;
gradient_type = args[3].value.pdb_int;
@ -345,7 +345,7 @@ static ProcArg blend_inargs[] =
{
PDB_INT32,
"paint_mode",
"The paint application mode: { NORMAL_MODE (0), DISSOLVE_MODE (1), BEHIND_MODE (2), MULTIPLY_MODE (3), SCREEN_MODE (4), OVERLAY_MODE (5), DIFFERENCE_MODE (6), ADDITION_MODE (7), SUBTRACT_MODE (8), DARKEN_ONLY_MODE (9), LIGHTEN_ONLY_MODE (10), HUE_MODE (11), SATURATION_MODE (12), COLOR_MODE (13), VALUE_MODE (14), DIVIDE_MODE (15) }"
"The paint application mode: { NORMAL_MODE (0), DISSOLVE_MODE (1), BEHIND_MODE (2), MULTIPLY_MODE (3), SCREEN_MODE (4), OVERLAY_MODE (5), DIFFERENCE_MODE (6), ADDITION_MODE (7), SUBTRACT_MODE (8), DARKEN_ONLY_MODE (9), LIGHTEN_ONLY_MODE (10), HUE_MODE (11), SATURATION_MODE (12), COLOR_MODE (13), VALUE_MODE (14), DIVIDE_MODE (15), DODGE_MODE (16), BURN_MODE (17), HARDLIGHT_MODE (18) }"
},
{
PDB_INT32,
@ -443,7 +443,7 @@ bucket_fill_invoker (Argument *args)
success = FALSE;
paint_mode = args[2].value.pdb_int;
if (paint_mode < NORMAL_MODE || paint_mode > DIVIDE_MODE)
if (paint_mode < NORMAL_MODE || paint_mode > HARDLIGHT_MODE)
success = FALSE;
opacity = args[3].value.pdb_float;
@ -485,7 +485,7 @@ static ProcArg bucket_fill_inargs[] =
{
PDB_INT32,
"paint_mode",
"The paint application mode: { NORMAL_MODE (0), DISSOLVE_MODE (1), BEHIND_MODE (2), MULTIPLY_MODE (3), SCREEN_MODE (4), OVERLAY_MODE (5), DIFFERENCE_MODE (6), ADDITION_MODE (7), SUBTRACT_MODE (8), DARKEN_ONLY_MODE (9), LIGHTEN_ONLY_MODE (10), HUE_MODE (11), SATURATION_MODE (12), COLOR_MODE (13), VALUE_MODE (14), DIVIDE_MODE (15) }"
"The paint application mode: { NORMAL_MODE (0), DISSOLVE_MODE (1), BEHIND_MODE (2), MULTIPLY_MODE (3), SCREEN_MODE (4), OVERLAY_MODE (5), DIFFERENCE_MODE (6), ADDITION_MODE (7), SUBTRACT_MODE (8), DARKEN_ONLY_MODE (9), LIGHTEN_ONLY_MODE (10), HUE_MODE (11), SATURATION_MODE (12), COLOR_MODE (13), VALUE_MODE (14), DIVIDE_MODE (15), DODGE_MODE (16), BURN_MODE (17), HARDLIGHT_MODE (18) }"
},
{
PDB_FLOAT,

8
libgimp/gimpenums.h
View File

@ -224,7 +224,10 @@ typedef enum
GIMP_SATURATION_MODE,
GIMP_COLOR_MODE,
GIMP_VALUE_MODE,
GIMP_DIVIDE_MODE
GIMP_DIVIDE_MODE,
GIMP_DODGE_MODE,
GIMP_BURN_MODE,
GIMP_HARDLIGHT_MODE
} GimpLayerModeEffects;
typedef enum
@ -425,6 +428,9 @@ typedef GimpPDBStatusType GStatusType;
#define COLOR_MODE GIMP_COLOR_MODE
#define VALUE_MODE GIMP_VALUE_MODE
#define DIVIDE_MODE GIMP_DIVIDE_MODE
#define DODGE_MODE GIMP_DODGE_MODE
#define BURN_MODE GIMP_BURN_MODE
#define HARDLIGHT_MODE GIMP_HARDLIGHT_MODE
#define RUN_INTERACTIVE GIMP_RUN_INTERACTIVE
#define RUN_NONINTERACTIVE GIMP_RUN_NONINTERACTIVE

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

@ -154,6 +154,9 @@ init_generated_constants (void)
setvar (cintern ("COLOR-MODE"), flocons (13), NIL);
setvar (cintern ("VALUE-MODE"), flocons (14), NIL);
setvar (cintern ("DIVIDE-MODE"), flocons (15), NIL);
setvar (cintern ("DODGE-MODE"), flocons (16), NIL);
setvar (cintern ("BURN-MODE"), flocons (17), NIL);
setvar (cintern ("HARDLIGHT-MODE"), flocons (18), NIL);
setvar (cintern ("APPLY"), flocons (0), NIL);
setvar (cintern ("DISCARD"), flocons (1), NIL);

8
tools/pdbgen/enums.pl
View File

@ -77,7 +77,8 @@ package Gimp::CodeGen::enums;
MULTIPLY_MODE SCREEN_MODE OVERLAY_MODE
DIFFERENCE_MODE ADDITION_MODE SUBTRACT_MODE
DARKEN_ONLY_MODE LIGHTEN_ONLY_MODE HUE_MODE
SATURATION_MODE COLOR_MODE VALUE_MODE DIVIDE_MODE) ],
SATURATION_MODE COLOR_MODE VALUE_MODE DIVIDE_MODE
DODGE_MODE BURN_MODE HARDLIGHT_MODE) ],
mapping => { NORMAL_MODE => '0',
DISSOLVE_MODE => '1',
BEHIND_MODE => '2',
@ -93,7 +94,10 @@ package Gimp::CodeGen::enums;
SATURATION_MODE => '12',
COLOR_MODE => '13',
VALUE_MODE => '14',
DIVIDE_MODE => '15' }
DIVIDE_MODE => '15',
DODGE_MODE => '16',
BURN_MODE => '17',
HARDLIGHT_MODE => '18' }
},
ConvolutionType =>
{ contig => 1,