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

*: rename NORMAL to NORMAL_LEGACY and NORMAL_LINEAR to NORMAL

Browse source 
and make NORMAL_LEGACY immutable.
This commit is contained in:
Michael Natterer 2017-02-26 16:26:34 +01:00
parent 78836afffe
commit 3cf423f0cd
101 changed files with 175 additions and 171 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/actions/layers-commands.c
View file

@ -373,7 +373,7 @@ layers_new_last_vals_cmd_callback (GtkAction *action,
off_x = 0; off_x = 0;
off_y = 0; off_y = 0;
opacity = 1.0; opacity = 1.0;
mode = GIMP_LAYER_MODE_NORMAL; mode = GIMP_LAYER_MODE_NORMAL_LEGACY;
} }
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_EDIT_PASTE, gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_EDIT_PASTE,
@ -419,7 +419,7 @@ layers_new_from_visible_cmd_callback (GtkAction *action,
TRUE), TRUE),
_("Visible"), _("Visible"),
GIMP_OPACITY_OPAQUE, GIMP_OPACITY_OPAQUE,
GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_NORMAL_LEGACY,
profile); profile);
gimp_image_add_layer (image, layer, GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE); gimp_image_add_layer (image, layer, GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);

2
app/config/gimpdialogconfig.c
View file

@ -302,7 +302,7 @@ gimp_dialog_config_class_init (GimpDialogConfigClass *klass)
"Default new layer mode", "Default new layer mode",
LAYER_NEW_MODE_BLURB, LAYER_NEW_MODE_BLURB,
GIMP_TYPE_LAYER_MODE, GIMP_TYPE_LAYER_MODE,
GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_NORMAL_LEGACY,
GIMP_PARAM_STATIC_STRINGS); GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_PROP_ENUM (object_class, PROP_LAYER_NEW_BLEND_SPACE, GIMP_CONFIG_PROP_ENUM (object_class, PROP_LAYER_NEW_BLEND_SPACE,

2
app/core/gimp-edit.c
View file

@ -420,7 +420,7 @@ gimp_edit_paste (GimpImage *image,
floating_format, floating_format,
_("Pasted Layer"), _("Pasted Layer"),
GIMP_OPACITY_OPAQUE, GIMP_OPACITY_OPAQUE,
GIMP_LAYER_MODE_NORMAL); GIMP_LAYER_MODE_NORMAL_LEGACY);
} }
if (! layer) if (! layer)

2
app/core/gimp-utils.c
View file

@ -868,7 +868,7 @@ gimp_create_image_from_buffer (Gimp *gimp,
layer = gimp_layer_new_from_gegl_buffer (buffer, image, format, layer = gimp_layer_new_from_gegl_buffer (buffer, image, format,
image_name, image_name,
GIMP_OPACITY_OPAQUE, GIMP_OPACITY_OPAQUE,
GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_NORMAL_LEGACY,
NULL /* same image */); NULL /* same image */);
gimp_image_add_layer (image, layer, NULL, -1, FALSE); gimp_image_add_layer (image, layer, NULL, -1, FALSE);

4
app/core/gimpcontext.c
View file

@ -696,7 +696,7 @@ gimp_context_class_init (GimpContextClass *klass)
_("Paint Mode"), _("Paint Mode"),
_("Paint Mode"), _("Paint Mode"),
GIMP_TYPE_LAYER_MODE, GIMP_TYPE_LAYER_MODE,
GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_NORMAL_LEGACY,
GIMP_PARAM_STATIC_STRINGS); GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_PROP_OBJECT (object_class, GIMP_CONTEXT_PROP_BRUSH, GIMP_CONFIG_PROP_OBJECT (object_class, GIMP_CONTEXT_PROP_BRUSH,
@ -2589,7 +2589,7 @@ gimp_context_real_set_opacity (GimpContext *context,
GimpLayerMode GimpLayerMode
gimp_context_get_paint_mode (GimpContext *context) gimp_context_get_paint_mode (GimpContext *context)
{ {
g_return_val_if_fail (GIMP_IS_CONTEXT (context), GIMP_LAYER_MODE_NORMAL); g_return_val_if_fail (GIMP_IS_CONTEXT (context), GIMP_LAYER_MODE_NORMAL_LEGACY);
return context->paint_mode; return context->paint_mode;
} }

2
app/core/gimpdrawable-transform.c
View file

@ -1003,7 +1003,7 @@ gimp_drawable_transform_paste (GimpDrawable *drawable,
gimp_drawable_get_format_with_alpha (drawable), gimp_drawable_get_format_with_alpha (drawable),
_("Transformation"), _("Transformation"),
GIMP_OPACITY_OPAQUE, GIMP_OPACITY_OPAQUE,
GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_NORMAL_LEGACY,
buffer_profile); buffer_profile);
gimp_item_set_offset (GIMP_ITEM (layer), offset_x, offset_y); gimp_item_set_offset (GIMP_ITEM (layer), offset_x, offset_y);

6
app/core/gimpimage-merge.c
View file

@ -529,7 +529,7 @@ gimp_image_merge_layers (GimpImage *image,
gimp_image_get_layer_format (image, FALSE), gimp_image_get_layer_format (image, FALSE),
gimp_object_get_name (layer), gimp_object_get_name (layer),
GIMP_OPACITY_OPAQUE, GIMP_OPACITY_OPAQUE,
GIMP_LAYER_MODE_NORMAL); GIMP_LAYER_MODE_NORMAL_LEGACY);
if (! merge_layer) if (! merge_layer)
{ {
g_warning ("%s: could not allocate merge layer.", G_STRFUNC); g_warning ("%s: could not allocate merge layer.", G_STRFUNC);
@ -562,7 +562,7 @@ gimp_image_merge_layers (GimpImage *image,
gimp_drawable_get_format_with_alpha (GIMP_DRAWABLE (layer)), gimp_drawable_get_format_with_alpha (GIMP_DRAWABLE (layer)),
"merged layer", "merged layer",
GIMP_OPACITY_OPAQUE, GIMP_OPACITY_OPAQUE,
GIMP_LAYER_MODE_NORMAL); GIMP_LAYER_MODE_NORMAL_LEGACY);
if (!merge_layer) if (!merge_layer)
{ {
@ -621,7 +621,7 @@ gimp_image_merge_layers (GimpImage *image,
if (layer == bottom_layer && mode != GIMP_LAYER_MODE_DISSOLVE) if (layer == bottom_layer && mode != GIMP_LAYER_MODE_DISSOLVE)
{ {
mode = GIMP_LAYER_MODE_NORMAL; mode = GIMP_LAYER_MODE_NORMAL_LEGACY;
blend_space = GIMP_LAYER_COLOR_SPACE_AUTO; blend_space = GIMP_LAYER_COLOR_SPACE_AUTO;
composite_space = GIMP_LAYER_COLOR_SPACE_AUTO; composite_space = GIMP_LAYER_COLOR_SPACE_AUTO;
composite_mode = GIMP_LAYER_COMPOSITE_AUTO; composite_mode = GIMP_LAYER_COMPOSITE_AUTO;

8
app/core/gimpimage-new.c
View file

@ -149,7 +149,7 @@ gimp_image_new_from_template (Gimp *gimp,
gimp_image_get_layer_format (image, has_alpha), gimp_image_get_layer_format (image, has_alpha),
_("Background"), _("Background"),
GIMP_OPACITY_OPAQUE, GIMP_OPACITY_OPAQUE,
GIMP_LAYER_MODE_NORMAL); GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_drawable_fill (GIMP_DRAWABLE (layer), gimp_drawable_fill (GIMP_DRAWABLE (layer),
context, gimp_template_get_fill_type (template)); context, gimp_template_get_fill_type (template));
@ -224,7 +224,7 @@ gimp_image_new_from_drawable (Gimp *gimp,
gimp_item_translate (GIMP_ITEM (new_layer), -off_x, -off_y, FALSE); gimp_item_translate (GIMP_ITEM (new_layer), -off_x, -off_y, FALSE);
gimp_item_set_visible (GIMP_ITEM (new_layer), TRUE, FALSE); gimp_item_set_visible (GIMP_ITEM (new_layer), TRUE, FALSE);
gimp_item_set_linked (GIMP_ITEM (new_layer), FALSE, FALSE); gimp_item_set_linked (GIMP_ITEM (new_layer), FALSE, FALSE);
gimp_layer_set_mode (new_layer, GIMP_LAYER_MODE_NORMAL, FALSE); gimp_layer_set_mode (new_layer, GIMP_LAYER_MODE_NORMAL_LEGACY, FALSE);
gimp_layer_set_opacity (new_layer, GIMP_OPACITY_OPAQUE, FALSE); gimp_layer_set_opacity (new_layer, GIMP_OPACITY_OPAQUE, FALSE);
if (gimp_layer_can_lock_alpha (new_layer)) if (gimp_layer_can_lock_alpha (new_layer))
gimp_layer_set_lock_alpha (new_layer, FALSE, FALSE); gimp_layer_set_lock_alpha (new_layer, FALSE, FALSE);
@ -326,7 +326,7 @@ gimp_image_new_from_buffer (Gimp *gimp,
has_alpha), has_alpha),
_("Pasted Layer"), _("Pasted Layer"),
GIMP_OPACITY_OPAQUE, GIMP_OPACITY_OPAQUE,
GIMP_LAYER_MODE_NORMAL); GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_add_layer (image, layer, NULL, 0, TRUE); gimp_image_add_layer (image, layer, NULL, 0, TRUE);
@ -385,7 +385,7 @@ gimp_image_new_from_pixbuf (Gimp *gimp,
has_alpha), has_alpha),
layer_name, layer_name,
GIMP_OPACITY_OPAQUE, GIMP_OPACITY_OPAQUE,
GIMP_LAYER_MODE_NORMAL); GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_add_layer (new_image, layer, NULL, 0, TRUE); gimp_image_add_layer (new_image, layer, NULL, 0, TRUE);

4
app/core/gimpimage.c
View file

@ -2394,7 +2394,7 @@ gimp_image_get_xcf_version (GimpImage *image,
switch (gimp_layer_get_mode (layer)) switch (gimp_layer_get_mode (layer))
{ {
/* Modes that exist since ancient times */ /* Modes that exist since ancient times */
case GIMP_LAYER_MODE_NORMAL: case GIMP_LAYER_MODE_NORMAL_LEGACY:
case GIMP_LAYER_MODE_DISSOLVE: case GIMP_LAYER_MODE_DISSOLVE:
case GIMP_LAYER_MODE_BEHIND_LEGACY: case GIMP_LAYER_MODE_BEHIND_LEGACY:
case GIMP_LAYER_MODE_MULTIPLY_LEGACY: case GIMP_LAYER_MODE_MULTIPLY_LEGACY:
@ -2433,7 +2433,7 @@ gimp_image_get_xcf_version (GimpImage *image,
break; break;
/* Since 2.10 */ /* Since 2.10 */
case GIMP_LAYER_MODE_NORMAL_LINEAR: case GIMP_LAYER_MODE_NORMAL:
case GIMP_LAYER_MODE_BEHIND: case GIMP_LAYER_MODE_BEHIND:
case GIMP_LAYER_MODE_MULTIPLY: case GIMP_LAYER_MODE_MULTIPLY:
case GIMP_LAYER_MODE_SCREEN: case GIMP_LAYER_MODE_SCREEN:

10
app/core/gimplayer.c
View file

@ -402,7 +402,7 @@ gimp_layer_class_init (GimpLayerClass *klass)
g_object_class_install_property (object_class, PROP_MODE, g_object_class_install_property (object_class, PROP_MODE,
g_param_spec_enum ("mode", NULL, NULL, g_param_spec_enum ("mode", NULL, NULL,
GIMP_TYPE_LAYER_MODE, GIMP_TYPE_LAYER_MODE,
GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_NORMAL_LEGACY,
GIMP_PARAM_READABLE)); GIMP_PARAM_READABLE));
g_object_class_install_property (object_class, PROP_BLEND_SPACE, g_object_class_install_property (object_class, PROP_BLEND_SPACE,
@ -449,7 +449,7 @@ static void
gimp_layer_init (GimpLayer *layer) gimp_layer_init (GimpLayer *layer)
{ {
layer->opacity = GIMP_OPACITY_OPAQUE; layer->opacity = GIMP_OPACITY_OPAQUE;
layer->mode = GIMP_LAYER_MODE_NORMAL; layer->mode = GIMP_LAYER_MODE_NORMAL_LEGACY;
layer->blend_space = GIMP_LAYER_COLOR_SPACE_AUTO; layer->blend_space = GIMP_LAYER_COLOR_SPACE_AUTO;
layer->composite_space = GIMP_LAYER_COLOR_SPACE_AUTO; layer->composite_space = GIMP_LAYER_COLOR_SPACE_AUTO;
layer->composite_mode = GIMP_LAYER_COMPOSITE_AUTO; layer->composite_mode = GIMP_LAYER_COMPOSITE_AUTO;
@ -589,7 +589,7 @@ gimp_layer_update_mode_node (GimpLayer *layer)
if (layer->mask && layer->show_mask) if (layer->mask && layer->show_mask)
{ {
visible_mode = GIMP_LAYER_MODE_NORMAL; visible_mode = GIMP_LAYER_MODE_NORMAL_LEGACY;
visible_blend_space = GIMP_LAYER_COLOR_SPACE_AUTO; visible_blend_space = GIMP_LAYER_COLOR_SPACE_AUTO;
visible_composite_space = GIMP_LAYER_COLOR_SPACE_AUTO; visible_composite_space = GIMP_LAYER_COLOR_SPACE_AUTO;
visible_composite_mode = GIMP_LAYER_COMPOSITE_AUTO; visible_composite_mode = GIMP_LAYER_COMPOSITE_AUTO;
@ -599,7 +599,7 @@ gimp_layer_update_mode_node (GimpLayer *layer)
if (layer->mode != GIMP_LAYER_MODE_DISSOLVE && if (layer->mode != GIMP_LAYER_MODE_DISSOLVE &&
gimp_filter_get_is_last_node (GIMP_FILTER (layer))) gimp_filter_get_is_last_node (GIMP_FILTER (layer)))
{ {
visible_mode = GIMP_LAYER_MODE_NORMAL; visible_mode = GIMP_LAYER_MODE_NORMAL_LEGACY;
visible_blend_space = GIMP_LAYER_COLOR_SPACE_AUTO; visible_blend_space = GIMP_LAYER_COLOR_SPACE_AUTO;
visible_composite_space = GIMP_LAYER_COLOR_SPACE_AUTO; visible_composite_space = GIMP_LAYER_COLOR_SPACE_AUTO;
visible_composite_mode = GIMP_LAYER_COMPOSITE_AUTO; visible_composite_mode = GIMP_LAYER_COMPOSITE_AUTO;
@ -2203,7 +2203,7 @@ gimp_layer_set_mode (GimpLayer *layer,
GimpLayerMode GimpLayerMode
gimp_layer_get_mode (GimpLayer *layer) gimp_layer_get_mode (GimpLayer *layer)
{ {
g_return_val_if_fail (GIMP_IS_LAYER (layer), GIMP_LAYER_MODE_NORMAL); g_return_val_if_fail (GIMP_IS_LAYER (layer), GIMP_LAYER_MODE_NORMAL_LEGACY);
return layer->mode; return layer->mode;
} }

2
app/core/gimpselection.c
View file

@ -891,7 +891,7 @@ gimp_selection_float (GimpSelection *selection,
gimp_drawable_get_format_with_alpha (drawable), gimp_drawable_get_format_with_alpha (drawable),
_("Floated Layer"), _("Floated Layer"),
GIMP_OPACITY_OPAQUE, GIMP_OPACITY_OPAQUE,
GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_NORMAL_LEGACY,
profile); profile);
/* Set the offsets */ /* Set the offsets */

2
app/display/gimpdisplayshell-dnd.c
View file

@ -725,7 +725,7 @@ gimp_display_shell_drop_pixbuf (GtkWidget *widget,
gimp_image_get_layer_format (image, has_alpha), gimp_image_get_layer_format (image, has_alpha),
_("Dropped Buffer"), _("Dropped Buffer"),
GIMP_OPACITY_OPAQUE, GIMP_OPACITY_OPAQUE,
GIMP_LAYER_MODE_NORMAL); GIMP_LAYER_MODE_NORMAL_LEGACY);
if (new_layer) if (new_layer)
{ {

2
app/gegl/gimpapplicator.c
View file

@ -58,7 +58,7 @@ static void
gimp_applicator_init (GimpApplicator *applicator) gimp_applicator_init (GimpApplicator *applicator)
{ {
applicator->opacity = 1.0; applicator->opacity = 1.0;
applicator->paint_mode = GIMP_LAYER_MODE_NORMAL; applicator->paint_mode = GIMP_LAYER_MODE_NORMAL_LEGACY;
applicator->blend_space = GIMP_LAYER_COLOR_SPACE_AUTO; applicator->blend_space = GIMP_LAYER_COLOR_SPACE_AUTO;
applicator->composite_space = GIMP_LAYER_COLOR_SPACE_AUTO; applicator->composite_space = GIMP_LAYER_COLOR_SPACE_AUTO;
applicator->composite_mode = GIMP_LAYER_COMPOSITE_AUTO; applicator->composite_mode = GIMP_LAYER_COMPOSITE_AUTO;

13
app/operations/layer-modes/gimp-layer-modes.c
View file

@ -75,11 +75,13 @@ struct _GimpLayerModeInfo
static const GimpLayerModeInfo layer_mode_infos[] = static const GimpLayerModeInfo layer_mode_infos[] =
{ {
{ GIMP_LAYER_MODE_NORMAL, { GIMP_LAYER_MODE_NORMAL_LEGACY,
.op_name = "gimp:normal", .op_name = "gimp:normal",
.function = gimp_operation_normal_process, .function = gimp_operation_normal_process,
.flags = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE, .flags = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE |
GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE |
GIMP_LAYER_MODE_FLAG_COMPOSITE_MODE_IMMUTABLE,
.context = GIMP_LAYER_MODE_CONTEXT_ALL, .context = GIMP_LAYER_MODE_CONTEXT_ALL,
.paint_composite_mode = GIMP_LAYER_COMPOSITE_SRC_OVER, .paint_composite_mode = GIMP_LAYER_COMPOSITE_SRC_OVER,
.composite_mode = GIMP_LAYER_COMPOSITE_SRC_OVER, .composite_mode = GIMP_LAYER_COMPOSITE_SRC_OVER,
@ -471,11 +473,10 @@ static const GimpLayerModeInfo layer_mode_infos[] =
.blend_space = GIMP_LAYER_COLOR_SPACE_LAB .blend_space = GIMP_LAYER_COLOR_SPACE_LAB
}, },
{ GIMP_LAYER_MODE_NORMAL_LINEAR, { GIMP_LAYER_MODE_NORMAL,
.op_name = "gimp:normal", .op_name = "gimp:normal",
.function = gimp_operation_normal_process, .function = gimp_operation_normal_process,
.flags = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE,
.context = GIMP_LAYER_MODE_CONTEXT_ALL, .context = GIMP_LAYER_MODE_CONTEXT_ALL,
.paint_composite_mode = GIMP_LAYER_COMPOSITE_SRC_OVER, .paint_composite_mode = GIMP_LAYER_COMPOSITE_SRC_OVER,
.composite_mode = GIMP_LAYER_COMPOSITE_SRC_OVER, .composite_mode = GIMP_LAYER_COMPOSITE_SRC_OVER,
@ -898,7 +899,7 @@ static const GimpLayerMode layer_mode_group_default[] =
static const GimpLayerMode layer_mode_group_legacy[] = static const GimpLayerMode layer_mode_group_legacy[] =
{ {
GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_NORMAL_LEGACY,
GIMP_LAYER_MODE_DISSOLVE, GIMP_LAYER_MODE_DISSOLVE,
GIMP_LAYER_MODE_BEHIND_LEGACY, GIMP_LAYER_MODE_BEHIND_LEGACY,
@ -939,7 +940,7 @@ static const GimpLayerMode layer_mode_group_legacy[] =
static const GimpLayerMode layer_mode_groups[][2] = static const GimpLayerMode layer_mode_groups[][2] =
{ {
{ [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_NORMAL, { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_NORMAL,
[GIMP_LAYER_MODE_GROUP_LEGACY ] = GIMP_LAYER_MODE_NORMAL [GIMP_LAYER_MODE_GROUP_LEGACY ] = GIMP_LAYER_MODE_NORMAL_LEGACY
}, },
{ [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_DISSOLVE, { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_DISSOLVE,

4
app/operations/layer-modes/gimpoperationlayermode.c
View file

@ -154,7 +154,7 @@ gimp_operation_layer_mode_class_init (GimpOperationLayerModeClass *klass)
g_param_spec_enum ("layer-mode", g_param_spec_enum ("layer-mode",
NULL, NULL, NULL, NULL,
GIMP_TYPE_LAYER_MODE, GIMP_TYPE_LAYER_MODE,
GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_NORMAL_LEGACY,
GIMP_PARAM_READWRITE | GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT)); G_PARAM_CONSTRUCT));
@ -1877,7 +1877,7 @@ gimp_layer_mode_get_blend_fun (GimpLayerMode mode)
case GIMP_LAYER_MODE_ADDITION: return blendfun_addition; case GIMP_LAYER_MODE_ADDITION: return blendfun_addition;
case GIMP_LAYER_MODE_SUBTRACT: return blendfun_subtract; case GIMP_LAYER_MODE_SUBTRACT: return blendfun_subtract;
case GIMP_LAYER_MODE_MULTIPLY: return blendfun_multiply; case GIMP_LAYER_MODE_MULTIPLY: return blendfun_multiply;
case GIMP_LAYER_MODE_NORMAL_LINEAR: case GIMP_LAYER_MODE_NORMAL_LEGACY:
case GIMP_LAYER_MODE_NORMAL: return blendfun_normal; case GIMP_LAYER_MODE_NORMAL: return blendfun_normal;
case GIMP_LAYER_MODE_BURN: return blendfun_burn; case GIMP_LAYER_MODE_BURN: return blendfun_burn;
case GIMP_LAYER_MODE_GRAIN_MERGE: return blendfun_grain_merge; case GIMP_LAYER_MODE_GRAIN_MERGE: return blendfun_grain_merge;

8
app/operations/operations-enums.c
View file

@ -81,7 +81,7 @@ gimp_layer_mode_get_type (void)
{ {
static const GEnumValue values[] = static const GEnumValue values[] =
{ {
{ GIMP_LAYER_MODE_NORMAL, "GIMP_LAYER_MODE_NORMAL", "normal" }, { GIMP_LAYER_MODE_NORMAL_LEGACY, "GIMP_LAYER_MODE_NORMAL_LEGACY", "normal-legacy" },
{ GIMP_LAYER_MODE_DISSOLVE, "GIMP_LAYER_MODE_DISSOLVE", "dissolve" }, { GIMP_LAYER_MODE_DISSOLVE, "GIMP_LAYER_MODE_DISSOLVE", "dissolve" },
{ GIMP_LAYER_MODE_BEHIND_LEGACY, "GIMP_LAYER_MODE_BEHIND_LEGACY", "behind-legacy" }, { GIMP_LAYER_MODE_BEHIND_LEGACY, "GIMP_LAYER_MODE_BEHIND_LEGACY", "behind-legacy" },
{ GIMP_LAYER_MODE_MULTIPLY_LEGACY, "GIMP_LAYER_MODE_MULTIPLY_LEGACY", "multiply-legacy" }, { GIMP_LAYER_MODE_MULTIPLY_LEGACY, "GIMP_LAYER_MODE_MULTIPLY_LEGACY", "multiply-legacy" },
@ -109,7 +109,7 @@ gimp_layer_mode_get_type (void)
{ GIMP_LAYER_MODE_LCH_CHROMA, "GIMP_LAYER_MODE_LCH_CHROMA", "lch-chroma" }, { GIMP_LAYER_MODE_LCH_CHROMA, "GIMP_LAYER_MODE_LCH_CHROMA", "lch-chroma" },
{ GIMP_LAYER_MODE_LCH_COLOR, "GIMP_LAYER_MODE_LCH_COLOR", "lch-color" }, { GIMP_LAYER_MODE_LCH_COLOR, "GIMP_LAYER_MODE_LCH_COLOR", "lch-color" },
{ GIMP_LAYER_MODE_LCH_LIGHTNESS, "GIMP_LAYER_MODE_LCH_LIGHTNESS", "lch-lightness" }, { GIMP_LAYER_MODE_LCH_LIGHTNESS, "GIMP_LAYER_MODE_LCH_LIGHTNESS", "lch-lightness" },
{ GIMP_LAYER_MODE_NORMAL_LINEAR, "GIMP_LAYER_MODE_NORMAL_LINEAR", "normal-linear" }, { GIMP_LAYER_MODE_NORMAL, "GIMP_LAYER_MODE_NORMAL", "normal" },
{ GIMP_LAYER_MODE_BEHIND, "GIMP_LAYER_MODE_BEHIND", "behind" }, { GIMP_LAYER_MODE_BEHIND, "GIMP_LAYER_MODE_BEHIND", "behind" },
{ GIMP_LAYER_MODE_MULTIPLY, "GIMP_LAYER_MODE_MULTIPLY", "multiply" }, { GIMP_LAYER_MODE_MULTIPLY, "GIMP_LAYER_MODE_MULTIPLY", "multiply" },
{ GIMP_LAYER_MODE_SCREEN, "GIMP_LAYER_MODE_SCREEN", "screen" }, { GIMP_LAYER_MODE_SCREEN, "GIMP_LAYER_MODE_SCREEN", "screen" },
@ -146,7 +146,7 @@ gimp_layer_mode_get_type (void)
static const GimpEnumDesc descs[] = static const GimpEnumDesc descs[] =
{ {
{ GIMP_LAYER_MODE_NORMAL, NC_("layer-mode", "Normal"), NULL }, { GIMP_LAYER_MODE_NORMAL_LEGACY, NC_("layer-mode", "Normal (legacy)"), NULL },
{ GIMP_LAYER_MODE_DISSOLVE, NC_("layer-mode", "Dissolve"), NULL }, { GIMP_LAYER_MODE_DISSOLVE, NC_("layer-mode", "Dissolve"), NULL },
{ GIMP_LAYER_MODE_BEHIND_LEGACY, NC_("layer-mode", "Behind (legacy)"), NULL }, { GIMP_LAYER_MODE_BEHIND_LEGACY, NC_("layer-mode", "Behind (legacy)"), NULL },
{ GIMP_LAYER_MODE_MULTIPLY_LEGACY, NC_("layer-mode", "Multiply (legacy)"), NULL }, { GIMP_LAYER_MODE_MULTIPLY_LEGACY, NC_("layer-mode", "Multiply (legacy)"), NULL },
@ -174,7 +174,7 @@ gimp_layer_mode_get_type (void)
{ GIMP_LAYER_MODE_LCH_CHROMA, NC_("layer-mode", "Chroma (LCH)"), NULL }, { GIMP_LAYER_MODE_LCH_CHROMA, NC_("layer-mode", "Chroma (LCH)"), NULL },
{ GIMP_LAYER_MODE_LCH_COLOR, NC_("layer-mode", "Color (LCH)"), NULL }, { GIMP_LAYER_MODE_LCH_COLOR, NC_("layer-mode", "Color (LCH)"), NULL },
{ GIMP_LAYER_MODE_LCH_LIGHTNESS, NC_("layer-mode", "Lightness (LCH)"), NULL }, { GIMP_LAYER_MODE_LCH_LIGHTNESS, NC_("layer-mode", "Lightness (LCH)"), NULL },
{ GIMP_LAYER_MODE_NORMAL_LINEAR, NC_("layer-mode", "Normal (linear)"), NULL }, { GIMP_LAYER_MODE_NORMAL, NC_("layer-mode", "Normal"), NULL },
{ GIMP_LAYER_MODE_BEHIND, NC_("layer-mode", "Behind"), NULL }, { GIMP_LAYER_MODE_BEHIND, NC_("layer-mode", "Behind"), NULL },
{ GIMP_LAYER_MODE_MULTIPLY, NC_("layer-mode", "Multiply"), NULL }, { GIMP_LAYER_MODE_MULTIPLY, NC_("layer-mode", "Multiply"), NULL },
{ GIMP_LAYER_MODE_SCREEN, NC_("layer-mode", "Screen"), NULL }, { GIMP_LAYER_MODE_SCREEN, NC_("layer-mode", "Screen"), NULL },

4
app/operations/operations-enums.h
View file

@ -55,7 +55,7 @@ GType gimp_layer_mode_get_type (void) G_GNUC_CONST;
typedef enum typedef enum
{ {
/* Modes that exist since ancient times */ /* Modes that exist since ancient times */
GIMP_LAYER_MODE_NORMAL, /*< desc="Normal" >*/ GIMP_LAYER_MODE_NORMAL_LEGACY, /*< desc="Normal (legacy)" >*/
GIMP_LAYER_MODE_DISSOLVE, /*< desc="Dissolve" >*/ GIMP_LAYER_MODE_DISSOLVE, /*< desc="Dissolve" >*/
GIMP_LAYER_MODE_BEHIND_LEGACY, /*< desc="Behind (legacy)" >*/ GIMP_LAYER_MODE_BEHIND_LEGACY, /*< desc="Behind (legacy)" >*/
GIMP_LAYER_MODE_MULTIPLY_LEGACY, /*< desc="Multiply (legacy)" >*/ GIMP_LAYER_MODE_MULTIPLY_LEGACY, /*< desc="Multiply (legacy)" >*/
@ -87,7 +87,7 @@ typedef enum
GIMP_LAYER_MODE_LCH_LIGHTNESS, /*< desc="Lightness (LCH)" >*/ GIMP_LAYER_MODE_LCH_LIGHTNESS, /*< desc="Lightness (LCH)" >*/
/* Since 2.10 */ /* Since 2.10 */
GIMP_LAYER_MODE_NORMAL_LINEAR, /*< desc="Normal (linear)" >*/ GIMP_LAYER_MODE_NORMAL, /*< desc="Normal" >*/
GIMP_LAYER_MODE_BEHIND, /*< desc="Behind" >*/ GIMP_LAYER_MODE_BEHIND, /*< desc="Behind" >*/
GIMP_LAYER_MODE_MULTIPLY, /*< desc="Multiply" >*/ GIMP_LAYER_MODE_MULTIPLY, /*< desc="Multiply" >*/
GIMP_LAYER_MODE_SCREEN, /*< desc="Screen" >*/ GIMP_LAYER_MODE_SCREEN, /*< desc="Screen" >*/

2
app/paint/gimpconvolve.c
View file

@ -167,7 +167,7 @@ gimp_convolve_motion (GimpPaintCore *paint_core,
paint_buffer = gimp_paint_core_get_paint_buffer (paint_core, drawable, paint_buffer = gimp_paint_core_get_paint_buffer (paint_core, drawable,
paint_options, paint_options,
GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_NORMAL_LEGACY,
coords, coords,
&paint_buffer_x, &paint_buffer_x,
&paint_buffer_y, &paint_buffer_y,

2
app/paint/gimpdodgeburn.c
View file

@ -151,7 +151,7 @@ gimp_dodge_burn_motion (GimpPaintCore *paint_core,
paint_buffer = gimp_paint_core_get_paint_buffer (paint_core, drawable, paint_buffer = gimp_paint_core_get_paint_buffer (paint_core, drawable,
paint_options, paint_options,
GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_NORMAL_LEGACY,
coords, coords,
&paint_buffer_x, &paint_buffer_x,
&paint_buffer_y, &paint_buffer_y,

2
app/paint/gimperaser.c
View file

@ -164,7 +164,7 @@ gimp_eraser_motion (GimpPaintCore *paint_core,
else if (gimp_drawable_has_alpha (drawable)) else if (gimp_drawable_has_alpha (drawable))
paint_mode = GIMP_LAYER_MODE_ERASE; paint_mode = GIMP_LAYER_MODE_ERASE;
else else
paint_mode = GIMP_LAYER_MODE_NORMAL; paint_mode = GIMP_LAYER_MODE_NORMAL_LEGACY;
gimp_brush_core_eval_transform_dynamics (GIMP_BRUSH_CORE (paint_core), gimp_brush_core_eval_transform_dynamics (GIMP_BRUSH_CORE (paint_core),
drawable, drawable,

2
app/paint/gimppaintcore.c
View file

@ -1040,7 +1040,7 @@ gimp_paint_core_replace (GimpPaintCore *core,
drawable, drawable,
paint_opacity, paint_opacity,
image_opacity, image_opacity,
GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_NORMAL_LEGACY,
mode); mode);
return; return;
} }

4
app/paint/gimpsmudge.c
View file

@ -213,7 +213,7 @@ gimp_smudge_start (GimpPaintCore *paint_core,
*/ */
paint_buffer = gimp_paint_core_get_paint_buffer (paint_core, drawable, paint_buffer = gimp_paint_core_get_paint_buffer (paint_core, drawable,
paint_options, paint_options,
GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_NORMAL_LEGACY,
coords, coords,
&paint_buffer_x, &paint_buffer_x,
&paint_buffer_y, &paint_buffer_y,
@ -318,7 +318,7 @@ gimp_smudge_motion (GimpPaintCore *paint_core,
paint_buffer = gimp_paint_core_get_paint_buffer (paint_core, drawable, paint_buffer = gimp_paint_core_get_paint_buffer (paint_core, drawable,
paint_options, paint_options,
GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_NORMAL_LEGACY,
coords, coords,
&paint_buffer_x, &paint_buffer_x,
&paint_buffer_y, &paint_buffer_y,

4
app/pdb/brush-select-cmds.c
View file

@ -204,7 +204,7 @@ register_brush_select_procs (GimpPDB *pdb)
"paint mode", "paint mode",
"The initial paint mode", "The initial paint mode",
GIMP_TYPE_LAYER_MODE, GIMP_TYPE_LAYER_MODE,
GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_NORMAL_LEGACY,
GIMP_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
gimp_pdb_register_procedure (pdb, procedure); gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure); g_object_unref (procedure);
@ -278,7 +278,7 @@ register_brush_select_procs (GimpPDB *pdb)
"paint mode", "paint mode",
"The initial paint mode", "The initial paint mode",
GIMP_TYPE_LAYER_MODE, GIMP_TYPE_LAYER_MODE,
GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_NORMAL_LEGACY,
GIMP_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
gimp_pdb_register_procedure (pdb, procedure); gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure); g_object_unref (procedure);

2
app/pdb/brushes-cmds.c
View file

@ -440,7 +440,7 @@ register_brushes_procs (GimpPDB *pdb)
"paint mode", "paint mode",
"The paint mode", "The paint mode",
GIMP_TYPE_LAYER_MODE, GIMP_TYPE_LAYER_MODE,
GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_NORMAL_LEGACY,
GIMP_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
gimp_procedure_add_return_value (procedure, gimp_procedure_add_return_value (procedure,
gimp_param_spec_int32 ("width", gimp_param_spec_int32 ("width",

4
app/pdb/context-cmds.c
View file

@ -3139,7 +3139,7 @@ register_context_procs (GimpPDB *pdb)
"paint mode", "paint mode",
"The paint mode", "The paint mode",
GIMP_TYPE_LAYER_MODE, GIMP_TYPE_LAYER_MODE,
GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_NORMAL_LEGACY,
GIMP_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
gimp_pdb_register_procedure (pdb, procedure); gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure); g_object_unref (procedure);
@ -3163,7 +3163,7 @@ register_context_procs (GimpPDB *pdb)
"paint mode", "paint mode",
"The paint mode", "The paint mode",
GIMP_TYPE_LAYER_MODE, GIMP_TYPE_LAYER_MODE,
GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_NORMAL_LEGACY,
GIMP_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
gimp_pdb_register_procedure (pdb, procedure); gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure); g_object_unref (procedure);

6
app/pdb/edit-cmds.c
View file

@ -1349,7 +1349,7 @@ register_edit_procs (GimpPDB *pdb)
"paint mode", "paint mode",
"The paint application mode", "The paint application mode",
GIMP_TYPE_LAYER_MODE, GIMP_TYPE_LAYER_MODE,
GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_NORMAL_LEGACY,
GIMP_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
gimp_procedure_add_argument (procedure, gimp_procedure_add_argument (procedure,
g_param_spec_double ("opacity", g_param_spec_double ("opacity",
@ -1416,7 +1416,7 @@ register_edit_procs (GimpPDB *pdb)
"paint mode", "paint mode",
"The paint application mode", "The paint application mode",
GIMP_TYPE_LAYER_MODE, GIMP_TYPE_LAYER_MODE,
GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_NORMAL_LEGACY,
GIMP_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
gimp_procedure_add_argument (procedure, gimp_procedure_add_argument (procedure,
g_param_spec_double ("opacity", g_param_spec_double ("opacity",
@ -1496,7 +1496,7 @@ register_edit_procs (GimpPDB *pdb)
"paint mode", "paint mode",
"The paint application mode", "The paint application mode",
GIMP_TYPE_LAYER_MODE, GIMP_TYPE_LAYER_MODE,
GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_NORMAL_LEGACY,
GIMP_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
gimp_procedure_add_argument (procedure, gimp_procedure_add_argument (procedure,
g_param_spec_enum ("gradient-type", g_param_spec_enum ("gradient-type",

8
app/pdb/layer-cmds.c
View file

@ -182,7 +182,7 @@ layer_new_from_visible_invoker (GimpProcedure *procedure,
TRUE), TRUE),
name, name,
GIMP_OPACITY_OPAQUE, GIMP_OPACITY_OPAQUE,
GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_NORMAL_LEGACY,
profile); profile);
} }
@ -1384,7 +1384,7 @@ register_layer_procs (GimpPDB *pdb)
"mode", "mode",
"The layer combination mode", "The layer combination mode",
GIMP_TYPE_LAYER_MODE, GIMP_TYPE_LAYER_MODE,
GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_NORMAL_LEGACY,
GIMP_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
gimp_procedure_add_return_value (procedure, gimp_procedure_add_return_value (procedure,
gimp_param_spec_layer_id ("layer", gimp_param_spec_layer_id ("layer",
@ -2320,7 +2320,7 @@ register_layer_procs (GimpPDB *pdb)
"mode", "mode",
"The layer combination mode", "The layer combination mode",
GIMP_TYPE_LAYER_MODE, GIMP_TYPE_LAYER_MODE,
GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_NORMAL_LEGACY,
GIMP_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
gimp_pdb_register_procedure (pdb, procedure); gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure); g_object_unref (procedure);
@ -2350,7 +2350,7 @@ register_layer_procs (GimpPDB *pdb)
"mode", "mode",
"The new layer combination mode", "The new layer combination mode",
GIMP_TYPE_LAYER_MODE, GIMP_TYPE_LAYER_MODE,
GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_NORMAL_LEGACY,
GIMP_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
gimp_pdb_register_procedure (pdb, procedure); gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure); g_object_unref (procedure);

2
app/tests/gimp-app-test-utils.c
View file

@ -138,7 +138,7 @@ gimp_test_utils_create_image (Gimp *gimp,
gimp_image_get_layer_format (image, TRUE), gimp_image_get_layer_format (image, TRUE),
"layer1", "layer1",
1.0, 1.0,
GIMP_LAYER_MODE_NORMAL); GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_add_layer (image, gimp_image_add_layer (image,
layer, layer,

6
app/tests/test-core.c
View file

@ -127,7 +127,7 @@ rotate_non_overlapping (GimpTestFixture *fixture,
babl_format ("R'G'B'A u8"), babl_format ("R'G'B'A u8"),
"Test Layer", "Test Layer",
GIMP_OPACITY_OPAQUE, GIMP_OPACITY_OPAQUE,
GIMP_LAYER_MODE_NORMAL); GIMP_LAYER_MODE_NORMAL_LEGACY);
g_assert_cmpint (GIMP_IS_LAYER (layer), ==, TRUE); g_assert_cmpint (GIMP_IS_LAYER (layer), ==, TRUE);
@ -167,7 +167,7 @@ add_layer (GimpTestFixture *fixture,
babl_format ("R'G'B'A u8"), babl_format ("R'G'B'A u8"),
"Test Layer", "Test Layer",
GIMP_OPACITY_OPAQUE, GIMP_OPACITY_OPAQUE,
GIMP_LAYER_MODE_NORMAL); GIMP_LAYER_MODE_NORMAL_LEGACY);
g_assert_cmpint (GIMP_IS_LAYER (layer), ==, TRUE); g_assert_cmpint (GIMP_IS_LAYER (layer), ==, TRUE);
@ -204,7 +204,7 @@ remove_layer (GimpTestFixture *fixture,
babl_format ("R'G'B'A u8"), babl_format ("R'G'B'A u8"),
"Test Layer", "Test Layer",
GIMP_OPACITY_OPAQUE, GIMP_OPACITY_OPAQUE,
GIMP_LAYER_MODE_NORMAL); GIMP_LAYER_MODE_NORMAL_LEGACY);
g_assert_cmpint (GIMP_IS_LAYER (layer), ==, TRUE); g_assert_cmpint (GIMP_IS_LAYER (layer), ==, TRUE);

2
app/tests/test-ui.c
View file

@ -236,7 +236,7 @@ create_new_image_via_dialog (gconstpointer data)
gimp_image_get_layer_format (image, TRUE), gimp_image_get_layer_format (image, TRUE),
"Layer for testing", "Layer for testing",
GIMP_OPACITY_OPAQUE, GIMP_OPACITY_OPAQUE,
GIMP_LAYER_MODE_NORMAL); GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_add_layer (image, layer, gimp_image_add_layer (image, layer,
GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE); GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);

2
app/tests/test-xcf.c
View file

@ -68,7 +68,7 @@
#define GIMP_MAINIMAGE_LAYER1_HEIGHT 51 #define GIMP_MAINIMAGE_LAYER1_HEIGHT 51
#define GIMP_MAINIMAGE_LAYER1_FORMAT babl_format ("R'G'B'A u8") #define GIMP_MAINIMAGE_LAYER1_FORMAT babl_format ("R'G'B'A u8")
#define GIMP_MAINIMAGE_LAYER1_OPACITY GIMP_OPACITY_OPAQUE #define GIMP_MAINIMAGE_LAYER1_OPACITY GIMP_OPACITY_OPAQUE
#define GIMP_MAINIMAGE_LAYER1_MODE GIMP_LAYER_MODE_NORMAL #define GIMP_MAINIMAGE_LAYER1_MODE GIMP_LAYER_MODE_NORMAL_LEGACY
#define GIMP_MAINIMAGE_LAYER2_NAME "layer2" #define GIMP_MAINIMAGE_LAYER2_NAME "layer2"
#define GIMP_MAINIMAGE_LAYER2_WIDTH 25 #define GIMP_MAINIMAGE_LAYER2_WIDTH 25

2
app/tools/gimpwarptool.c
View file

@ -918,7 +918,7 @@ gimp_warp_tool_animate (GimpWarpTool *wt)
gimp_item_set_offset (GIMP_ITEM (layer), 0, 0); gimp_item_set_offset (GIMP_ITEM (layer), 0, 0);
gimp_item_set_visible (GIMP_ITEM (layer), TRUE, FALSE); gimp_item_set_visible (GIMP_ITEM (layer), TRUE, FALSE);
gimp_layer_set_mode (layer, GIMP_LAYER_MODE_NORMAL, FALSE); gimp_layer_set_mode (layer, GIMP_LAYER_MODE_NORMAL_LEGACY, FALSE);
gimp_layer_set_opacity (layer, GIMP_OPACITY_OPAQUE, FALSE); gimp_layer_set_opacity (layer, GIMP_OPACITY_OPAQUE, FALSE);
gimp_image_add_layer (image, layer, NULL, 0, FALSE); gimp_image_add_layer (image, layer, NULL, 0, FALSE);

2
app/widgets/gimpbrushselect.c
View file

@ -105,7 +105,7 @@ gimp_brush_select_class_init (GimpBrushSelectClass *klass)
g_object_class_install_property (object_class, PROP_PAINT_MODE, g_object_class_install_property (object_class, PROP_PAINT_MODE,
g_param_spec_enum ("paint-mode", NULL, NULL, g_param_spec_enum ("paint-mode", NULL, NULL,
GIMP_TYPE_LAYER_MODE, GIMP_TYPE_LAYER_MODE,
GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_NORMAL_LEGACY,
GIMP_PARAM_WRITABLE | GIMP_PARAM_WRITABLE |
G_PARAM_CONSTRUCT)); G_PARAM_CONSTRUCT));

4
app/widgets/gimplayermodebox.c
View file

@ -101,7 +101,7 @@ gimp_layer_mode_box_class_init (GimpLayerModeBoxClass *klass)
g_param_spec_enum ("layer-mode", g_param_spec_enum ("layer-mode",
NULL, NULL, NULL, NULL,
GIMP_TYPE_LAYER_MODE, GIMP_TYPE_LAYER_MODE,
GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_NORMAL_LEGACY,
GIMP_PARAM_READWRITE | GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT)); G_PARAM_CONSTRUCT));
@ -290,7 +290,7 @@ GimpLayerMode
gimp_layer_mode_box_get_mode (GimpLayerModeBox *box) gimp_layer_mode_box_get_mode (GimpLayerModeBox *box)
{ {
g_return_val_if_fail (GIMP_IS_LAYER_MODE_BOX (box), g_return_val_if_fail (GIMP_IS_LAYER_MODE_BOX (box),
GIMP_LAYER_MODE_NORMAL); GIMP_LAYER_MODE_NORMAL_LEGACY);
return box->priv->layer_mode; return box->priv->layer_mode;
} }

4
app/widgets/gimplayermodecombobox.c
View file

@ -108,7 +108,7 @@ gimp_layer_mode_combo_box_class_init (GimpLayerModeComboBoxClass *klass)
g_param_spec_enum ("layer-mode", g_param_spec_enum ("layer-mode",
NULL, NULL, NULL, NULL,
GIMP_TYPE_LAYER_MODE, GIMP_TYPE_LAYER_MODE,
GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_NORMAL_LEGACY,
GIMP_PARAM_READWRITE | GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT)); G_PARAM_CONSTRUCT));
@ -297,7 +297,7 @@ GimpLayerMode
gimp_layer_mode_combo_box_get_mode (GimpLayerModeComboBox *combo) gimp_layer_mode_combo_box_get_mode (GimpLayerModeComboBox *combo)
{ {
g_return_val_if_fail (GIMP_IS_LAYER_MODE_COMBO_BOX (combo), g_return_val_if_fail (GIMP_IS_LAYER_MODE_COMBO_BOX (combo),
GIMP_LAYER_MODE_NORMAL); GIMP_LAYER_MODE_NORMAL_LEGACY);
return combo->priv->layer_mode; return combo->priv->layer_mode;
} }

4
app/widgets/gimplayertreeview.c
View file

@ -809,7 +809,7 @@ gimp_layer_tree_view_drop_pixbuf (GimpContainerTreeView *tree_view,
gimp_image_get_layer_format (image, TRUE), gimp_image_get_layer_format (image, TRUE),
_("Dropped Buffer"), _("Dropped Buffer"),
GIMP_OPACITY_OPAQUE, GIMP_OPACITY_OPAQUE,
GIMP_LAYER_MODE_NORMAL); GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_add_layer (image, new_layer, parent, index, TRUE); gimp_image_add_layer (image, new_layer, parent, index, TRUE);
@ -851,7 +851,7 @@ gimp_layer_tree_view_item_new (GimpImage *image)
gimp_image_get_layer_format (image, TRUE), gimp_image_get_layer_format (image, TRUE),
NULL, NULL,
GIMP_OPACITY_OPAQUE, GIMP_OPACITY_OPAQUE,
GIMP_LAYER_MODE_NORMAL); GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_add_layer (image, new_layer, gimp_image_add_layer (image, new_layer,
GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE); GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);

2
app/xcf/xcf-load.c
View file

@ -1561,7 +1561,7 @@ xcf_load_layer (XcfInfo *info,
/* create a new layer */ /* create a new layer */
layer = gimp_layer_new (image, width, height, layer = gimp_layer_new (image, width, height,
format, name, 255, GIMP_LAYER_MODE_NORMAL); format, name, 255, GIMP_LAYER_MODE_NORMAL_LEGACY);
g_free (name); g_free (name);
if (! layer) if (! layer)
return NULL; return NULL;

4
libgimp/gimpenums.h
View file

@ -95,7 +95,7 @@ GType gimp_layer_mode_get_type (void) G_GNUC_CONST;
typedef enum typedef enum
{ {
GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_NORMAL_LEGACY,
GIMP_LAYER_MODE_DISSOLVE, GIMP_LAYER_MODE_DISSOLVE,
GIMP_LAYER_MODE_BEHIND_LEGACY, GIMP_LAYER_MODE_BEHIND_LEGACY,
GIMP_LAYER_MODE_MULTIPLY_LEGACY, GIMP_LAYER_MODE_MULTIPLY_LEGACY,
@ -123,7 +123,7 @@ typedef enum
GIMP_LAYER_MODE_LCH_CHROMA, GIMP_LAYER_MODE_LCH_CHROMA,
GIMP_LAYER_MODE_LCH_COLOR, GIMP_LAYER_MODE_LCH_COLOR,
GIMP_LAYER_MODE_LCH_LIGHTNESS, GIMP_LAYER_MODE_LCH_LIGHTNESS,
GIMP_LAYER_MODE_NORMAL_LINEAR, GIMP_LAYER_MODE_NORMAL,
GIMP_LAYER_MODE_BEHIND, GIMP_LAYER_MODE_BEHIND,
GIMP_LAYER_MODE_MULTIPLY, GIMP_LAYER_MODE_MULTIPLY,
GIMP_LAYER_MODE_SCREEN, GIMP_LAYER_MODE_SCREEN,

2
libgimp/gimpexport.c
View file

@ -95,7 +95,7 @@ export_merge (gint32 image_ID,
gimp_image_width (image_ID), gimp_image_width (image_ID),
gimp_image_height (image_ID), gimp_image_height (image_ID),
gimp_drawable_type (*drawable_ID) | 1, gimp_drawable_type (*drawable_ID) | 1,
100.0, GIMP_LAYER_MODE_NORMAL); 100.0, GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_insert_layer (image_ID, transp, -1, 1); gimp_image_insert_layer (image_ID, transp, -1, 1);
gimp_selection_none (image_ID); gimp_selection_none (image_ID);
gimp_edit_clear (transp); gimp_edit_clear (transp);

3
libgimp/gimpimagemetadata.c
View file

@ -609,7 +609,8 @@ gimp_image_metadata_load_thumbnail (GFile *file,
layer_ID = gimp_layer_new_from_pixbuf (image_ID, _("Background"), layer_ID = gimp_layer_new_from_pixbuf (image_ID, _("Background"),
pixbuf, pixbuf,
100.0, GIMP_LAYER_MODE_NORMAL, 100.0,
GIMP_LAYER_MODE_NORMAL_LEGACY,
0.0, 0.0); 0.0, 0.0);
g_object_unref (pixbuf); g_object_unref (pixbuf);

2
libgimp/gimplayer.c
View file

@ -274,7 +274,7 @@ gimp_layer_new_from_surface (gint32 image_ID,
layer = gimp_layer_new (image_ID, name, width, height, layer = gimp_layer_new (image_ID, name, width, height,
format == CAIRO_FORMAT_RGB24 ? format == CAIRO_FORMAT_RGB24 ?
GIMP_RGB_IMAGE : GIMP_RGBA_IMAGE, GIMP_RGB_IMAGE : GIMP_RGBA_IMAGE,
100.0, GIMP_LAYER_MODE_NORMAL); 100.0, GIMP_LAYER_MODE_NORMAL_LEGACY);
if (layer == -1) if (layer == -1)
return -1; return -1;

14
plug-ins/common/animation-optimize.c
View file

@ -637,12 +637,12 @@ do_optimizations (GimpRunMode run_mode,
if (opmode == OPBACKGROUND) if (opmode == OPBACKGROUND)
{ {
new_layer_id = gimp_layer_new(new_image_id, new_layer_id = gimp_layer_new (new_image_id,
"Backgroundx", "Backgroundx",
width, height, width, height,
drawabletype_alpha, drawabletype_alpha,
100.0, 100.0,
GIMP_LAYER_MODE_NORMAL); GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_insert_layer (new_image_id, new_layer_id, -1, 0); gimp_image_insert_layer (new_image_id, new_layer_id, -1, 0);
@ -1065,7 +1065,7 @@ do_optimizations (GimpRunMode run_mode,
bbox_bottom-bbox_top, bbox_bottom-bbox_top,
drawabletype_alpha, drawabletype_alpha,
100.0, 100.0,
GIMP_LAYER_MODE_NORMAL); GIMP_LAYER_MODE_NORMAL_LEGACY);
g_free (newlayer_name); g_free (newlayer_name);
gimp_image_insert_layer (new_image_id, new_layer_id, -1, 0); gimp_image_insert_layer (new_image_id, new_layer_id, -1, 0);

2
plug-ins/common/compose.c
View file

@ -1021,7 +1021,7 @@ create_new_image (const gchar *filename,
*layer_ID = gimp_layer_new (image_ID, _("Background"), width, height, *layer_ID = gimp_layer_new (image_ID, _("Background"), width, height,
gdtype, gdtype,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_insert_layer (image_ID, *layer_ID, -1, 0); gimp_image_insert_layer (image_ID, *layer_ID, -1, 0);
*buffer = gimp_drawable_get_buffer (*layer_ID); *buffer = gimp_drawable_get_buffer (*layer_ID);

2
plug-ins/common/decompose.c
View file

@ -608,7 +608,7 @@ create_new_layer (gint32 image_ID,
layer_ID = gimp_layer_new (image_ID, layername, width, height, layer_ID = gimp_layer_new (image_ID, layername, width, height,
gdtype, gdtype,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_insert_layer (image_ID, layer_ID, -1, position); gimp_image_insert_layer (image_ID, layer_ID, -1, position);
return layer_ID; return layer_ID;

2
plug-ins/common/edge-dog.c
View file

@ -993,7 +993,7 @@ preview_update_preview (GimpPreview *preview,
preview_id = gimp_layer_new (image_id, "preview", width, height, preview_id = gimp_layer_new (image_id, "preview", width, height,
gimp_drawable_type (drawable->drawable_id), gimp_drawable_type (drawable->drawable_id),
100, 100,
GIMP_LAYER_MODE_NORMAL); GIMP_LAYER_MODE_NORMAL_LEGACY);
preview_drawable = gimp_drawable_get (preview_id); preview_drawable = gimp_drawable_get (preview_id);
gimp_image_insert_layer (image_id, preview_id, -1, 0); gimp_image_insert_layer (image_id, preview_id, -1, 0);
gimp_layer_set_offsets (preview_id, 0, 0); gimp_layer_set_offsets (preview_id, 0, 0);

4
plug-ins/common/file-cel.c
View file

@ -440,11 +440,11 @@ load_image (const gchar *file,
if (bpp == 32) if (bpp == 32)
layer = gimp_layer_new (image, _("Background"), width, height, layer = gimp_layer_new (image, _("Background"), width, height,
GIMP_RGBA_IMAGE, GIMP_RGBA_IMAGE,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
else else
layer = gimp_layer_new (image, _("Background"), width, height, layer = gimp_layer_new (image, _("Background"), width, height,
GIMP_INDEXEDA_IMAGE, GIMP_INDEXEDA_IMAGE,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_insert_layer (image, layer, -1, 0); gimp_image_insert_layer (image, layer, -1, 0);
gimp_layer_set_offsets (layer, offx, offy); gimp_layer_set_offsets (layer, offx, offy);

2
plug-ins/common/file-dicom.c
View file

@ -612,7 +612,7 @@ load_image (const gchar *filename,
dicominfo->width, dicominfo->height, dicominfo->width, dicominfo->height,
(dicominfo->samples_per_pixel >= 3 ? (dicominfo->samples_per_pixel >= 3 ?
GIMP_RGB_IMAGE : GIMP_GRAY_IMAGE), GIMP_RGB_IMAGE : GIMP_GRAY_IMAGE),
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_insert_layer (image_ID, layer_ID, -1, 0); gimp_image_insert_layer (image_ID, layer_ID, -1, 0);
buffer = gimp_drawable_get_buffer (layer_ID); buffer = gimp_drawable_get_buffer (layer_ID);

2
plug-ins/common/file-gbr.c
View file

@ -622,7 +622,7 @@ load_image (GFile *file,
layer_ID = gimp_layer_new (image_ID, name, bh.width, bh.height, layer_ID = gimp_layer_new (image_ID, name, bh.width, bh.height,
image_type, image_type,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_insert_layer (image_ID, layer_ID, -1, 0); gimp_image_insert_layer (image_ID, layer_ID, -1, 0);
g_free (name); g_free (name);

2
plug-ins/common/file-gegl.c
View file

@ -414,7 +414,7 @@ load_image (const gchar *filename,
_("Background"), _("Background"),
width, height, width, height,
image_type, image_type,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_insert_layer (image_ID, layer_ID, -1, 0); gimp_image_insert_layer (image_ID, layer_ID, -1, 0);
dest_buf = gimp_drawable_get_buffer (layer_ID); dest_buf = gimp_drawable_get_buffer (layer_ID);

6
plug-ins/common/file-gif-load.c
View file

@ -989,14 +989,14 @@ ReadImage (FILE *fd,
layer_ID = gimp_layer_new (*image_ID, framename, layer_ID = gimp_layer_new (*image_ID, framename,
len, height, len, height,
GIMP_INDEXED_IMAGE, GIMP_INDEXED_IMAGE,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
} }
else else
{ {
layer_ID = gimp_layer_new (*image_ID, framename, layer_ID = gimp_layer_new (*image_ID, framename,
len, height, len, height,
GIMP_INDEXEDA_IMAGE, GIMP_INDEXEDA_IMAGE,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
alpha_frame=TRUE; alpha_frame=TRUE;
} }
@ -1081,7 +1081,7 @@ ReadImage (FILE *fd,
len, height, len, height,
promote_to_rgb ? promote_to_rgb ?
GIMP_RGBA_IMAGE : GIMP_INDEXEDA_IMAGE, GIMP_RGBA_IMAGE : GIMP_INDEXEDA_IMAGE,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
alpha_frame = TRUE; alpha_frame = TRUE;
g_free (framename); g_free (framename);
} }

2
plug-ins/common/file-gih.c
View file

@ -619,7 +619,7 @@ gih_load_one_brush (GInputStream *input,
layer_ID = gimp_layer_new (image_ID, name, layer_ID = gimp_layer_new (image_ID, name,
bh.width, bh.height, bh.width, bh.height,
image_type, image_type,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
g_free (name); g_free (name);
if (layer_ID != -1) if (layer_ID != -1)

2
plug-ins/common/file-jp2-load.c
View file

@ -395,7 +395,7 @@ load_image (const gchar *filename,
_("Background"), _("Background"),
width, height, width, height,
image_type, image_type,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_insert_layer (image_ID, layer_ID, -1, 0); gimp_image_insert_layer (image_ID, layer_ID, -1, 0);
buffer = gimp_drawable_get_buffer (layer_ID); buffer = gimp_drawable_get_buffer (layer_ID);

2
plug-ins/common/file-pat.c
View file

@ -441,7 +441,7 @@ load_image (GFile *file,
layer_ID = gimp_layer_new (image_ID, name, ph.width, ph.height, layer_ID = gimp_layer_new (image_ID, name, ph.width, ph.height,
image_type, image_type,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_insert_layer (image_ID, layer_ID, -1, 0); gimp_image_insert_layer (image_ID, layer_ID, -1, 0);
g_free (name); g_free (name);

4
plug-ins/common/file-pcx.c
View file

@ -436,14 +436,14 @@ load_image (const gchar *filename,
image= gimp_image_new (width, height, GIMP_RGB); image= gimp_image_new (width, height, GIMP_RGB);
layer= gimp_layer_new (image, _("Background"), width, height, layer= gimp_layer_new (image, _("Background"), width, height,
GIMP_RGB_IMAGE, GIMP_RGB_IMAGE,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
} }
else else
{ {
image= gimp_image_new (width, height, GIMP_INDEXED); image= gimp_image_new (width, height, GIMP_INDEXED);
layer= gimp_layer_new (image, _("Background"), width, height, layer= gimp_layer_new (image, _("Background"), width, height,
GIMP_INDEXED_IMAGE, GIMP_INDEXED_IMAGE,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
} }
gimp_image_set_filename (image, filename); gimp_image_set_filename (image, filename);

2
plug-ins/common/file-pix.c
View file

@ -400,7 +400,7 @@ load_image (GFile *file,
layer_ID = gimp_layer_new (image_ID, _("Background"), layer_ID = gimp_layer_new (image_ID, _("Background"),
width, height, width, height,
gdtype, gdtype,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_insert_layer (image_ID, layer_ID, -1, 0); gimp_image_insert_layer (image_ID, layer_ID, -1, 0);
buffer = gimp_drawable_get_buffer (layer_ID); buffer = gimp_drawable_get_buffer (layer_ID);

2
plug-ins/common/file-png.c
View file

@ -1064,7 +1064,7 @@ load_image (const gchar *filename,
layer = gimp_layer_new (image, _("Background"), width, height, layer = gimp_layer_new (image, _("Background"), width, height,
layer_type, layer_type,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_insert_layer (image, layer, -1, 0); gimp_image_insert_layer (image, layer, -1, 0);
file_format = gimp_drawable_get_format (layer); file_format = gimp_drawable_get_format (layer);

2
plug-ins/common/file-pnm.c
View file

@ -686,7 +686,7 @@ load_image (GFile *file,
pnminfo->xres, pnminfo->yres, pnminfo->xres, pnminfo->yres,
(pnminfo->np >= 3 ? (pnminfo->np >= 3 ?
GIMP_RGB_IMAGE : GIMP_GRAY_IMAGE), GIMP_RGB_IMAGE : GIMP_GRAY_IMAGE),
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_insert_layer (image_ID, layer_ID, -1, 0); gimp_image_insert_layer (image_ID, layer_ID, -1, 0);
buffer = gimp_drawable_get_buffer (layer_ID); buffer = gimp_drawable_get_buffer (layer_ID);

2
plug-ins/common/file-ps.c
View file

@ -1915,7 +1915,7 @@ create_new_image (const gchar *filename,
tmp = g_strdup_printf (_("Page %d"), pagenum); tmp = g_strdup_printf (_("Page %d"), pagenum);
*layer_ID = gimp_layer_new (image_ID, tmp, width, height, *layer_ID = gimp_layer_new (image_ID, tmp, width, height,
gdtype, gdtype,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
g_free (tmp); g_free (tmp);
gimp_image_insert_layer (image_ID, *layer_ID, -1, 0); gimp_image_insert_layer (image_ID, *layer_ID, -1, 0);

4
plug-ins/common/file-psp.c
View file

@ -992,7 +992,7 @@ gimp_layer_mode_from_psp_blend_mode (PSPBlendModes mode)
switch (mode) switch (mode)
{ {
case PSP_BLEND_NORMAL: case PSP_BLEND_NORMAL:
return GIMP_LAYER_MODE_NORMAL; return GIMP_LAYER_MODE_NORMAL_LEGACY;
case PSP_BLEND_DARKEN: case PSP_BLEND_DARKEN:
return GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY; return GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY;
@ -1422,7 +1422,7 @@ read_layer_block (FILE *f,
g_message ("Unsupported PSP layer blend mode %s " g_message ("Unsupported PSP layer blend mode %s "
"for layer %s, setting layer invisible", "for layer %s, setting layer invisible",
blend_mode_name (blend_mode), name); blend_mode_name (blend_mode), name);
layer_mode = GIMP_LAYER_MODE_NORMAL; layer_mode = GIMP_LAYER_MODE_NORMAL_LEGACY;
visibility = FALSE; visibility = FALSE;
} }

2
plug-ins/common/file-raw-data.c
View file

@ -1162,7 +1162,7 @@ load_image (const gchar *filename,
layer_id = gimp_layer_new (data->image_id, _("Background"), layer_id = gimp_layer_new (data->image_id, _("Background"),
runtime->image_width, runtime->image_height, runtime->image_width, runtime->image_height,
ltype, ltype,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_insert_layer (data->image_id, layer_id, -1, 0); gimp_image_insert_layer (data->image_id, layer_id, -1, 0);
data->buffer = gimp_drawable_get_buffer (layer_id); data->buffer = gimp_drawable_get_buffer (layer_id);

2
plug-ins/common/file-sunras.c
View file

@ -1048,7 +1048,7 @@ create_new_image (const gchar *filename,
*layer_ID = gimp_layer_new (image_ID, _("Background"), width, height, *layer_ID = gimp_layer_new (image_ID, _("Background"), width, height,
gdtype, gdtype,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_insert_layer (image_ID, *layer_ID, -1, 0); gimp_image_insert_layer (image_ID, *layer_ID, -1, 0);
*buffer = gimp_drawable_get_buffer (*layer_ID); *buffer = gimp_drawable_get_buffer (*layer_ID);

2
plug-ins/common/file-svg.c
View file

@ -347,7 +347,7 @@ load_image (const gchar *filename,
load_vals.resolution, load_vals.resolution); load_vals.resolution, load_vals.resolution);
layer = gimp_layer_new_from_pixbuf (image, _("Rendered SVG"), pixbuf, layer = gimp_layer_new_from_pixbuf (image, _("Rendered SVG"), pixbuf,
100, GIMP_LAYER_MODE_NORMAL, 100, GIMP_LAYER_MODE_NORMAL_LEGACY,
0.0, 1.0); 0.0, 1.0);
gimp_image_insert_layer (image, layer, -1, 0); gimp_image_insert_layer (image, layer, -1, 0);

2
plug-ins/common/file-tga.c
View file

@ -1092,7 +1092,7 @@ ReadImage (FILE *fp,
_("Background"), _("Background"),
info->width, info->height, info->width, info->height,
dtype, dtype,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_insert_layer (image_ID, layer_ID, -1, 0); gimp_image_insert_layer (image_ID, layer_ID, -1, 0);

2
plug-ins/common/file-wmf.c
View file

@ -998,7 +998,7 @@ load_image (const gchar *filename,
_("Rendered WMF"), _("Rendered WMF"),
width, height, width, height,
GIMP_RGBA_IMAGE, GIMP_RGBA_IMAGE,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
buffer = gimp_drawable_get_buffer (layer); buffer = gimp_drawable_get_buffer (layer);

2
plug-ins/common/file-xbm.c
View file

@ -905,7 +905,7 @@ load_image (const gchar *filename,
width, height, width, height,
GIMP_INDEXED_IMAGE, GIMP_INDEXED_IMAGE,
100, 100,
GIMP_LAYER_MODE_NORMAL); GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_insert_layer (image_ID, layer_ID, -1, 0); gimp_image_insert_layer (image_ID, layer_ID, -1, 0);
buffer = gimp_drawable_get_buffer (layer_ID); buffer = gimp_drawable_get_buffer (layer_ID);

4
plug-ins/common/file-xmc.c
View file

@ -728,7 +728,7 @@ load_image (const gchar *filename,
layer_ID = gimp_layer_new (image_ID, framename, width, height, layer_ID = gimp_layer_new (image_ID, framename, width, height,
GIMP_RGBA_IMAGE, GIMP_RGBA_IMAGE,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_insert_layer (image_ID, layer_ID, -1, 0); gimp_image_insert_layer (image_ID, layer_ID, -1, 0);
/* Adjust layer position to let hotspot sit on the same point. */ /* Adjust layer position to let hotspot sit on the same point. */
@ -952,7 +952,7 @@ load_thumbnail (const gchar *filename,
layer_ID = gimp_layer_new (image_ID, NULL, width, height, layer_ID = gimp_layer_new (image_ID, NULL, width, height,
GIMP_RGBA_IMAGE, GIMP_RGBA_IMAGE,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_insert_layer (image_ID, layer_ID, -1, 0); gimp_image_insert_layer (image_ID, layer_ID, -1, 0);

2
plug-ins/common/file-xpm.c
View file

@ -482,7 +482,7 @@ parse_image (gint32 image_ID,
xpm_image->height, xpm_image->height,
GIMP_RGBA_IMAGE, GIMP_RGBA_IMAGE,
100, 100,
GIMP_LAYER_MODE_NORMAL); GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_insert_layer (image_ID, layer_ID, -1, 0); gimp_image_insert_layer (image_ID, layer_ID, -1, 0);

2
plug-ins/common/file-xwd.c
View file

@ -1272,7 +1272,7 @@ create_new_image (const gchar *filename,
*layer_ID = gimp_layer_new (image_ID, "Background", width, height, *layer_ID = gimp_layer_new (image_ID, "Background", width, height,
gdtype, gdtype,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_insert_layer (image_ID, *layer_ID, -1, 0); gimp_image_insert_layer (image_ID, *layer_ID, -1, 0);
*buffer = gimp_drawable_get_buffer (*layer_ID); *buffer = gimp_drawable_get_buffer (*layer_ID);

2
plug-ins/common/film.c
View file

@ -744,7 +744,7 @@ create_new_image (const gchar *filename,
gimp_image_undo_disable (image_ID); gimp_image_undo_disable (image_ID);
*layer_ID = gimp_layer_new (image_ID, _("Background"), width, height, *layer_ID = gimp_layer_new (image_ID, _("Background"), width, height,
gdtype, gdtype,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_insert_layer (image_ID, *layer_ID, -1, 0); gimp_image_insert_layer (image_ID, *layer_ID, -1, 0);
if (drawable) if (drawable)

2
plug-ins/common/hot.c
View file

@ -350,7 +350,7 @@ pluginCore (piArgs *argp)
nl = gimp_layer_new (argp->image, name, width, height, nl = gimp_layer_new (argp->image, name, width, height,
GIMP_RGBA_IMAGE, GIMP_RGBA_IMAGE,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
ndrw = gimp_drawable_get (nl); ndrw = gimp_drawable_get (nl);
gimp_drawable_fill (nl, GIMP_FILL_TRANSPARENT); gimp_drawable_fill (nl, GIMP_FILL_TRANSPARENT);
gimp_image_insert_layer (argp->image, nl, -1, 0); gimp_image_insert_layer (argp->image, nl, -1, 0);

2
plug-ins/common/smooth-palette.c
View file

@ -258,7 +258,7 @@ smooth_palette (gint32 drawable_id,
*layer_id = gimp_layer_new (new_image_id, _("Background"), *layer_id = gimp_layer_new (new_image_id, _("Background"),
config.width, config.height, config.width, config.height,
gimp_drawable_type (drawable_id), gimp_drawable_type (drawable_id),
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_insert_layer (new_image_id, *layer_id, -1, 0); gimp_image_insert_layer (new_image_id, *layer_id, -1, 0);

2
plug-ins/common/tile.c
View file

@ -354,7 +354,7 @@ tile (gint32 image_id,
*new_layer_id = gimp_layer_new (*new_image_id, _("Background"), *new_layer_id = gimp_layer_new (*new_image_id, _("Background"),
dst_width, dst_height, dst_width, dst_height,
gimp_drawable_type (drawable_id), gimp_drawable_type (drawable_id),
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
if (*new_layer_id == -1) if (*new_layer_id == -1)
return; return;

4
plug-ins/common/warp.c
View file

@ -941,12 +941,12 @@ diff (GimpDrawable *drawable,
xlayer_id = gimp_layer_new (new_image_id, "Warp_X_Vectors", xlayer_id = gimp_layer_new (new_image_id, "Warp_X_Vectors",
width, height, width, height,
GIMP_RGB_IMAGE, GIMP_RGB_IMAGE,
100.0, GIMP_LAYER_MODE_NORMAL); 100.0, GIMP_LAYER_MODE_NORMAL_LEGACY);
ylayer_id = gimp_layer_new (new_image_id, "Warp_Y_Vectors", ylayer_id = gimp_layer_new (new_image_id, "Warp_Y_Vectors",
width, height, width, height,
GIMP_RGB_IMAGE, GIMP_RGB_IMAGE,
100.0, GIMP_LAYER_MODE_NORMAL); 100.0, GIMP_LAYER_MODE_NORMAL_LEGACY);
draw_yd = gimp_drawable_get (ylayer_id); draw_yd = gimp_drawable_get (ylayer_id);
draw_xd = gimp_drawable_get (xlayer_id); draw_xd = gimp_drawable_get (xlayer_id);

2
plug-ins/common/wavelet-decompose.c
View file

@ -192,7 +192,7 @@ run (const gchar *name,
gimp_image_get_item_position (image_id, gimp_image_get_item_position (image_id,
blur_id) ); blur_id) );
gimp_layer_set_mode (scale_ids[id], GIMP_LAYER_MODE_GRAIN_MERGE); gimp_layer_set_mode (scale_ids[id], GIMP_LAYER_MODE_GRAIN_MERGE);
gimp_layer_set_mode (blur_id, GIMP_LAYER_MODE_NORMAL); gimp_layer_set_mode (blur_id, GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_item_set_visible (scale_ids[id], FALSE); gimp_item_set_visible (scale_ids[id], FALSE);
gimp_image_remove_layer (image_id, original_id); gimp_image_remove_layer (image_id, original_id);

2
plug-ins/common/web-page.c
View file

@ -533,7 +533,7 @@ webpage_capture (void)
gimp_image_undo_disable (image); gimp_image_undo_disable (image);
layer = gimp_layer_new_from_pixbuf (image, _("Webpage"), webpagevals.pixbuf, layer = gimp_layer_new_from_pixbuf (image, _("Webpage"), webpagevals.pixbuf,
100, GIMP_LAYER_MODE_NORMAL, 100, GIMP_LAYER_MODE_NORMAL_LEGACY,
0.0, 1.0); 0.0, 1.0);
gimp_image_insert_layer (image, layer, -1, 0); gimp_image_insert_layer (image, layer, -1, 0);
gimp_image_undo_enable (image); gimp_image_undo_enable (image);

2
plug-ins/file-bmp/bmp-load.c
View file

@ -733,7 +733,7 @@ ReadImage (FILE *fd,
image = gimp_image_new (width, height, base_type); image = gimp_image_new (width, height, base_type);
layer = gimp_layer_new (image, _("Background"), layer = gimp_layer_new (image, _("Background"),
width, height, width, height,
image_type, 100, GIMP_LAYER_MODE_NORMAL); image_type, 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_set_filename (image, filename); gimp_image_set_filename (image, filename);

2
plug-ins/file-exr/file-exr.c
View file

@ -256,7 +256,7 @@ load_image (const gchar *filename,
gimp_image_set_filename (image, filename); gimp_image_set_filename (image, filename);
layer = gimp_layer_new (image, _("Background"), width, height, layer = gimp_layer_new (image, _("Background"), width, height,
layer_type, 100, GIMP_LAYER_MODE_NORMAL); layer_type, 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_insert_layer (image, layer, -1, 0); gimp_image_insert_layer (image, layer, -1, 0);
buffer = gimp_drawable_get_buffer (layer); buffer = gimp_drawable_get_buffer (layer);

3
plug-ins/file-faxg3/faxg3.c
View file

@ -525,7 +525,8 @@ emitgimp (gint hcol,
layer_ID = gimp_layer_new (image_ID, _("Background"), layer_ID = gimp_layer_new (image_ID, _("Background"),
hcol, hcol,
row, row,
GIMP_GRAY_IMAGE, 100, GIMP_LAYER_MODE_NORMAL); GIMP_GRAY_IMAGE,
100, GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_insert_layer (image_ID, layer_ID, -1, 0); gimp_image_insert_layer (image_ID, layer_ID, -1, 0);
buffer = gimp_drawable_get_buffer (layer_ID); buffer = gimp_drawable_get_buffer (layer_ID);

2
plug-ins/file-fits/fits.c
View file

@ -527,7 +527,7 @@ create_new_image (const gchar *filename,
gimp_image_undo_disable (image_ID); gimp_image_undo_disable (image_ID);
*layer_ID = gimp_layer_new (image_ID, _("Background"), width, height, *layer_ID = gimp_layer_new (image_ID, _("Background"), width, height,
dtype, 100, GIMP_LAYER_MODE_NORMAL); dtype, 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_insert_layer (image_ID, *layer_ID, -1, 0); gimp_image_insert_layer (image_ID, *layer_ID, -1, 0);
*buffer = gimp_drawable_get_buffer (*layer_ID); *buffer = gimp_drawable_get_buffer (*layer_ID);

2
plug-ins/file-fli/fli-gimp.c
View file

@ -565,7 +565,7 @@ load_image (const gchar *filename,
layer_ID = gimp_layer_new (image_id, name_buf, layer_ID = gimp_layer_new (image_id, name_buf,
fli_header.width, fli_header.height, fli_header.width, fli_header.height,
GIMP_INDEXED_IMAGE, GIMP_INDEXED_IMAGE,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
g_free (name_buf); g_free (name_buf);
buffer = gimp_drawable_get_buffer (layer_ID); buffer = gimp_drawable_get_buffer (layer_ID);

4
plug-ins/file-ico/ico-dialog.c
View file

@ -288,7 +288,7 @@ ico_dialog_update_icon_preview (GtkWidget *dialog,
tmp_layer = gimp_layer_new (tmp_image, "temporary", w, h, tmp_layer = gimp_layer_new (tmp_image, "temporary", w, h,
gimp_drawable_type (layer), gimp_drawable_type (layer),
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_insert_layer (tmp_image, tmp_layer, -1, 0); gimp_image_insert_layer (tmp_image, tmp_layer, -1, 0);
buffer = gimp_drawable_get_buffer (layer); buffer = gimp_drawable_get_buffer (layer);
@ -386,7 +386,7 @@ ico_dialog_update_icon_preview (GtkWidget *dialog,
tmp_layer = gimp_layer_new (tmp_image, "temporary", w, h, tmp_layer = gimp_layer_new (tmp_image, "temporary", w, h,
gimp_drawable_type (layer), gimp_drawable_type (layer),
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_insert_layer (tmp_image, tmp_layer, -1, 0); gimp_image_insert_layer (tmp_image, tmp_layer, -1, 0);
buffer = gimp_drawable_get_buffer (layer); buffer = gimp_drawable_get_buffer (layer);

2
plug-ins/file-ico/ico-load.c
View file

@ -634,7 +634,7 @@ ico_load_layer (FILE *fp,
g_snprintf (name, sizeof (name), _("Icon #%i"), icon_num+1); g_snprintf (name, sizeof (name), _("Icon #%i"), icon_num+1);
layer = gimp_layer_new (image, name, width, height, layer = gimp_layer_new (image, name, width, height,
GIMP_RGBA_IMAGE, GIMP_RGBA_IMAGE,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_insert_layer (image, layer, -1, icon_num); gimp_image_insert_layer (image, layer, -1, icon_num);
buffer = gimp_drawable_get_buffer (layer); buffer = gimp_drawable_get_buffer (layer);

2
plug-ins/file-ico/ico-save.c
View file

@ -628,7 +628,7 @@ ico_image_get_reduced_buf (guint32 layer,
tmp_layer = gimp_layer_new (tmp_image, "tmp", w, h, tmp_layer = gimp_layer_new (tmp_image, "tmp", w, h,
gimp_drawable_type (layer), gimp_drawable_type (layer),
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_insert_layer (tmp_image, tmp_layer, -1, 0); gimp_image_insert_layer (tmp_image, tmp_layer, -1, 0);
tmp = gimp_drawable_get_buffer (tmp_layer); tmp = gimp_drawable_get_buffer (tmp_layer);

4
plug-ins/file-jpeg/jpeg-load.c
View file

@ -232,7 +232,7 @@ load_image (const gchar *filename,
cinfo.output_width, cinfo.output_width,
cinfo.output_height, cinfo.output_height,
layer_type, layer_type,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
layer_ID = preview_layer_ID; layer_ID = preview_layer_ID;
} }
else else
@ -241,7 +241,7 @@ load_image (const gchar *filename,
cinfo.output_width, cinfo.output_width,
cinfo.output_height, cinfo.output_height,
layer_type, layer_type,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
} }
if (! preview) if (! preview)

2
plug-ins/file-psd/psd-image-res-load.c
View file

@ -1034,7 +1034,7 @@ load_resource_1033 (const PSDimageres *res_a,
cinfo.output_width, cinfo.output_width,
cinfo.output_height, cinfo.output_height,
GIMP_RGB_IMAGE, GIMP_RGB_IMAGE,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
buffer = gimp_drawable_get_buffer (layer_id); buffer = gimp_drawable_get_buffer (layer_id);
format = babl_format ("R'G'B' u8"); format = babl_format ("R'G'B' u8");

4
plug-ins/file-psd/psd-load.c
View file

@ -1430,7 +1430,7 @@ add_layers (gint32 image_id,
layer_id = gimp_layer_new (image_id, lyr_a[lidx]->name, layer_id = gimp_layer_new (image_id, lyr_a[lidx]->name,
img_a->columns, img_a->rows, img_a->columns, img_a->rows,
image_type, image_type,
0, GIMP_LAYER_MODE_NORMAL); 0, GIMP_LAYER_MODE_NORMAL_LEGACY);
g_free (lyr_a[lidx]->name); g_free (lyr_a[lidx]->name);
gimp_image_insert_layer (image_id, layer_id, parent_group_id, 0); gimp_image_insert_layer (image_id, layer_id, parent_group_id, 0);
gimp_drawable_fill (layer_id, GIMP_FILL_TRANSPARENT); gimp_drawable_fill (layer_id, GIMP_FILL_TRANSPARENT);
@ -1781,7 +1781,7 @@ add_merged_image (gint32 image_id,
layer_id = gimp_layer_new (image_id, _("Background"), layer_id = gimp_layer_new (image_id, _("Background"),
img_a->columns, img_a->rows, img_a->columns, img_a->rows,
image_type, image_type,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_insert_layer (image_id, layer_id, -1, 0); gimp_image_insert_layer (image_id, layer_id, -1, 0);
buffer = gimp_drawable_get_buffer (layer_id); buffer = gimp_drawable_get_buffer (layer_id);
gegl_buffer_set (buffer, gegl_buffer_set (buffer,

2
plug-ins/file-psd/psd-save.c
View file

@ -197,7 +197,7 @@ psd_lmode_layer (gint32 idLayer,
{ {
switch (gimp_layer_get_mode (idLayer)) switch (gimp_layer_get_mode (idLayer))
{ {
case GIMP_LAYER_MODE_NORMAL: case GIMP_LAYER_MODE_NORMAL_LEGACY:
strcpy (psdMode, "norm"); strcpy (psdMode, "norm");
break; break;
case GIMP_LAYER_MODE_DARKEN_ONLY: case GIMP_LAYER_MODE_DARKEN_ONLY:

12
plug-ins/file-psd/psd-util.c
View file

@ -618,7 +618,7 @@ psd_to_gimp_blend_mode (const gchar *psd_mode,
if (g_ascii_strncasecmp (psd_mode, "norm", 4) == 0) /* Normal (ps3) */ if (g_ascii_strncasecmp (psd_mode, "norm", 4) == 0) /* Normal (ps3) */
{ {
if (layer_composite) *layer_composite = GIMP_LAYER_COMPOSITE_AUTO; if (layer_composite) *layer_composite = GIMP_LAYER_COMPOSITE_AUTO;
return GIMP_LAYER_MODE_NORMAL; return GIMP_LAYER_MODE_NORMAL_LEGACY;
} }
if (g_ascii_strncasecmp (psd_mode, "dark", 4) == 0) /* Darken (ps3) */ if (g_ascii_strncasecmp (psd_mode, "dark", 4) == 0) /* Darken (ps3) */
@ -729,7 +729,7 @@ psd_to_gimp_blend_mode (const gchar *psd_mode,
mode_name); mode_name);
} }
if (layer_composite) *layer_composite = GIMP_LAYER_COMPOSITE_AUTO; if (layer_composite) *layer_composite = GIMP_LAYER_COMPOSITE_AUTO;
return GIMP_LAYER_MODE_NORMAL; return GIMP_LAYER_MODE_NORMAL_LEGACY;
} }
if (g_ascii_strncasecmp (psd_mode, "lgCl", 4) == 0) /* Lighter Color */ if (g_ascii_strncasecmp (psd_mode, "lgCl", 4) == 0) /* Lighter Color */
@ -741,7 +741,7 @@ psd_to_gimp_blend_mode (const gchar *psd_mode,
mode_name); mode_name);
} }
if (layer_composite) *layer_composite = GIMP_LAYER_COMPOSITE_AUTO; if (layer_composite) *layer_composite = GIMP_LAYER_COMPOSITE_AUTO;
return GIMP_LAYER_MODE_NORMAL; return GIMP_LAYER_MODE_NORMAL_LEGACY;
} }
if (CONVERSION_WARNINGS) if (CONVERSION_WARNINGS)
@ -754,7 +754,7 @@ psd_to_gimp_blend_mode (const gchar *psd_mode,
if (layer_composite) *layer_composite = GIMP_LAYER_COMPOSITE_AUTO; if (layer_composite) *layer_composite = GIMP_LAYER_COMPOSITE_AUTO;
return GIMP_LAYER_MODE_NORMAL; return GIMP_LAYER_MODE_NORMAL_LEGACY;
} }
gchar * gchar *
@ -763,7 +763,7 @@ gimp_to_psd_blend_mode (GimpLayerMode layer_mode,
{ {
gchar *psd_mode; gchar *psd_mode;
if (((layer_mode == GIMP_LAYER_MODE_NORMAL || if (((layer_mode == GIMP_LAYER_MODE_NORMAL_LEGACY ||
layer_mode == GIMP_LAYER_MODE_DISSOLVE) && layer_mode == GIMP_LAYER_MODE_DISSOLVE) &&
(layer_composite != GIMP_LAYER_COMPOSITE_AUTO && (layer_composite != GIMP_LAYER_COMPOSITE_AUTO &&
layer_composite != GIMP_LAYER_COMPOSITE_SRC_OVER)) || layer_composite != GIMP_LAYER_COMPOSITE_SRC_OVER)) ||
@ -774,7 +774,7 @@ gimp_to_psd_blend_mode (GimpLayerMode layer_mode,
switch (layer_mode) switch (layer_mode)
{ {
case GIMP_LAYER_MODE_NORMAL: case GIMP_LAYER_MODE_NORMAL_LEGACY:
psd_mode = g_strndup ("norm", 4); /* Normal (ps3) */ psd_mode = g_strndup ("norm", 4); /* Normal (ps3) */
break; break;

2
plug-ins/file-sgi/sgi.c
View file

@ -410,7 +410,7 @@ load_image (const gchar *filename,
layer = gimp_layer_new (image, _("Background"), sgip->xsize, sgip->ysize, layer = gimp_layer_new (image, _("Background"), sgip->xsize, sgip->ysize,
layer_type, layer_type,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_insert_layer (image, layer, -1, 0); gimp_image_insert_layer (image, layer, -1, 0);
/* /*

4
plug-ins/file-tiff/file-tiff-load.c
View file

@ -913,7 +913,7 @@ load_image (GFile *file,
layer = gimp_layer_new (image, name, layer = gimp_layer_new (image, name,
cols, rows, cols, rows,
layer_type, layer_type,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
} }
else else
{ {
@ -927,7 +927,7 @@ load_image (GFile *file,
layer = gimp_layer_new (image, name, layer = gimp_layer_new (image, name,
cols, rows, cols, rows,
layer_type, layer_type,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
g_free (name); g_free (name);
} }

2
plug-ins/file-webp/file-webp-load.c
View file

@ -55,7 +55,7 @@ create_layer (gint32 image_ID,
width, height, width, height,
GIMP_RGBA_IMAGE, GIMP_RGBA_IMAGE,
100, 100,
GIMP_LAYER_MODE_NORMAL); GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_insert_layer (image_ID, layer_ID, -1, position); gimp_image_insert_layer (image_ID, layer_ID, -1, position);

10
plug-ins/gfig/gfig-dialog.c
View file

@ -248,7 +248,7 @@ gfig_dialog (void)
newlayer = gimp_layer_new (gfig_context->image_id, "GFig", newlayer = gimp_layer_new (gfig_context->image_id, "GFig",
img_width, img_height, img_width, img_height,
img_type, img_type,
100.0, GIMP_LAYER_MODE_NORMAL); 100.0, GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_drawable_fill (newlayer, GIMP_FILL_TRANSPARENT); gimp_drawable_fill (newlayer, GIMP_FILL_TRANSPARENT);
gimp_image_insert_layer (gfig_context->image_id, newlayer, -1, -1); gimp_image_insert_layer (gfig_context->image_id, newlayer, -1, -1);
gfig_context->drawable_id = newlayer; gfig_context->drawable_id = newlayer;
@ -1922,7 +1922,7 @@ paint_layer_fill (gdouble x1, gdouble y1, gdouble x2, gdouble y2)
case FILL_GRADIENT: case FILL_GRADIENT:
gimp_edit_blend (gfig_context->drawable_id, gimp_edit_blend (gfig_context->drawable_id,
GIMP_BLEND_CUSTOM, GIMP_BLEND_CUSTOM,
GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_NORMAL_LEGACY,
GIMP_GRADIENT_SHAPEBURST_DIMPLED, GIMP_GRADIENT_SHAPEBURST_DIMPLED,
100.0, /* opacity */ 100.0, /* opacity */
0.0, /* offset */ 0.0, /* offset */
@ -1938,7 +1938,7 @@ paint_layer_fill (gdouble x1, gdouble y1, gdouble x2, gdouble y2)
case FILL_VERTICAL: case FILL_VERTICAL:
gimp_edit_blend (gfig_context->drawable_id, gimp_edit_blend (gfig_context->drawable_id,
GIMP_BLEND_CUSTOM, GIMP_BLEND_CUSTOM,
GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_NORMAL_LEGACY,
GIMP_GRADIENT_LINEAR, GIMP_GRADIENT_LINEAR,
100.0, 100.0,
0.0, 0.0,
@ -1954,7 +1954,7 @@ paint_layer_fill (gdouble x1, gdouble y1, gdouble x2, gdouble y2)
case FILL_HORIZONTAL: case FILL_HORIZONTAL:
gimp_edit_blend (gfig_context->drawable_id, gimp_edit_blend (gfig_context->drawable_id,
GIMP_BLEND_CUSTOM, GIMP_BLEND_CUSTOM,
GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_NORMAL_LEGACY,
GIMP_GRADIENT_LINEAR, GIMP_GRADIENT_LINEAR,
100.0, 100.0,
0.0, 0.0,
@ -1971,7 +1971,7 @@ paint_layer_fill (gdouble x1, gdouble y1, gdouble x2, gdouble y2)
gimp_edit_bucket_fill (gfig_context->drawable_id, gimp_edit_bucket_fill (gfig_context->drawable_id,
fill_mode, /* Fill mode */ fill_mode, /* Fill mode */
GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_NORMAL_LEGACY,
current_style->fill_opacity, /* Fill opacity */ current_style->fill_opacity, /* Fill opacity */
0.0, /* threshold - ignored */ 0.0, /* threshold - ignored */
FALSE, /* Sample merged - ignored */ FALSE, /* Sample merged - ignored */

4
plug-ins/lighting/lighting-apply.c
View file

@ -55,7 +55,7 @@ compute_image (void)
width, height, width, height,
GIMP_RGBA_IMAGE, GIMP_RGBA_IMAGE,
100.0, 100.0,
GIMP_LAYER_MODE_NORMAL); GIMP_LAYER_MODE_NORMAL_LEGACY);
} }
else else
{ {
@ -66,7 +66,7 @@ compute_image (void)
width, height, width, height,
GIMP_RGB_IMAGE, GIMP_RGB_IMAGE,
100.0, 100.0,
GIMP_LAYER_MODE_NORMAL); GIMP_LAYER_MODE_NORMAL_LEGACY);
} }
gimp_image_insert_layer (new_image_id, new_layer_id, -1, 0); gimp_image_insert_layer (new_image_id, new_layer_id, -1, 0);

2
plug-ins/map-object/map-object-apply.c
View file

@ -259,7 +259,7 @@ compute_image (void)
GIMP_RGBA_IMAGE : GIMP_RGBA_IMAGE :
GIMP_RGB_IMAGE, GIMP_RGB_IMAGE,
100.0, 100.0,
GIMP_LAYER_MODE_NORMAL); GIMP_LAYER_MODE_NORMAL_LEGACY);
insert_layer = TRUE; insert_layer = TRUE;
output_drawable = gimp_drawable_get (new_layer_id); output_drawable = gimp_drawable_get (new_layer_id);

2
plug-ins/pagecurl/pagecurl.c
View file

@ -721,7 +721,7 @@ do_curl_effect (gint32 drawable_id)
true_sel_height, true_sel_height,
color_image ? color_image ?
GIMP_RGBA_IMAGE : GIMP_GRAYA_IMAGE, GIMP_RGBA_IMAGE : GIMP_GRAYA_IMAGE,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_insert_layer (image_id, curl_layer_id, gimp_image_insert_layer (image_id, curl_layer_id,
gimp_item_get_parent (drawable_id), gimp_item_get_parent (drawable_id),

6
plug-ins/pygimp/pygimp-drawable.c
View file

@ -1913,7 +1913,7 @@ lay_init(PyGimpLayer *self, PyObject *args, PyObject *kwargs)
unsigned int width, height; unsigned int width, height;
GimpImageType type = GIMP_RGB_IMAGE; GimpImageType type = GIMP_RGB_IMAGE;
double opacity = 100.0; double opacity = 100.0;
GimpLayerMode mode = GIMP_LAYER_MODE_NORMAL; GimpLayerMode mode = GIMP_LAYER_MODE_NORMAL_LEGACY;
if (!PyArg_ParseTuple(args, "O!sii|idi:gimp.Layer.__init__", if (!PyArg_ParseTuple(args, "O!sii|idi:gimp.Layer.__init__",
@ -2017,7 +2017,7 @@ pygimp_layer_new(gint32 ID)
#define GROUPLAYER_DOC "" \ #define GROUPLAYER_DOC "" \
"gimp.GroupLayer(img, name="", opacity=100.0, " \ "gimp.GroupLayer(img, name="", opacity=100.0, " \
"mode=gimp.NORMAL_MODE)\n" \ "mode=gimp.LAYER_MODE_NORMAL_LEGACY)\n" \
"\n" \ "\n" \
" Creates a new GroupLayer object that has to be \n" \ " Creates a new GroupLayer object that has to be \n" \
"subsequently added to an image. Use Image.add_layer \n" \ "subsequently added to an image. Use Image.add_layer \n" \
@ -2071,7 +2071,7 @@ grouplay_init(PyGimpLayer *self, PyObject *args, PyObject *kwargs)
char *name = "Layer Group"; char *name = "Layer Group";
GimpImageType type = GIMP_RGB_IMAGE; GimpImageType type = GIMP_RGB_IMAGE;
double opacity = 100.0; double opacity = 100.0;
GimpLayerMode mode = GIMP_LAYER_MODE_NORMAL; GimpLayerMode mode = GIMP_LAYER_MODE_NORMAL_LEGACY;
if (!PyArg_ParseTuple(args, "O!|sdi:gimp.Layer.__init__", if (!PyArg_ParseTuple(args, "O!|sdi:gimp.Layer.__init__",

2
plug-ins/pygimp/pygimp-image.c
View file

@ -131,7 +131,7 @@ img_new_layer(PyGimpImage *self, PyObject *args, PyObject *kwargs)
gboolean alpha = TRUE; gboolean alpha = TRUE;
int pos = -1; int pos = -1;
double opacity = 100.0; double opacity = 100.0;
GimpLayerMode mode = GIMP_LAYER_MODE_NORMAL; GimpLayerMode mode = GIMP_LAYER_MODE_NORMAL_LEGACY;
GimpFillType fill_mode = -1; GimpFillType fill_mode = -1;
static char *kwlist[] = { "name", "width", "height", "offset_x", "offset_y", static char *kwlist[] = { "name", "width", "height", "offset_x", "offset_y",

2
plug-ins/screenshot/screenshot-win32.c
View file

@ -257,7 +257,7 @@ sendBMPToGimp(HBITMAP hBMP, HDC hDC, RECT rect)
layer_id = gimp_layer_new (new_image_id, _("Background"), layer_id = gimp_layer_new (new_image_id, _("Background"),
ROUND4 (width), height, ROUND4 (width), height,
layerType, layerType,
100, GIMP_LAYER_MODE_NORMAL); 100, GIMP_LAYER_MODE_NORMAL_LEGACY);
gimp_image_insert_layer (new_image_id, layer_id, -1, 0); gimp_image_insert_layer (new_image_id, layer_id, -1, 0);
/* make rectangle */ /* make rectangle */

2
plug-ins/screenshot/screenshot-x11.c
View file

@ -465,7 +465,7 @@ add_cursor_image (gint32 image,
layer = gimp_layer_new (image, _("Mouse Pointer"), layer = gimp_layer_new (image, _("Mouse Pointer"),
cursor->width, cursor->height, cursor->width, cursor->height,
GIMP_RGBA_IMAGE, GIMP_RGBA_IMAGE,
100.0, GIMP_LAYER_MODE_NORMAL); 100.0, GIMP_LAYER_MODE_NORMAL_LEGACY);
buffer = gimp_drawable_get_buffer (layer); buffer = gimp_drawable_get_buffer (layer);

13
tools/pdbgen/enums.pl
View file

@ -696,7 +696,8 @@ package Gimp::CodeGen::enums;
GimpLayerMode => GimpLayerMode =>
{ contig => 1, { contig => 1,
header => 'operations/operations-enums.h', header => 'operations/operations-enums.h',
symbols => [ qw(GIMP_LAYER_MODE_NORMAL GIMP_LAYER_MODE_DISSOLVE symbols => [ qw(GIMP_LAYER_MODE_NORMAL_LEGACY
GIMP_LAYER_MODE_DISSOLVE
GIMP_LAYER_MODE_BEHIND_LEGACY GIMP_LAYER_MODE_BEHIND_LEGACY
GIMP_LAYER_MODE_MULTIPLY_LEGACY GIMP_LAYER_MODE_MULTIPLY_LEGACY
GIMP_LAYER_MODE_SCREEN_LEGACY GIMP_LAYER_MODE_SCREEN_LEGACY
@ -722,9 +723,9 @@ package Gimp::CodeGen::enums;
GIMP_LAYER_MODE_LCH_CHROMA GIMP_LAYER_MODE_LCH_CHROMA
GIMP_LAYER_MODE_LCH_COLOR GIMP_LAYER_MODE_LCH_COLOR
GIMP_LAYER_MODE_LCH_LIGHTNESS GIMP_LAYER_MODE_LCH_LIGHTNESS
GIMP_LAYER_MODE_NORMAL_LINEAR GIMP_LAYER_MODE_NORMAL GIMP_LAYER_MODE_BEHIND
GIMP_LAYER_MODE_BEHIND GIMP_LAYER_MODE_MULTIPLY GIMP_LAYER_MODE_MULTIPLY GIMP_LAYER_MODE_SCREEN
GIMP_LAYER_MODE_SCREEN GIMP_LAYER_MODE_DIFFERENCE GIMP_LAYER_MODE_DIFFERENCE
GIMP_LAYER_MODE_ADDITION GIMP_LAYER_MODE_SUBTRACT GIMP_LAYER_MODE_ADDITION GIMP_LAYER_MODE_SUBTRACT
GIMP_LAYER_MODE_DARKEN_ONLY GIMP_LAYER_MODE_DARKEN_ONLY
GIMP_LAYER_MODE_LIGHTEN_ONLY GIMP_LAYER_MODE_LIGHTEN_ONLY
@ -745,7 +746,7 @@ package Gimp::CodeGen::enums;
GIMP_LAYER_MODE_LUMA_DARKEN_ONLY GIMP_LAYER_MODE_LUMA_DARKEN_ONLY
GIMP_LAYER_MODE_LUMA_LIGHTEN_ONLY GIMP_LAYER_MODE_LUMA_LIGHTEN_ONLY
GIMP_LAYER_MODE_LUMINANCE) ], GIMP_LAYER_MODE_LUMINANCE) ],
mapping => { GIMP_LAYER_MODE_NORMAL => '0', mapping => { GIMP_LAYER_MODE_NORMAL_LEGACY => '0',
GIMP_LAYER_MODE_DISSOLVE => '1', GIMP_LAYER_MODE_DISSOLVE => '1',
GIMP_LAYER_MODE_BEHIND_LEGACY => '2', GIMP_LAYER_MODE_BEHIND_LEGACY => '2',
GIMP_LAYER_MODE_MULTIPLY_LEGACY => '3', GIMP_LAYER_MODE_MULTIPLY_LEGACY => '3',
@ -773,7 +774,7 @@ package Gimp::CodeGen::enums;
GIMP_LAYER_MODE_LCH_CHROMA => '25', GIMP_LAYER_MODE_LCH_CHROMA => '25',
GIMP_LAYER_MODE_LCH_COLOR => '26', GIMP_LAYER_MODE_LCH_COLOR => '26',
GIMP_LAYER_MODE_LCH_LIGHTNESS => '27', GIMP_LAYER_MODE_LCH_LIGHTNESS => '27',
GIMP_LAYER_MODE_NORMAL_LINEAR => '28', GIMP_LAYER_MODE_NORMAL => '28',
GIMP_LAYER_MODE_BEHIND => '29', GIMP_LAYER_MODE_BEHIND => '29',
GIMP_LAYER_MODE_MULTIPLY => '30', GIMP_LAYER_MODE_MULTIPLY => '30',
GIMP_LAYER_MODE_SCREEN => '31', GIMP_LAYER_MODE_SCREEN => '31',

Some files were not shown because too many files have changed in this diff Show more