diff --git a/app/actions/layers-commands.c b/app/actions/layers-commands.c index e5466d6d7f..950170b10c 100644 --- a/app/actions/layers-commands.c +++ b/app/actions/layers-commands.c @@ -373,7 +373,7 @@ layers_new_last_vals_cmd_callback (GtkAction *action, off_x = 0; off_y = 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, @@ -419,7 +419,7 @@ layers_new_from_visible_cmd_callback (GtkAction *action, TRUE), _("Visible"), GIMP_OPACITY_OPAQUE, - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LEGACY, profile); gimp_image_add_layer (image, layer, GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE); diff --git a/app/config/gimpdialogconfig.c b/app/config/gimpdialogconfig.c index ec1b51b7db..1824503909 100644 --- a/app/config/gimpdialogconfig.c +++ b/app/config/gimpdialogconfig.c @@ -302,7 +302,7 @@ gimp_dialog_config_class_init (GimpDialogConfigClass *klass) "Default new layer mode", LAYER_NEW_MODE_BLURB, GIMP_TYPE_LAYER_MODE, - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LEGACY, GIMP_PARAM_STATIC_STRINGS); GIMP_CONFIG_PROP_ENUM (object_class, PROP_LAYER_NEW_BLEND_SPACE, diff --git a/app/core/gimp-edit.c b/app/core/gimp-edit.c index 1e0aa7a6f7..336a21b479 100644 --- a/app/core/gimp-edit.c +++ b/app/core/gimp-edit.c @@ -420,7 +420,7 @@ gimp_edit_paste (GimpImage *image, floating_format, _("Pasted Layer"), GIMP_OPACITY_OPAQUE, - GIMP_LAYER_MODE_NORMAL); + GIMP_LAYER_MODE_NORMAL_LEGACY); } if (! layer) diff --git a/app/core/gimp-utils.c b/app/core/gimp-utils.c index ba2f9c01ea..e5bbd9a723 100644 --- a/app/core/gimp-utils.c +++ b/app/core/gimp-utils.c @@ -868,7 +868,7 @@ gimp_create_image_from_buffer (Gimp *gimp, layer = gimp_layer_new_from_gegl_buffer (buffer, image, format, image_name, GIMP_OPACITY_OPAQUE, - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LEGACY, NULL /* same image */); gimp_image_add_layer (image, layer, NULL, -1, FALSE); diff --git a/app/core/gimpcontext.c b/app/core/gimpcontext.c index ef9ae50fdc..fb8ea0357f 100644 --- a/app/core/gimpcontext.c +++ b/app/core/gimpcontext.c @@ -696,7 +696,7 @@ gimp_context_class_init (GimpContextClass *klass) _("Paint Mode"), _("Paint Mode"), GIMP_TYPE_LAYER_MODE, - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LEGACY, GIMP_PARAM_STATIC_STRINGS); GIMP_CONFIG_PROP_OBJECT (object_class, GIMP_CONTEXT_PROP_BRUSH, @@ -2589,7 +2589,7 @@ gimp_context_real_set_opacity (GimpContext *context, GimpLayerMode 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; } diff --git a/app/core/gimpdrawable-transform.c b/app/core/gimpdrawable-transform.c index d7ea02db24..218e62edb1 100644 --- a/app/core/gimpdrawable-transform.c +++ b/app/core/gimpdrawable-transform.c @@ -1003,7 +1003,7 @@ gimp_drawable_transform_paste (GimpDrawable *drawable, gimp_drawable_get_format_with_alpha (drawable), _("Transformation"), GIMP_OPACITY_OPAQUE, - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LEGACY, buffer_profile); gimp_item_set_offset (GIMP_ITEM (layer), offset_x, offset_y); diff --git a/app/core/gimpimage-merge.c b/app/core/gimpimage-merge.c index 5db703985e..d55065cfbb 100644 --- a/app/core/gimpimage-merge.c +++ b/app/core/gimpimage-merge.c @@ -529,7 +529,7 @@ gimp_image_merge_layers (GimpImage *image, gimp_image_get_layer_format (image, FALSE), gimp_object_get_name (layer), GIMP_OPACITY_OPAQUE, - GIMP_LAYER_MODE_NORMAL); + GIMP_LAYER_MODE_NORMAL_LEGACY); if (! merge_layer) { 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)), "merged layer", GIMP_OPACITY_OPAQUE, - GIMP_LAYER_MODE_NORMAL); + GIMP_LAYER_MODE_NORMAL_LEGACY); if (!merge_layer) { @@ -621,7 +621,7 @@ gimp_image_merge_layers (GimpImage *image, 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; composite_space = GIMP_LAYER_COLOR_SPACE_AUTO; composite_mode = GIMP_LAYER_COMPOSITE_AUTO; diff --git a/app/core/gimpimage-new.c b/app/core/gimpimage-new.c index a28b0d829f..b74243ab93 100644 --- a/app/core/gimpimage-new.c +++ b/app/core/gimpimage-new.c @@ -149,7 +149,7 @@ gimp_image_new_from_template (Gimp *gimp, gimp_image_get_layer_format (image, has_alpha), _("Background"), GIMP_OPACITY_OPAQUE, - GIMP_LAYER_MODE_NORMAL); + GIMP_LAYER_MODE_NORMAL_LEGACY); gimp_drawable_fill (GIMP_DRAWABLE (layer), 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_set_visible (GIMP_ITEM (new_layer), TRUE, 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); if (gimp_layer_can_lock_alpha (new_layer)) gimp_layer_set_lock_alpha (new_layer, FALSE, FALSE); @@ -326,7 +326,7 @@ gimp_image_new_from_buffer (Gimp *gimp, has_alpha), _("Pasted Layer"), GIMP_OPACITY_OPAQUE, - GIMP_LAYER_MODE_NORMAL); + GIMP_LAYER_MODE_NORMAL_LEGACY); gimp_image_add_layer (image, layer, NULL, 0, TRUE); @@ -385,7 +385,7 @@ gimp_image_new_from_pixbuf (Gimp *gimp, has_alpha), layer_name, GIMP_OPACITY_OPAQUE, - GIMP_LAYER_MODE_NORMAL); + GIMP_LAYER_MODE_NORMAL_LEGACY); gimp_image_add_layer (new_image, layer, NULL, 0, TRUE); diff --git a/app/core/gimpimage.c b/app/core/gimpimage.c index e8e10749e3..f4d370984b 100644 --- a/app/core/gimpimage.c +++ b/app/core/gimpimage.c @@ -2394,7 +2394,7 @@ gimp_image_get_xcf_version (GimpImage *image, switch (gimp_layer_get_mode (layer)) { /* 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_BEHIND_LEGACY: case GIMP_LAYER_MODE_MULTIPLY_LEGACY: @@ -2433,7 +2433,7 @@ gimp_image_get_xcf_version (GimpImage *image, break; /* Since 2.10 */ - case GIMP_LAYER_MODE_NORMAL_LINEAR: + case GIMP_LAYER_MODE_NORMAL: case GIMP_LAYER_MODE_BEHIND: case GIMP_LAYER_MODE_MULTIPLY: case GIMP_LAYER_MODE_SCREEN: diff --git a/app/core/gimplayer.c b/app/core/gimplayer.c index 5e10e05f0d..90c8ad9098 100644 --- a/app/core/gimplayer.c +++ b/app/core/gimplayer.c @@ -402,7 +402,7 @@ gimp_layer_class_init (GimpLayerClass *klass) g_object_class_install_property (object_class, PROP_MODE, g_param_spec_enum ("mode", NULL, NULL, GIMP_TYPE_LAYER_MODE, - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LEGACY, GIMP_PARAM_READABLE)); g_object_class_install_property (object_class, PROP_BLEND_SPACE, @@ -449,7 +449,7 @@ static void gimp_layer_init (GimpLayer *layer) { 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->composite_space = GIMP_LAYER_COLOR_SPACE_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) { - visible_mode = GIMP_LAYER_MODE_NORMAL; + visible_mode = GIMP_LAYER_MODE_NORMAL_LEGACY; visible_blend_space = GIMP_LAYER_COLOR_SPACE_AUTO; visible_composite_space = GIMP_LAYER_COLOR_SPACE_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 && 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_composite_space = GIMP_LAYER_COLOR_SPACE_AUTO; visible_composite_mode = GIMP_LAYER_COMPOSITE_AUTO; @@ -2203,7 +2203,7 @@ gimp_layer_set_mode (GimpLayer *layer, GimpLayerMode 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; } diff --git a/app/core/gimpselection.c b/app/core/gimpselection.c index 8a7a3b3bad..5206d8b63d 100644 --- a/app/core/gimpselection.c +++ b/app/core/gimpselection.c @@ -891,7 +891,7 @@ gimp_selection_float (GimpSelection *selection, gimp_drawable_get_format_with_alpha (drawable), _("Floated Layer"), GIMP_OPACITY_OPAQUE, - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LEGACY, profile); /* Set the offsets */ diff --git a/app/display/gimpdisplayshell-dnd.c b/app/display/gimpdisplayshell-dnd.c index 2505ac60c5..b5f70be39a 100644 --- a/app/display/gimpdisplayshell-dnd.c +++ b/app/display/gimpdisplayshell-dnd.c @@ -725,7 +725,7 @@ gimp_display_shell_drop_pixbuf (GtkWidget *widget, gimp_image_get_layer_format (image, has_alpha), _("Dropped Buffer"), GIMP_OPACITY_OPAQUE, - GIMP_LAYER_MODE_NORMAL); + GIMP_LAYER_MODE_NORMAL_LEGACY); if (new_layer) { diff --git a/app/gegl/gimpapplicator.c b/app/gegl/gimpapplicator.c index bc0e218607..2eec05a62c 100644 --- a/app/gegl/gimpapplicator.c +++ b/app/gegl/gimpapplicator.c @@ -58,7 +58,7 @@ static void gimp_applicator_init (GimpApplicator *applicator) { 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->composite_space = GIMP_LAYER_COLOR_SPACE_AUTO; applicator->composite_mode = GIMP_LAYER_COMPOSITE_AUTO; diff --git a/app/operations/layer-modes/gimp-layer-modes.c b/app/operations/layer-modes/gimp-layer-modes.c index a1a67745da..65440f3003 100644 --- a/app/operations/layer-modes/gimp-layer-modes.c +++ b/app/operations/layer-modes/gimp-layer-modes.c @@ -75,11 +75,13 @@ struct _GimpLayerModeInfo static const GimpLayerModeInfo layer_mode_infos[] = { - { GIMP_LAYER_MODE_NORMAL, + { GIMP_LAYER_MODE_NORMAL_LEGACY, .op_name = "gimp:normal", .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, .paint_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 }, - { GIMP_LAYER_MODE_NORMAL_LINEAR, + { GIMP_LAYER_MODE_NORMAL, .op_name = "gimp:normal", .function = gimp_operation_normal_process, - .flags = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE, .context = GIMP_LAYER_MODE_CONTEXT_ALL, .paint_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[] = { - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LEGACY, GIMP_LAYER_MODE_DISSOLVE, GIMP_LAYER_MODE_BEHIND_LEGACY, @@ -939,7 +940,7 @@ static const GimpLayerMode layer_mode_group_legacy[] = static const GimpLayerMode layer_mode_groups[][2] = { { [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, diff --git a/app/operations/layer-modes/gimpoperationlayermode.c b/app/operations/layer-modes/gimpoperationlayermode.c index 20b8e90ab4..3f50394a2c 100644 --- a/app/operations/layer-modes/gimpoperationlayermode.c +++ b/app/operations/layer-modes/gimpoperationlayermode.c @@ -154,7 +154,7 @@ gimp_operation_layer_mode_class_init (GimpOperationLayerModeClass *klass) g_param_spec_enum ("layer-mode", NULL, NULL, GIMP_TYPE_LAYER_MODE, - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LEGACY, GIMP_PARAM_READWRITE | 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_SUBTRACT: return blendfun_subtract; 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_BURN: return blendfun_burn; case GIMP_LAYER_MODE_GRAIN_MERGE: return blendfun_grain_merge; diff --git a/app/operations/operations-enums.c b/app/operations/operations-enums.c index 2c876d1ba8..d331cc090a 100644 --- a/app/operations/operations-enums.c +++ b/app/operations/operations-enums.c @@ -81,7 +81,7 @@ gimp_layer_mode_get_type (void) { 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_BEHIND_LEGACY, "GIMP_LAYER_MODE_BEHIND_LEGACY", "behind-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_COLOR, "GIMP_LAYER_MODE_LCH_COLOR", "lch-color" }, { 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_MULTIPLY, "GIMP_LAYER_MODE_MULTIPLY", "multiply" }, { GIMP_LAYER_MODE_SCREEN, "GIMP_LAYER_MODE_SCREEN", "screen" }, @@ -146,7 +146,7 @@ gimp_layer_mode_get_type (void) 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_BEHIND_LEGACY, NC_("layer-mode", "Behind (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_COLOR, NC_("layer-mode", "Color (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_MULTIPLY, NC_("layer-mode", "Multiply"), NULL }, { GIMP_LAYER_MODE_SCREEN, NC_("layer-mode", "Screen"), NULL }, diff --git a/app/operations/operations-enums.h b/app/operations/operations-enums.h index 4ea18baff3..b2810cb51f 100644 --- a/app/operations/operations-enums.h +++ b/app/operations/operations-enums.h @@ -55,7 +55,7 @@ GType gimp_layer_mode_get_type (void) G_GNUC_CONST; typedef enum { /* 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_BEHIND_LEGACY, /*< desc="Behind (legacy)" >*/ GIMP_LAYER_MODE_MULTIPLY_LEGACY, /*< desc="Multiply (legacy)" >*/ @@ -87,7 +87,7 @@ typedef enum GIMP_LAYER_MODE_LCH_LIGHTNESS, /*< desc="Lightness (LCH)" >*/ /* 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_MULTIPLY, /*< desc="Multiply" >*/ GIMP_LAYER_MODE_SCREEN, /*< desc="Screen" >*/ diff --git a/app/paint/gimpconvolve.c b/app/paint/gimpconvolve.c index 91ca86ef31..fb04273941 100644 --- a/app/paint/gimpconvolve.c +++ b/app/paint/gimpconvolve.c @@ -167,7 +167,7 @@ gimp_convolve_motion (GimpPaintCore *paint_core, paint_buffer = gimp_paint_core_get_paint_buffer (paint_core, drawable, paint_options, - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LEGACY, coords, &paint_buffer_x, &paint_buffer_y, diff --git a/app/paint/gimpdodgeburn.c b/app/paint/gimpdodgeburn.c index ae87d06ff0..f21b62a6ff 100644 --- a/app/paint/gimpdodgeburn.c +++ b/app/paint/gimpdodgeburn.c @@ -151,7 +151,7 @@ gimp_dodge_burn_motion (GimpPaintCore *paint_core, paint_buffer = gimp_paint_core_get_paint_buffer (paint_core, drawable, paint_options, - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LEGACY, coords, &paint_buffer_x, &paint_buffer_y, diff --git a/app/paint/gimperaser.c b/app/paint/gimperaser.c index 4bec328a91..34330e1ea3 100644 --- a/app/paint/gimperaser.c +++ b/app/paint/gimperaser.c @@ -164,7 +164,7 @@ gimp_eraser_motion (GimpPaintCore *paint_core, else if (gimp_drawable_has_alpha (drawable)) paint_mode = GIMP_LAYER_MODE_ERASE; 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), drawable, diff --git a/app/paint/gimppaintcore.c b/app/paint/gimppaintcore.c index 83ed3b90bc..ab1316a1e9 100644 --- a/app/paint/gimppaintcore.c +++ b/app/paint/gimppaintcore.c @@ -1040,7 +1040,7 @@ gimp_paint_core_replace (GimpPaintCore *core, drawable, paint_opacity, image_opacity, - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LEGACY, mode); return; } diff --git a/app/paint/gimpsmudge.c b/app/paint/gimpsmudge.c index 80096978ae..e068ff1f96 100644 --- a/app/paint/gimpsmudge.c +++ b/app/paint/gimpsmudge.c @@ -213,7 +213,7 @@ gimp_smudge_start (GimpPaintCore *paint_core, */ paint_buffer = gimp_paint_core_get_paint_buffer (paint_core, drawable, paint_options, - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LEGACY, coords, &paint_buffer_x, &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_options, - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LEGACY, coords, &paint_buffer_x, &paint_buffer_y, diff --git a/app/pdb/brush-select-cmds.c b/app/pdb/brush-select-cmds.c index 86bd7ae352..7ad5317003 100644 --- a/app/pdb/brush-select-cmds.c +++ b/app/pdb/brush-select-cmds.c @@ -204,7 +204,7 @@ register_brush_select_procs (GimpPDB *pdb) "paint mode", "The initial paint mode", GIMP_TYPE_LAYER_MODE, - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LEGACY, GIMP_PARAM_READWRITE)); gimp_pdb_register_procedure (pdb, procedure); g_object_unref (procedure); @@ -278,7 +278,7 @@ register_brush_select_procs (GimpPDB *pdb) "paint mode", "The initial paint mode", GIMP_TYPE_LAYER_MODE, - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LEGACY, GIMP_PARAM_READWRITE)); gimp_pdb_register_procedure (pdb, procedure); g_object_unref (procedure); diff --git a/app/pdb/brushes-cmds.c b/app/pdb/brushes-cmds.c index e03c8987c5..281b29e2b3 100644 --- a/app/pdb/brushes-cmds.c +++ b/app/pdb/brushes-cmds.c @@ -440,7 +440,7 @@ register_brushes_procs (GimpPDB *pdb) "paint mode", "The paint mode", GIMP_TYPE_LAYER_MODE, - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LEGACY, GIMP_PARAM_READWRITE)); gimp_procedure_add_return_value (procedure, gimp_param_spec_int32 ("width", diff --git a/app/pdb/context-cmds.c b/app/pdb/context-cmds.c index 6fc4288043..fee7882c14 100644 --- a/app/pdb/context-cmds.c +++ b/app/pdb/context-cmds.c @@ -3139,7 +3139,7 @@ register_context_procs (GimpPDB *pdb) "paint mode", "The paint mode", GIMP_TYPE_LAYER_MODE, - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LEGACY, GIMP_PARAM_READWRITE)); gimp_pdb_register_procedure (pdb, procedure); g_object_unref (procedure); @@ -3163,7 +3163,7 @@ register_context_procs (GimpPDB *pdb) "paint mode", "The paint mode", GIMP_TYPE_LAYER_MODE, - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LEGACY, GIMP_PARAM_READWRITE)); gimp_pdb_register_procedure (pdb, procedure); g_object_unref (procedure); diff --git a/app/pdb/edit-cmds.c b/app/pdb/edit-cmds.c index bf3f0ec749..5c026ebe4d 100644 --- a/app/pdb/edit-cmds.c +++ b/app/pdb/edit-cmds.c @@ -1349,7 +1349,7 @@ register_edit_procs (GimpPDB *pdb) "paint mode", "The paint application mode", GIMP_TYPE_LAYER_MODE, - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LEGACY, GIMP_PARAM_READWRITE)); gimp_procedure_add_argument (procedure, g_param_spec_double ("opacity", @@ -1416,7 +1416,7 @@ register_edit_procs (GimpPDB *pdb) "paint mode", "The paint application mode", GIMP_TYPE_LAYER_MODE, - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LEGACY, GIMP_PARAM_READWRITE)); gimp_procedure_add_argument (procedure, g_param_spec_double ("opacity", @@ -1496,7 +1496,7 @@ register_edit_procs (GimpPDB *pdb) "paint mode", "The paint application mode", GIMP_TYPE_LAYER_MODE, - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LEGACY, GIMP_PARAM_READWRITE)); gimp_procedure_add_argument (procedure, g_param_spec_enum ("gradient-type", diff --git a/app/pdb/layer-cmds.c b/app/pdb/layer-cmds.c index 6739b50e51..3d095e8087 100644 --- a/app/pdb/layer-cmds.c +++ b/app/pdb/layer-cmds.c @@ -182,7 +182,7 @@ layer_new_from_visible_invoker (GimpProcedure *procedure, TRUE), name, GIMP_OPACITY_OPAQUE, - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LEGACY, profile); } @@ -1384,7 +1384,7 @@ register_layer_procs (GimpPDB *pdb) "mode", "The layer combination mode", GIMP_TYPE_LAYER_MODE, - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LEGACY, GIMP_PARAM_READWRITE)); gimp_procedure_add_return_value (procedure, gimp_param_spec_layer_id ("layer", @@ -2320,7 +2320,7 @@ register_layer_procs (GimpPDB *pdb) "mode", "The layer combination mode", GIMP_TYPE_LAYER_MODE, - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LEGACY, GIMP_PARAM_READWRITE)); gimp_pdb_register_procedure (pdb, procedure); g_object_unref (procedure); @@ -2350,7 +2350,7 @@ register_layer_procs (GimpPDB *pdb) "mode", "The new layer combination mode", GIMP_TYPE_LAYER_MODE, - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LEGACY, GIMP_PARAM_READWRITE)); gimp_pdb_register_procedure (pdb, procedure); g_object_unref (procedure); diff --git a/app/tests/gimp-app-test-utils.c b/app/tests/gimp-app-test-utils.c index a39927f802..0da9e6af49 100644 --- a/app/tests/gimp-app-test-utils.c +++ b/app/tests/gimp-app-test-utils.c @@ -138,7 +138,7 @@ gimp_test_utils_create_image (Gimp *gimp, gimp_image_get_layer_format (image, TRUE), "layer1", 1.0, - GIMP_LAYER_MODE_NORMAL); + GIMP_LAYER_MODE_NORMAL_LEGACY); gimp_image_add_layer (image, layer, diff --git a/app/tests/test-core.c b/app/tests/test-core.c index cf27bc185a..0b164b3c2d 100644 --- a/app/tests/test-core.c +++ b/app/tests/test-core.c @@ -127,7 +127,7 @@ rotate_non_overlapping (GimpTestFixture *fixture, babl_format ("R'G'B'A u8"), "Test Layer", GIMP_OPACITY_OPAQUE, - GIMP_LAYER_MODE_NORMAL); + GIMP_LAYER_MODE_NORMAL_LEGACY); g_assert_cmpint (GIMP_IS_LAYER (layer), ==, TRUE); @@ -167,7 +167,7 @@ add_layer (GimpTestFixture *fixture, babl_format ("R'G'B'A u8"), "Test Layer", GIMP_OPACITY_OPAQUE, - GIMP_LAYER_MODE_NORMAL); + GIMP_LAYER_MODE_NORMAL_LEGACY); g_assert_cmpint (GIMP_IS_LAYER (layer), ==, TRUE); @@ -204,7 +204,7 @@ remove_layer (GimpTestFixture *fixture, babl_format ("R'G'B'A u8"), "Test Layer", GIMP_OPACITY_OPAQUE, - GIMP_LAYER_MODE_NORMAL); + GIMP_LAYER_MODE_NORMAL_LEGACY); g_assert_cmpint (GIMP_IS_LAYER (layer), ==, TRUE); diff --git a/app/tests/test-ui.c b/app/tests/test-ui.c index 61b245c7fd..cc40e27fa8 100644 --- a/app/tests/test-ui.c +++ b/app/tests/test-ui.c @@ -236,7 +236,7 @@ create_new_image_via_dialog (gconstpointer data) gimp_image_get_layer_format (image, TRUE), "Layer for testing", GIMP_OPACITY_OPAQUE, - GIMP_LAYER_MODE_NORMAL); + GIMP_LAYER_MODE_NORMAL_LEGACY); gimp_image_add_layer (image, layer, GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE); diff --git a/app/tests/test-xcf.c b/app/tests/test-xcf.c index ba2e514865..6343fdd30a 100644 --- a/app/tests/test-xcf.c +++ b/app/tests/test-xcf.c @@ -68,7 +68,7 @@ #define GIMP_MAINIMAGE_LAYER1_HEIGHT 51 #define GIMP_MAINIMAGE_LAYER1_FORMAT babl_format ("R'G'B'A u8") #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_WIDTH 25 diff --git a/app/tools/gimpwarptool.c b/app/tools/gimpwarptool.c index 0846c6e379..68aed1e73f 100644 --- a/app/tools/gimpwarptool.c +++ b/app/tools/gimpwarptool.c @@ -918,7 +918,7 @@ gimp_warp_tool_animate (GimpWarpTool *wt) gimp_item_set_offset (GIMP_ITEM (layer), 0, 0); 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_image_add_layer (image, layer, NULL, 0, FALSE); diff --git a/app/widgets/gimpbrushselect.c b/app/widgets/gimpbrushselect.c index e15168ff00..71c2718dbc 100644 --- a/app/widgets/gimpbrushselect.c +++ b/app/widgets/gimpbrushselect.c @@ -105,7 +105,7 @@ gimp_brush_select_class_init (GimpBrushSelectClass *klass) g_object_class_install_property (object_class, PROP_PAINT_MODE, g_param_spec_enum ("paint-mode", NULL, NULL, GIMP_TYPE_LAYER_MODE, - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LEGACY, GIMP_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); diff --git a/app/widgets/gimplayermodebox.c b/app/widgets/gimplayermodebox.c index a46763253e..bea5d15e8f 100644 --- a/app/widgets/gimplayermodebox.c +++ b/app/widgets/gimplayermodebox.c @@ -101,7 +101,7 @@ gimp_layer_mode_box_class_init (GimpLayerModeBoxClass *klass) g_param_spec_enum ("layer-mode", NULL, NULL, GIMP_TYPE_LAYER_MODE, - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LEGACY, GIMP_PARAM_READWRITE | G_PARAM_CONSTRUCT)); @@ -290,7 +290,7 @@ GimpLayerMode gimp_layer_mode_box_get_mode (GimpLayerModeBox *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; } diff --git a/app/widgets/gimplayermodecombobox.c b/app/widgets/gimplayermodecombobox.c index 2a829f7474..d2dc2798f2 100644 --- a/app/widgets/gimplayermodecombobox.c +++ b/app/widgets/gimplayermodecombobox.c @@ -108,7 +108,7 @@ gimp_layer_mode_combo_box_class_init (GimpLayerModeComboBoxClass *klass) g_param_spec_enum ("layer-mode", NULL, NULL, GIMP_TYPE_LAYER_MODE, - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LEGACY, GIMP_PARAM_READWRITE | G_PARAM_CONSTRUCT)); @@ -297,7 +297,7 @@ GimpLayerMode gimp_layer_mode_combo_box_get_mode (GimpLayerModeComboBox *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; } diff --git a/app/widgets/gimplayertreeview.c b/app/widgets/gimplayertreeview.c index 29bbb93656..7fee23f233 100644 --- a/app/widgets/gimplayertreeview.c +++ b/app/widgets/gimplayertreeview.c @@ -809,7 +809,7 @@ gimp_layer_tree_view_drop_pixbuf (GimpContainerTreeView *tree_view, gimp_image_get_layer_format (image, TRUE), _("Dropped Buffer"), GIMP_OPACITY_OPAQUE, - GIMP_LAYER_MODE_NORMAL); + GIMP_LAYER_MODE_NORMAL_LEGACY); 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), NULL, GIMP_OPACITY_OPAQUE, - GIMP_LAYER_MODE_NORMAL); + GIMP_LAYER_MODE_NORMAL_LEGACY); gimp_image_add_layer (image, new_layer, GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE); diff --git a/app/xcf/xcf-load.c b/app/xcf/xcf-load.c index 27395e5d7c..5c1410dcba 100644 --- a/app/xcf/xcf-load.c +++ b/app/xcf/xcf-load.c @@ -1561,7 +1561,7 @@ xcf_load_layer (XcfInfo *info, /* create a new layer */ 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); if (! layer) return NULL; diff --git a/libgimp/gimpenums.h b/libgimp/gimpenums.h index 5beaba93fa..e2af74db07 100644 --- a/libgimp/gimpenums.h +++ b/libgimp/gimpenums.h @@ -95,7 +95,7 @@ GType gimp_layer_mode_get_type (void) G_GNUC_CONST; typedef enum { - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LEGACY, GIMP_LAYER_MODE_DISSOLVE, GIMP_LAYER_MODE_BEHIND_LEGACY, GIMP_LAYER_MODE_MULTIPLY_LEGACY, @@ -123,7 +123,7 @@ typedef enum GIMP_LAYER_MODE_LCH_CHROMA, GIMP_LAYER_MODE_LCH_COLOR, GIMP_LAYER_MODE_LCH_LIGHTNESS, - GIMP_LAYER_MODE_NORMAL_LINEAR, + GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_BEHIND, GIMP_LAYER_MODE_MULTIPLY, GIMP_LAYER_MODE_SCREEN, diff --git a/libgimp/gimpexport.c b/libgimp/gimpexport.c index eefd2e0a7f..04930813f7 100644 --- a/libgimp/gimpexport.c +++ b/libgimp/gimpexport.c @@ -95,7 +95,7 @@ export_merge (gint32 image_ID, gimp_image_width (image_ID), gimp_image_height (image_ID), 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_selection_none (image_ID); gimp_edit_clear (transp); diff --git a/libgimp/gimpimagemetadata.c b/libgimp/gimpimagemetadata.c index bde4d90b1d..d9f7df8970 100644 --- a/libgimp/gimpimagemetadata.c +++ b/libgimp/gimpimagemetadata.c @@ -609,7 +609,8 @@ gimp_image_metadata_load_thumbnail (GFile *file, layer_ID = gimp_layer_new_from_pixbuf (image_ID, _("Background"), pixbuf, - 100.0, GIMP_LAYER_MODE_NORMAL, + 100.0, + GIMP_LAYER_MODE_NORMAL_LEGACY, 0.0, 0.0); g_object_unref (pixbuf); diff --git a/libgimp/gimplayer.c b/libgimp/gimplayer.c index dd76de5592..1b7a4a108e 100644 --- a/libgimp/gimplayer.c +++ b/libgimp/gimplayer.c @@ -274,7 +274,7 @@ gimp_layer_new_from_surface (gint32 image_ID, layer = gimp_layer_new (image_ID, name, width, height, format == CAIRO_FORMAT_RGB24 ? GIMP_RGB_IMAGE : GIMP_RGBA_IMAGE, - 100.0, GIMP_LAYER_MODE_NORMAL); + 100.0, GIMP_LAYER_MODE_NORMAL_LEGACY); if (layer == -1) return -1; diff --git a/plug-ins/common/animation-optimize.c b/plug-ins/common/animation-optimize.c index 9131f444fc..91b0f1b004 100644 --- a/plug-ins/common/animation-optimize.c +++ b/plug-ins/common/animation-optimize.c @@ -637,12 +637,12 @@ do_optimizations (GimpRunMode run_mode, if (opmode == OPBACKGROUND) { - new_layer_id = gimp_layer_new(new_image_id, - "Backgroundx", - width, height, - drawabletype_alpha, - 100.0, - GIMP_LAYER_MODE_NORMAL); + new_layer_id = gimp_layer_new (new_image_id, + "Backgroundx", + width, height, + drawabletype_alpha, + 100.0, + GIMP_LAYER_MODE_NORMAL_LEGACY); 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, drawabletype_alpha, 100.0, - GIMP_LAYER_MODE_NORMAL); + GIMP_LAYER_MODE_NORMAL_LEGACY); g_free (newlayer_name); gimp_image_insert_layer (new_image_id, new_layer_id, -1, 0); diff --git a/plug-ins/common/compose.c b/plug-ins/common/compose.c index f7346b6bc6..31ab6fdc0d 100644 --- a/plug-ins/common/compose.c +++ b/plug-ins/common/compose.c @@ -1021,7 +1021,7 @@ create_new_image (const gchar *filename, *layer_ID = gimp_layer_new (image_ID, _("Background"), width, height, gdtype, - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); gimp_image_insert_layer (image_ID, *layer_ID, -1, 0); *buffer = gimp_drawable_get_buffer (*layer_ID); diff --git a/plug-ins/common/decompose.c b/plug-ins/common/decompose.c index 87cc3558b5..a47d614600 100644 --- a/plug-ins/common/decompose.c +++ b/plug-ins/common/decompose.c @@ -608,7 +608,7 @@ create_new_layer (gint32 image_ID, layer_ID = gimp_layer_new (image_ID, layername, width, height, gdtype, - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); gimp_image_insert_layer (image_ID, layer_ID, -1, position); return layer_ID; diff --git a/plug-ins/common/edge-dog.c b/plug-ins/common/edge-dog.c index fb80a893c6..5072139883 100644 --- a/plug-ins/common/edge-dog.c +++ b/plug-ins/common/edge-dog.c @@ -993,7 +993,7 @@ preview_update_preview (GimpPreview *preview, preview_id = gimp_layer_new (image_id, "preview", width, height, gimp_drawable_type (drawable->drawable_id), 100, - GIMP_LAYER_MODE_NORMAL); + GIMP_LAYER_MODE_NORMAL_LEGACY); preview_drawable = gimp_drawable_get (preview_id); gimp_image_insert_layer (image_id, preview_id, -1, 0); gimp_layer_set_offsets (preview_id, 0, 0); diff --git a/plug-ins/common/file-cel.c b/plug-ins/common/file-cel.c index bdffe9f4d0..72ce761e82 100644 --- a/plug-ins/common/file-cel.c +++ b/plug-ins/common/file-cel.c @@ -440,11 +440,11 @@ load_image (const gchar *file, if (bpp == 32) layer = gimp_layer_new (image, _("Background"), width, height, GIMP_RGBA_IMAGE, - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); else layer = gimp_layer_new (image, _("Background"), width, height, GIMP_INDEXEDA_IMAGE, - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); gimp_image_insert_layer (image, layer, -1, 0); gimp_layer_set_offsets (layer, offx, offy); diff --git a/plug-ins/common/file-dicom.c b/plug-ins/common/file-dicom.c index adabf80175..be8673d5b2 100644 --- a/plug-ins/common/file-dicom.c +++ b/plug-ins/common/file-dicom.c @@ -612,7 +612,7 @@ load_image (const gchar *filename, dicominfo->width, dicominfo->height, (dicominfo->samples_per_pixel >= 3 ? 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); buffer = gimp_drawable_get_buffer (layer_ID); diff --git a/plug-ins/common/file-gbr.c b/plug-ins/common/file-gbr.c index 99d4702318..88aeb6bf5d 100644 --- a/plug-ins/common/file-gbr.c +++ b/plug-ins/common/file-gbr.c @@ -622,7 +622,7 @@ load_image (GFile *file, layer_ID = gimp_layer_new (image_ID, name, bh.width, bh.height, image_type, - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); gimp_image_insert_layer (image_ID, layer_ID, -1, 0); g_free (name); diff --git a/plug-ins/common/file-gegl.c b/plug-ins/common/file-gegl.c index e604fe4b75..ef6bd9b605 100644 --- a/plug-ins/common/file-gegl.c +++ b/plug-ins/common/file-gegl.c @@ -414,7 +414,7 @@ load_image (const gchar *filename, _("Background"), width, height, image_type, - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); gimp_image_insert_layer (image_ID, layer_ID, -1, 0); dest_buf = gimp_drawable_get_buffer (layer_ID); diff --git a/plug-ins/common/file-gif-load.c b/plug-ins/common/file-gif-load.c index 18ff92598a..081053dd14 100644 --- a/plug-ins/common/file-gif-load.c +++ b/plug-ins/common/file-gif-load.c @@ -989,14 +989,14 @@ ReadImage (FILE *fd, layer_ID = gimp_layer_new (*image_ID, framename, len, height, GIMP_INDEXED_IMAGE, - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); } else { layer_ID = gimp_layer_new (*image_ID, framename, len, height, GIMP_INDEXEDA_IMAGE, - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); alpha_frame=TRUE; } @@ -1081,7 +1081,7 @@ ReadImage (FILE *fd, len, height, promote_to_rgb ? GIMP_RGBA_IMAGE : GIMP_INDEXEDA_IMAGE, - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); alpha_frame = TRUE; g_free (framename); } diff --git a/plug-ins/common/file-gih.c b/plug-ins/common/file-gih.c index 82ecc0c875..eaec3d514d 100644 --- a/plug-ins/common/file-gih.c +++ b/plug-ins/common/file-gih.c @@ -619,7 +619,7 @@ gih_load_one_brush (GInputStream *input, layer_ID = gimp_layer_new (image_ID, name, bh.width, bh.height, image_type, - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); g_free (name); if (layer_ID != -1) diff --git a/plug-ins/common/file-jp2-load.c b/plug-ins/common/file-jp2-load.c index b9ab329c55..ffea77d929 100644 --- a/plug-ins/common/file-jp2-load.c +++ b/plug-ins/common/file-jp2-load.c @@ -395,7 +395,7 @@ load_image (const gchar *filename, _("Background"), width, height, image_type, - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); gimp_image_insert_layer (image_ID, layer_ID, -1, 0); buffer = gimp_drawable_get_buffer (layer_ID); diff --git a/plug-ins/common/file-pat.c b/plug-ins/common/file-pat.c index 7c3f2b91e5..dca8aa4724 100644 --- a/plug-ins/common/file-pat.c +++ b/plug-ins/common/file-pat.c @@ -441,7 +441,7 @@ load_image (GFile *file, layer_ID = gimp_layer_new (image_ID, name, ph.width, ph.height, image_type, - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); gimp_image_insert_layer (image_ID, layer_ID, -1, 0); g_free (name); diff --git a/plug-ins/common/file-pcx.c b/plug-ins/common/file-pcx.c index a9f5fe76c4..ede642b7a5 100644 --- a/plug-ins/common/file-pcx.c +++ b/plug-ins/common/file-pcx.c @@ -436,14 +436,14 @@ load_image (const gchar *filename, image= gimp_image_new (width, height, GIMP_RGB); layer= gimp_layer_new (image, _("Background"), width, height, GIMP_RGB_IMAGE, - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); } else { image= gimp_image_new (width, height, GIMP_INDEXED); layer= gimp_layer_new (image, _("Background"), width, height, GIMP_INDEXED_IMAGE, - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); } gimp_image_set_filename (image, filename); diff --git a/plug-ins/common/file-pix.c b/plug-ins/common/file-pix.c index 98d038b4f3..267901d0c9 100644 --- a/plug-ins/common/file-pix.c +++ b/plug-ins/common/file-pix.c @@ -400,7 +400,7 @@ load_image (GFile *file, layer_ID = gimp_layer_new (image_ID, _("Background"), width, height, gdtype, - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); gimp_image_insert_layer (image_ID, layer_ID, -1, 0); buffer = gimp_drawable_get_buffer (layer_ID); diff --git a/plug-ins/common/file-png.c b/plug-ins/common/file-png.c index 1b1a94ec41..6ca88b2035 100644 --- a/plug-ins/common/file-png.c +++ b/plug-ins/common/file-png.c @@ -1064,7 +1064,7 @@ load_image (const gchar *filename, layer = gimp_layer_new (image, _("Background"), width, height, layer_type, - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); gimp_image_insert_layer (image, layer, -1, 0); file_format = gimp_drawable_get_format (layer); diff --git a/plug-ins/common/file-pnm.c b/plug-ins/common/file-pnm.c index 63b3a99533..f805a2feb8 100644 --- a/plug-ins/common/file-pnm.c +++ b/plug-ins/common/file-pnm.c @@ -686,7 +686,7 @@ load_image (GFile *file, pnminfo->xres, pnminfo->yres, (pnminfo->np >= 3 ? 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); buffer = gimp_drawable_get_buffer (layer_ID); diff --git a/plug-ins/common/file-ps.c b/plug-ins/common/file-ps.c index e409f646d8..01679b1ef4 100644 --- a/plug-ins/common/file-ps.c +++ b/plug-ins/common/file-ps.c @@ -1915,7 +1915,7 @@ create_new_image (const gchar *filename, tmp = g_strdup_printf (_("Page %d"), pagenum); *layer_ID = gimp_layer_new (image_ID, tmp, width, height, gdtype, - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); g_free (tmp); gimp_image_insert_layer (image_ID, *layer_ID, -1, 0); diff --git a/plug-ins/common/file-psp.c b/plug-ins/common/file-psp.c index 13ccce7a51..d7b0b78d66 100644 --- a/plug-ins/common/file-psp.c +++ b/plug-ins/common/file-psp.c @@ -992,7 +992,7 @@ gimp_layer_mode_from_psp_blend_mode (PSPBlendModes mode) switch (mode) { case PSP_BLEND_NORMAL: - return GIMP_LAYER_MODE_NORMAL; + return GIMP_LAYER_MODE_NORMAL_LEGACY; case PSP_BLEND_DARKEN: return GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY; @@ -1422,7 +1422,7 @@ read_layer_block (FILE *f, g_message ("Unsupported PSP layer blend mode %s " "for layer %s, setting layer invisible", blend_mode_name (blend_mode), name); - layer_mode = GIMP_LAYER_MODE_NORMAL; + layer_mode = GIMP_LAYER_MODE_NORMAL_LEGACY; visibility = FALSE; } diff --git a/plug-ins/common/file-raw-data.c b/plug-ins/common/file-raw-data.c index 632492e790..6818c5f812 100644 --- a/plug-ins/common/file-raw-data.c +++ b/plug-ins/common/file-raw-data.c @@ -1162,7 +1162,7 @@ load_image (const gchar *filename, layer_id = gimp_layer_new (data->image_id, _("Background"), runtime->image_width, runtime->image_height, ltype, - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); gimp_image_insert_layer (data->image_id, layer_id, -1, 0); data->buffer = gimp_drawable_get_buffer (layer_id); diff --git a/plug-ins/common/file-sunras.c b/plug-ins/common/file-sunras.c index b8a3ff6687..82224c5f0b 100644 --- a/plug-ins/common/file-sunras.c +++ b/plug-ins/common/file-sunras.c @@ -1048,7 +1048,7 @@ create_new_image (const gchar *filename, *layer_ID = gimp_layer_new (image_ID, _("Background"), width, height, gdtype, - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); gimp_image_insert_layer (image_ID, *layer_ID, -1, 0); *buffer = gimp_drawable_get_buffer (*layer_ID); diff --git a/plug-ins/common/file-svg.c b/plug-ins/common/file-svg.c index 33bf042e33..d87206e43a 100644 --- a/plug-ins/common/file-svg.c +++ b/plug-ins/common/file-svg.c @@ -347,7 +347,7 @@ load_image (const gchar *filename, load_vals.resolution, load_vals.resolution); 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); gimp_image_insert_layer (image, layer, -1, 0); diff --git a/plug-ins/common/file-tga.c b/plug-ins/common/file-tga.c index f6a20cda0b..6976fe1604 100644 --- a/plug-ins/common/file-tga.c +++ b/plug-ins/common/file-tga.c @@ -1092,7 +1092,7 @@ ReadImage (FILE *fp, _("Background"), info->width, info->height, dtype, - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); gimp_image_insert_layer (image_ID, layer_ID, -1, 0); diff --git a/plug-ins/common/file-wmf.c b/plug-ins/common/file-wmf.c index 3d39363aed..f6fdd53f29 100644 --- a/plug-ins/common/file-wmf.c +++ b/plug-ins/common/file-wmf.c @@ -998,7 +998,7 @@ load_image (const gchar *filename, _("Rendered WMF"), width, height, GIMP_RGBA_IMAGE, - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); buffer = gimp_drawable_get_buffer (layer); diff --git a/plug-ins/common/file-xbm.c b/plug-ins/common/file-xbm.c index 7b84487ff9..d104245680 100644 --- a/plug-ins/common/file-xbm.c +++ b/plug-ins/common/file-xbm.c @@ -905,7 +905,7 @@ load_image (const gchar *filename, width, height, GIMP_INDEXED_IMAGE, 100, - GIMP_LAYER_MODE_NORMAL); + GIMP_LAYER_MODE_NORMAL_LEGACY); gimp_image_insert_layer (image_ID, layer_ID, -1, 0); buffer = gimp_drawable_get_buffer (layer_ID); diff --git a/plug-ins/common/file-xmc.c b/plug-ins/common/file-xmc.c index eec964dd8e..40d2493f39 100644 --- a/plug-ins/common/file-xmc.c +++ b/plug-ins/common/file-xmc.c @@ -728,7 +728,7 @@ load_image (const gchar *filename, layer_ID = gimp_layer_new (image_ID, framename, width, height, GIMP_RGBA_IMAGE, - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); gimp_image_insert_layer (image_ID, layer_ID, -1, 0); /* 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, GIMP_RGBA_IMAGE, - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); gimp_image_insert_layer (image_ID, layer_ID, -1, 0); diff --git a/plug-ins/common/file-xpm.c b/plug-ins/common/file-xpm.c index 8664c5c0b3..6ecd47e639 100644 --- a/plug-ins/common/file-xpm.c +++ b/plug-ins/common/file-xpm.c @@ -482,7 +482,7 @@ parse_image (gint32 image_ID, xpm_image->height, GIMP_RGBA_IMAGE, 100, - GIMP_LAYER_MODE_NORMAL); + GIMP_LAYER_MODE_NORMAL_LEGACY); gimp_image_insert_layer (image_ID, layer_ID, -1, 0); diff --git a/plug-ins/common/file-xwd.c b/plug-ins/common/file-xwd.c index 39f851b7bb..643ef73f48 100644 --- a/plug-ins/common/file-xwd.c +++ b/plug-ins/common/file-xwd.c @@ -1272,7 +1272,7 @@ create_new_image (const gchar *filename, *layer_ID = gimp_layer_new (image_ID, "Background", width, height, gdtype, - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); gimp_image_insert_layer (image_ID, *layer_ID, -1, 0); *buffer = gimp_drawable_get_buffer (*layer_ID); diff --git a/plug-ins/common/film.c b/plug-ins/common/film.c index cb435d776c..9fdfac20de 100644 --- a/plug-ins/common/film.c +++ b/plug-ins/common/film.c @@ -744,7 +744,7 @@ create_new_image (const gchar *filename, gimp_image_undo_disable (image_ID); *layer_ID = gimp_layer_new (image_ID, _("Background"), width, height, gdtype, - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); gimp_image_insert_layer (image_ID, *layer_ID, -1, 0); if (drawable) diff --git a/plug-ins/common/hot.c b/plug-ins/common/hot.c index 752d0137c6..55d0f1a0d9 100644 --- a/plug-ins/common/hot.c +++ b/plug-ins/common/hot.c @@ -350,7 +350,7 @@ pluginCore (piArgs *argp) nl = gimp_layer_new (argp->image, name, width, height, GIMP_RGBA_IMAGE, - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); ndrw = gimp_drawable_get (nl); gimp_drawable_fill (nl, GIMP_FILL_TRANSPARENT); gimp_image_insert_layer (argp->image, nl, -1, 0); diff --git a/plug-ins/common/smooth-palette.c b/plug-ins/common/smooth-palette.c index 4f374904f0..812550a603 100644 --- a/plug-ins/common/smooth-palette.c +++ b/plug-ins/common/smooth-palette.c @@ -258,7 +258,7 @@ smooth_palette (gint32 drawable_id, *layer_id = gimp_layer_new (new_image_id, _("Background"), config.width, config.height, 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); diff --git a/plug-ins/common/tile.c b/plug-ins/common/tile.c index f14498f93a..7da2cb4054 100644 --- a/plug-ins/common/tile.c +++ b/plug-ins/common/tile.c @@ -354,7 +354,7 @@ tile (gint32 image_id, *new_layer_id = gimp_layer_new (*new_image_id, _("Background"), dst_width, dst_height, gimp_drawable_type (drawable_id), - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); if (*new_layer_id == -1) return; diff --git a/plug-ins/common/warp.c b/plug-ins/common/warp.c index 03c24f8c91..3dacf1532d 100644 --- a/plug-ins/common/warp.c +++ b/plug-ins/common/warp.c @@ -941,12 +941,12 @@ diff (GimpDrawable *drawable, xlayer_id = gimp_layer_new (new_image_id, "Warp_X_Vectors", width, height, 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", width, height, GIMP_RGB_IMAGE, - 100.0, GIMP_LAYER_MODE_NORMAL); + 100.0, GIMP_LAYER_MODE_NORMAL_LEGACY); draw_yd = gimp_drawable_get (ylayer_id); draw_xd = gimp_drawable_get (xlayer_id); diff --git a/plug-ins/common/wavelet-decompose.c b/plug-ins/common/wavelet-decompose.c index c97939069e..9a703948fc 100644 --- a/plug-ins/common/wavelet-decompose.c +++ b/plug-ins/common/wavelet-decompose.c @@ -192,7 +192,7 @@ run (const gchar *name, gimp_image_get_item_position (image_id, blur_id) ); 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_image_remove_layer (image_id, original_id); diff --git a/plug-ins/common/web-page.c b/plug-ins/common/web-page.c index 91b03c550a..331c91874f 100644 --- a/plug-ins/common/web-page.c +++ b/plug-ins/common/web-page.c @@ -533,7 +533,7 @@ webpage_capture (void) gimp_image_undo_disable (image); 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); gimp_image_insert_layer (image, layer, -1, 0); gimp_image_undo_enable (image); diff --git a/plug-ins/file-bmp/bmp-load.c b/plug-ins/file-bmp/bmp-load.c index 49add48ee5..61eb1340ea 100644 --- a/plug-ins/file-bmp/bmp-load.c +++ b/plug-ins/file-bmp/bmp-load.c @@ -733,7 +733,7 @@ ReadImage (FILE *fd, image = gimp_image_new (width, height, base_type); layer = gimp_layer_new (image, _("Background"), width, height, - image_type, 100, GIMP_LAYER_MODE_NORMAL); + image_type, 100, GIMP_LAYER_MODE_NORMAL_LEGACY); gimp_image_set_filename (image, filename); diff --git a/plug-ins/file-exr/file-exr.c b/plug-ins/file-exr/file-exr.c index ab0da22a2f..32e4b92f5c 100644 --- a/plug-ins/file-exr/file-exr.c +++ b/plug-ins/file-exr/file-exr.c @@ -256,7 +256,7 @@ load_image (const gchar *filename, gimp_image_set_filename (image, filename); 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); buffer = gimp_drawable_get_buffer (layer); diff --git a/plug-ins/file-faxg3/faxg3.c b/plug-ins/file-faxg3/faxg3.c index d95dbcb3e4..22aeac1511 100644 --- a/plug-ins/file-faxg3/faxg3.c +++ b/plug-ins/file-faxg3/faxg3.c @@ -525,7 +525,8 @@ emitgimp (gint hcol, layer_ID = gimp_layer_new (image_ID, _("Background"), hcol, 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); buffer = gimp_drawable_get_buffer (layer_ID); diff --git a/plug-ins/file-fits/fits.c b/plug-ins/file-fits/fits.c index 7065a0ee8c..b3f1eca690 100644 --- a/plug-ins/file-fits/fits.c +++ b/plug-ins/file-fits/fits.c @@ -527,7 +527,7 @@ create_new_image (const gchar *filename, gimp_image_undo_disable (image_ID); *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); *buffer = gimp_drawable_get_buffer (*layer_ID); diff --git a/plug-ins/file-fli/fli-gimp.c b/plug-ins/file-fli/fli-gimp.c index 29b554e926..a4e85aed5c 100644 --- a/plug-ins/file-fli/fli-gimp.c +++ b/plug-ins/file-fli/fli-gimp.c @@ -565,7 +565,7 @@ load_image (const gchar *filename, layer_ID = gimp_layer_new (image_id, name_buf, fli_header.width, fli_header.height, GIMP_INDEXED_IMAGE, - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); g_free (name_buf); buffer = gimp_drawable_get_buffer (layer_ID); diff --git a/plug-ins/file-ico/ico-dialog.c b/plug-ins/file-ico/ico-dialog.c index ff8e486cbf..d87c13c5aa 100644 --- a/plug-ins/file-ico/ico-dialog.c +++ b/plug-ins/file-ico/ico-dialog.c @@ -288,7 +288,7 @@ ico_dialog_update_icon_preview (GtkWidget *dialog, tmp_layer = gimp_layer_new (tmp_image, "temporary", w, h, 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); 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, 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); buffer = gimp_drawable_get_buffer (layer); diff --git a/plug-ins/file-ico/ico-load.c b/plug-ins/file-ico/ico-load.c index 4db0c41274..5b0ac92a72 100644 --- a/plug-ins/file-ico/ico-load.c +++ b/plug-ins/file-ico/ico-load.c @@ -634,7 +634,7 @@ ico_load_layer (FILE *fp, g_snprintf (name, sizeof (name), _("Icon #%i"), icon_num+1); layer = gimp_layer_new (image, name, width, height, GIMP_RGBA_IMAGE, - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); gimp_image_insert_layer (image, layer, -1, icon_num); buffer = gimp_drawable_get_buffer (layer); diff --git a/plug-ins/file-ico/ico-save.c b/plug-ins/file-ico/ico-save.c index 04b6abf2c5..87ba36a2a5 100644 --- a/plug-ins/file-ico/ico-save.c +++ b/plug-ins/file-ico/ico-save.c @@ -628,7 +628,7 @@ ico_image_get_reduced_buf (guint32 layer, tmp_layer = gimp_layer_new (tmp_image, "tmp", w, h, 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); tmp = gimp_drawable_get_buffer (tmp_layer); diff --git a/plug-ins/file-jpeg/jpeg-load.c b/plug-ins/file-jpeg/jpeg-load.c index 4386b1b8b3..0dbc52edcb 100644 --- a/plug-ins/file-jpeg/jpeg-load.c +++ b/plug-ins/file-jpeg/jpeg-load.c @@ -232,7 +232,7 @@ load_image (const gchar *filename, cinfo.output_width, cinfo.output_height, layer_type, - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); layer_ID = preview_layer_ID; } else @@ -241,7 +241,7 @@ load_image (const gchar *filename, cinfo.output_width, cinfo.output_height, layer_type, - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); } if (! preview) diff --git a/plug-ins/file-psd/psd-image-res-load.c b/plug-ins/file-psd/psd-image-res-load.c index 387725d3ec..527bce16fc 100644 --- a/plug-ins/file-psd/psd-image-res-load.c +++ b/plug-ins/file-psd/psd-image-res-load.c @@ -1034,7 +1034,7 @@ load_resource_1033 (const PSDimageres *res_a, cinfo.output_width, cinfo.output_height, GIMP_RGB_IMAGE, - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); buffer = gimp_drawable_get_buffer (layer_id); format = babl_format ("R'G'B' u8"); diff --git a/plug-ins/file-psd/psd-load.c b/plug-ins/file-psd/psd-load.c index 15faaefad1..6bddd6fa86 100644 --- a/plug-ins/file-psd/psd-load.c +++ b/plug-ins/file-psd/psd-load.c @@ -1430,7 +1430,7 @@ add_layers (gint32 image_id, layer_id = gimp_layer_new (image_id, lyr_a[lidx]->name, img_a->columns, img_a->rows, image_type, - 0, GIMP_LAYER_MODE_NORMAL); + 0, GIMP_LAYER_MODE_NORMAL_LEGACY); g_free (lyr_a[lidx]->name); gimp_image_insert_layer (image_id, layer_id, parent_group_id, 0); 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"), img_a->columns, img_a->rows, image_type, - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); gimp_image_insert_layer (image_id, layer_id, -1, 0); buffer = gimp_drawable_get_buffer (layer_id); gegl_buffer_set (buffer, diff --git a/plug-ins/file-psd/psd-save.c b/plug-ins/file-psd/psd-save.c index c7fbcbc107..88f2a96e77 100644 --- a/plug-ins/file-psd/psd-save.c +++ b/plug-ins/file-psd/psd-save.c @@ -197,7 +197,7 @@ psd_lmode_layer (gint32 idLayer, { switch (gimp_layer_get_mode (idLayer)) { - case GIMP_LAYER_MODE_NORMAL: + case GIMP_LAYER_MODE_NORMAL_LEGACY: strcpy (psdMode, "norm"); break; case GIMP_LAYER_MODE_DARKEN_ONLY: diff --git a/plug-ins/file-psd/psd-util.c b/plug-ins/file-psd/psd-util.c index 82797c106d..7cfbe3e3e5 100644 --- a/plug-ins/file-psd/psd-util.c +++ b/plug-ins/file-psd/psd-util.c @@ -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 (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) */ @@ -729,7 +729,7 @@ psd_to_gimp_blend_mode (const gchar *psd_mode, mode_name); } 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 */ @@ -741,7 +741,7 @@ psd_to_gimp_blend_mode (const gchar *psd_mode, mode_name); } if (layer_composite) *layer_composite = GIMP_LAYER_COMPOSITE_AUTO; - return GIMP_LAYER_MODE_NORMAL; + return GIMP_LAYER_MODE_NORMAL_LEGACY; } 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; - return GIMP_LAYER_MODE_NORMAL; + return GIMP_LAYER_MODE_NORMAL_LEGACY; } gchar * @@ -763,7 +763,7 @@ gimp_to_psd_blend_mode (GimpLayerMode layer_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_composite != GIMP_LAYER_COMPOSITE_AUTO && layer_composite != GIMP_LAYER_COMPOSITE_SRC_OVER)) || @@ -774,7 +774,7 @@ gimp_to_psd_blend_mode (GimpLayerMode layer_mode, switch (layer_mode) { - case GIMP_LAYER_MODE_NORMAL: + case GIMP_LAYER_MODE_NORMAL_LEGACY: psd_mode = g_strndup ("norm", 4); /* Normal (ps3) */ break; diff --git a/plug-ins/file-sgi/sgi.c b/plug-ins/file-sgi/sgi.c index cc8ee76899..f4c2974302 100644 --- a/plug-ins/file-sgi/sgi.c +++ b/plug-ins/file-sgi/sgi.c @@ -410,7 +410,7 @@ load_image (const gchar *filename, layer = gimp_layer_new (image, _("Background"), sgip->xsize, sgip->ysize, layer_type, - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); gimp_image_insert_layer (image, layer, -1, 0); /* diff --git a/plug-ins/file-tiff/file-tiff-load.c b/plug-ins/file-tiff/file-tiff-load.c index f183e7e6e2..9ded07598c 100644 --- a/plug-ins/file-tiff/file-tiff-load.c +++ b/plug-ins/file-tiff/file-tiff-load.c @@ -913,7 +913,7 @@ load_image (GFile *file, layer = gimp_layer_new (image, name, cols, rows, layer_type, - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); } else { @@ -927,7 +927,7 @@ load_image (GFile *file, layer = gimp_layer_new (image, name, cols, rows, layer_type, - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); g_free (name); } diff --git a/plug-ins/file-webp/file-webp-load.c b/plug-ins/file-webp/file-webp-load.c index 4825e3c646..f14dc525a7 100644 --- a/plug-ins/file-webp/file-webp-load.c +++ b/plug-ins/file-webp/file-webp-load.c @@ -55,7 +55,7 @@ create_layer (gint32 image_ID, width, height, GIMP_RGBA_IMAGE, 100, - GIMP_LAYER_MODE_NORMAL); + GIMP_LAYER_MODE_NORMAL_LEGACY); gimp_image_insert_layer (image_ID, layer_ID, -1, position); diff --git a/plug-ins/gfig/gfig-dialog.c b/plug-ins/gfig/gfig-dialog.c index 7ad00a9a8b..5b75b44981 100644 --- a/plug-ins/gfig/gfig-dialog.c +++ b/plug-ins/gfig/gfig-dialog.c @@ -248,7 +248,7 @@ gfig_dialog (void) newlayer = gimp_layer_new (gfig_context->image_id, "GFig", img_width, img_height, img_type, - 100.0, GIMP_LAYER_MODE_NORMAL); + 100.0, GIMP_LAYER_MODE_NORMAL_LEGACY); gimp_drawable_fill (newlayer, GIMP_FILL_TRANSPARENT); gimp_image_insert_layer (gfig_context->image_id, newlayer, -1, -1); gfig_context->drawable_id = newlayer; @@ -1922,7 +1922,7 @@ paint_layer_fill (gdouble x1, gdouble y1, gdouble x2, gdouble y2) case FILL_GRADIENT: gimp_edit_blend (gfig_context->drawable_id, GIMP_BLEND_CUSTOM, - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LEGACY, GIMP_GRADIENT_SHAPEBURST_DIMPLED, 100.0, /* opacity */ 0.0, /* offset */ @@ -1938,7 +1938,7 @@ paint_layer_fill (gdouble x1, gdouble y1, gdouble x2, gdouble y2) case FILL_VERTICAL: gimp_edit_blend (gfig_context->drawable_id, GIMP_BLEND_CUSTOM, - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LEGACY, GIMP_GRADIENT_LINEAR, 100.0, 0.0, @@ -1954,7 +1954,7 @@ paint_layer_fill (gdouble x1, gdouble y1, gdouble x2, gdouble y2) case FILL_HORIZONTAL: gimp_edit_blend (gfig_context->drawable_id, GIMP_BLEND_CUSTOM, - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LEGACY, GIMP_GRADIENT_LINEAR, 100.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, fill_mode, /* Fill mode */ - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LEGACY, current_style->fill_opacity, /* Fill opacity */ 0.0, /* threshold - ignored */ FALSE, /* Sample merged - ignored */ diff --git a/plug-ins/lighting/lighting-apply.c b/plug-ins/lighting/lighting-apply.c index 2cb106c374..4a0608e6da 100644 --- a/plug-ins/lighting/lighting-apply.c +++ b/plug-ins/lighting/lighting-apply.c @@ -55,7 +55,7 @@ compute_image (void) width, height, GIMP_RGBA_IMAGE, 100.0, - GIMP_LAYER_MODE_NORMAL); + GIMP_LAYER_MODE_NORMAL_LEGACY); } else { @@ -66,7 +66,7 @@ compute_image (void) width, height, GIMP_RGB_IMAGE, 100.0, - GIMP_LAYER_MODE_NORMAL); + GIMP_LAYER_MODE_NORMAL_LEGACY); } gimp_image_insert_layer (new_image_id, new_layer_id, -1, 0); diff --git a/plug-ins/map-object/map-object-apply.c b/plug-ins/map-object/map-object-apply.c index 1d1c2d7515..3e37d33cd6 100644 --- a/plug-ins/map-object/map-object-apply.c +++ b/plug-ins/map-object/map-object-apply.c @@ -259,7 +259,7 @@ compute_image (void) GIMP_RGBA_IMAGE : GIMP_RGB_IMAGE, 100.0, - GIMP_LAYER_MODE_NORMAL); + GIMP_LAYER_MODE_NORMAL_LEGACY); insert_layer = TRUE; output_drawable = gimp_drawable_get (new_layer_id); diff --git a/plug-ins/pagecurl/pagecurl.c b/plug-ins/pagecurl/pagecurl.c index 475a9603e4..f1484e48ea 100644 --- a/plug-ins/pagecurl/pagecurl.c +++ b/plug-ins/pagecurl/pagecurl.c @@ -721,7 +721,7 @@ do_curl_effect (gint32 drawable_id) true_sel_height, color_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_item_get_parent (drawable_id), diff --git a/plug-ins/pygimp/pygimp-drawable.c b/plug-ins/pygimp/pygimp-drawable.c index 2eea36707e..a31ffa5c06 100644 --- a/plug-ins/pygimp/pygimp-drawable.c +++ b/plug-ins/pygimp/pygimp-drawable.c @@ -1913,7 +1913,7 @@ lay_init(PyGimpLayer *self, PyObject *args, PyObject *kwargs) unsigned int width, height; GimpImageType type = GIMP_RGB_IMAGE; 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__", @@ -2017,7 +2017,7 @@ pygimp_layer_new(gint32 ID) #define GROUPLAYER_DOC "" \ "gimp.GroupLayer(img, name="", opacity=100.0, " \ -"mode=gimp.NORMAL_MODE)\n" \ +"mode=gimp.LAYER_MODE_NORMAL_LEGACY)\n" \ "\n" \ " Creates a new GroupLayer object that has to be \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"; GimpImageType type = GIMP_RGB_IMAGE; 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__", diff --git a/plug-ins/pygimp/pygimp-image.c b/plug-ins/pygimp/pygimp-image.c index 69098ca441..cd4603240a 100644 --- a/plug-ins/pygimp/pygimp-image.c +++ b/plug-ins/pygimp/pygimp-image.c @@ -131,7 +131,7 @@ img_new_layer(PyGimpImage *self, PyObject *args, PyObject *kwargs) gboolean alpha = TRUE; int pos = -1; double opacity = 100.0; - GimpLayerMode mode = GIMP_LAYER_MODE_NORMAL; + GimpLayerMode mode = GIMP_LAYER_MODE_NORMAL_LEGACY; GimpFillType fill_mode = -1; static char *kwlist[] = { "name", "width", "height", "offset_x", "offset_y", diff --git a/plug-ins/screenshot/screenshot-win32.c b/plug-ins/screenshot/screenshot-win32.c index 42381c5ac7..3de55e0989 100644 --- a/plug-ins/screenshot/screenshot-win32.c +++ b/plug-ins/screenshot/screenshot-win32.c @@ -257,7 +257,7 @@ sendBMPToGimp(HBITMAP hBMP, HDC hDC, RECT rect) layer_id = gimp_layer_new (new_image_id, _("Background"), ROUND4 (width), height, layerType, - 100, GIMP_LAYER_MODE_NORMAL); + 100, GIMP_LAYER_MODE_NORMAL_LEGACY); gimp_image_insert_layer (new_image_id, layer_id, -1, 0); /* make rectangle */ diff --git a/plug-ins/screenshot/screenshot-x11.c b/plug-ins/screenshot/screenshot-x11.c index 9b7bc51a00..cd9e0ddf8a 100644 --- a/plug-ins/screenshot/screenshot-x11.c +++ b/plug-ins/screenshot/screenshot-x11.c @@ -465,7 +465,7 @@ add_cursor_image (gint32 image, layer = gimp_layer_new (image, _("Mouse Pointer"), cursor->width, cursor->height, GIMP_RGBA_IMAGE, - 100.0, GIMP_LAYER_MODE_NORMAL); + 100.0, GIMP_LAYER_MODE_NORMAL_LEGACY); buffer = gimp_drawable_get_buffer (layer); diff --git a/tools/pdbgen/enums.pl b/tools/pdbgen/enums.pl index 351c86c8a8..c7ced54653 100644 --- a/tools/pdbgen/enums.pl +++ b/tools/pdbgen/enums.pl @@ -696,7 +696,8 @@ package Gimp::CodeGen::enums; GimpLayerMode => { contig => 1, 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_MULTIPLY_LEGACY GIMP_LAYER_MODE_SCREEN_LEGACY @@ -722,9 +723,9 @@ package Gimp::CodeGen::enums; GIMP_LAYER_MODE_LCH_CHROMA GIMP_LAYER_MODE_LCH_COLOR GIMP_LAYER_MODE_LCH_LIGHTNESS - GIMP_LAYER_MODE_NORMAL_LINEAR - GIMP_LAYER_MODE_BEHIND GIMP_LAYER_MODE_MULTIPLY - GIMP_LAYER_MODE_SCREEN GIMP_LAYER_MODE_DIFFERENCE + GIMP_LAYER_MODE_NORMAL GIMP_LAYER_MODE_BEHIND + GIMP_LAYER_MODE_MULTIPLY GIMP_LAYER_MODE_SCREEN + GIMP_LAYER_MODE_DIFFERENCE GIMP_LAYER_MODE_ADDITION GIMP_LAYER_MODE_SUBTRACT GIMP_LAYER_MODE_DARKEN_ONLY GIMP_LAYER_MODE_LIGHTEN_ONLY @@ -745,7 +746,7 @@ package Gimp::CodeGen::enums; GIMP_LAYER_MODE_LUMA_DARKEN_ONLY GIMP_LAYER_MODE_LUMA_LIGHTEN_ONLY 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_BEHIND_LEGACY => '2', GIMP_LAYER_MODE_MULTIPLY_LEGACY => '3', @@ -773,7 +774,7 @@ package Gimp::CodeGen::enums; GIMP_LAYER_MODE_LCH_CHROMA => '25', GIMP_LAYER_MODE_LCH_COLOR => '26', 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_MULTIPLY => '30', GIMP_LAYER_MODE_SCREEN => '31', diff --git a/tools/pdbgen/pdb/layer.pdb b/tools/pdbgen/pdb/layer.pdb index f1ef39442e..78a1355671 100644 --- a/tools/pdbgen/pdb/layer.pdb +++ b/tools/pdbgen/pdb/layer.pdb @@ -155,7 +155,7 @@ HELP TRUE), name, GIMP_OPACITY_OPAQUE, - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LEGACY, profile); } CODE