diff --git a/app/pdb/gimp-pdb-compat.c b/app/pdb/gimp-pdb-compat.c index f644a70648..5e30764fe7 100644 --- a/app/pdb/gimp-pdb-compat.c +++ b/app/pdb/gimp-pdb-compat.c @@ -362,103 +362,116 @@ gimp_pdb_compat_procs_register (GimpPDB *pdb, } compat_procs[] = { - { "gimp-blend", "gimp-edit-blend" }, - { "gimp-brushes-list", "gimp-brushes-get-list" }, - { "gimp-bucket-fill", "gimp-edit-bucket-fill" }, - { "gimp-channel-delete", "gimp-item-delete" }, - { "gimp-channel-get-name", "gimp-item-get-name" }, - { "gimp-channel-get-tattoo", "gimp-item-get-tattoo" }, - { "gimp-channel-get-visible", "gimp-item-get-visible" }, - { "gimp-channel-set-name", "gimp-item-set-name" }, - { "gimp-channel-set-tattoo", "gimp-item-set-tattoo" }, - { "gimp-channel-set-visible", "gimp-item-set-visible" }, - { "gimp-color-picker", "gimp-image-pick-color" }, - { "gimp-convert-grayscale", "gimp-image-convert-grayscale" }, - { "gimp-convert-indexed", "gimp-image-convert-indexed" }, - { "gimp-convert-rgb", "gimp-image-convert-rgb" }, - { "gimp-crop", "gimp-image-crop" }, - { "gimp-drawable-bytes", "gimp-drawable-bpp" }, - { "gimp-drawable-image", "gimp-drawable-get-image" }, - { "gimp-image-active-drawable", "gimp-image-get-active-drawable" }, - { "gimp-image-floating-selection", "gimp-image-get-floating-sel" }, - { "gimp-layer-delete", "gimp-item-delete" }, - { "gimp-layer-get-linked", "gimp-item-get-linked" }, - { "gimp-layer-get-name", "gimp-item-get-name" }, - { "gimp-layer-get-tattoo", "gimp-item-get-tattoo" }, - { "gimp-layer-get-visible", "gimp-item-get-visible" }, - { "gimp-layer-mask", "gimp-layer-get-mask" }, - { "gimp-layer-set-linked", "gimp-item-set-linked" }, - { "gimp-layer-set-name", "gimp-item-set-name" }, - { "gimp-layer-set-tattoo", "gimp-item-set-tattoo" }, - { "gimp-layer-set-visible", "gimp-item-set-visible" }, - { "gimp-palette-refresh", "gimp-palettes-refresh" }, - { "gimp-patterns-list", "gimp-patterns-get-list" }, - { "gimp-temp-PDB-name", "gimp-procedural-db-temp-name" }, - { "gimp-undo-push-group-end", "gimp-image-undo-group-end" }, - { "gimp-undo-push-group-start", "gimp-image-undo-group-start" }, + { "gimp-blend", "gimp-edit-blend" }, + { "gimp-brushes-list", "gimp-brushes-get-list" }, + { "gimp-bucket-fill", "gimp-edit-bucket-fill" }, + { "gimp-channel-delete", "gimp-item-delete" }, + { "gimp-channel-get-name", "gimp-item-get-name" }, + { "gimp-channel-get-tattoo", "gimp-item-get-tattoo" }, + { "gimp-channel-get-visible", "gimp-item-get-visible" }, + { "gimp-channel-set-name", "gimp-item-set-name" }, + { "gimp-channel-set-tattoo", "gimp-item-set-tattoo" }, + { "gimp-channel-set-visible", "gimp-item-set-visible" }, + { "gimp-color-picker", "gimp-image-pick-color" }, + { "gimp-convert-grayscale", "gimp-image-convert-grayscale" }, + { "gimp-convert-indexed", "gimp-image-convert-indexed" }, + { "gimp-convert-rgb", "gimp-image-convert-rgb" }, + { "gimp-crop", "gimp-image-crop" }, + { "gimp-drawable-bytes", "gimp-drawable-bpp" }, + { "gimp-drawable-image", "gimp-drawable-get-image" }, + { "gimp-image-active-drawable", "gimp-image-get-active-drawable" }, + { "gimp-image-floating-selection", "gimp-image-get-floating-sel" }, + { "gimp-layer-delete", "gimp-item-delete" }, + { "gimp-layer-get-linked", "gimp-item-get-linked" }, + { "gimp-layer-get-name", "gimp-item-get-name" }, + { "gimp-layer-get-tattoo", "gimp-item-get-tattoo" }, + { "gimp-layer-get-visible", "gimp-item-get-visible" }, + { "gimp-layer-mask", "gimp-layer-get-mask" }, + { "gimp-layer-set-linked", "gimp-item-set-linked" }, + { "gimp-layer-set-name", "gimp-item-set-name" }, + { "gimp-layer-set-tattoo", "gimp-item-set-tattoo" }, + { "gimp-layer-set-visible", "gimp-item-set-visible" }, + { "gimp-palette-refresh", "gimp-palettes-refresh" }, + { "gimp-patterns-list", "gimp-patterns-get-list" }, + { "gimp-temp-PDB-name", "gimp-procedural-db-temp-name" }, + { "gimp-undo-push-group-end", "gimp-image-undo-group-end" }, + { "gimp-undo-push-group-start", "gimp-image-undo-group-start" }, /* deprecations since 2.0 */ - { "gimp-brushes-get-opacity", "gimp-context-get-opacity" }, - { "gimp-brushes-get-paint-mode", "gimp-context-get-paint-mode" }, - { "gimp-brushes-set-brush", "gimp-context-set-brush" }, - { "gimp-brushes-set-opacity", "gimp-context-set-opacity" }, - { "gimp-brushes-set-paint-mode", "gimp-context-set-paint-mode" }, - { "gimp-channel-ops-duplicate", "gimp-image-duplicate" }, - { "gimp-channel-ops-offset", "gimp-drawable-offset" }, - { "gimp-gradients-get-active", "gimp-context-get-gradient" }, - { "gimp-gradients-get-gradient", "gimp-context-get-gradient" }, - { "gimp-gradients-set-active", "gimp-context-set-gradient" }, - { "gimp-gradients-set-gradient", "gimp-context-set-gradient" }, - { "gimp-image-get-cmap", "gimp-image-get-colormap" }, - { "gimp-image-set-cmap", "gimp-image-set-colormap" }, - { "gimp-palette-get-background", "gimp-context-get-background" }, - { "gimp-palette-get-foreground", "gimp-context-get-foreground" }, - { "gimp-palette-set-background", "gimp-context-set-background" }, - { "gimp-palette-set-default-colors", "gimp-context-set-default-colors" }, - { "gimp-palette-set-foreground", "gimp-context-set-foreground" }, - { "gimp-palette-swap-colors", "gimp-context-swap-colors" }, - { "gimp-palettes-set-palette", "gimp-context-set-palette" }, - { "gimp-patterns-set-pattern", "gimp-context-set-pattern" }, - { "gimp-selection-clear", "gimp-selection-none" }, + { "gimp-brushes-get-opacity", "gimp-context-get-opacity" }, + { "gimp-brushes-get-paint-mode", "gimp-context-get-paint-mode" }, + { "gimp-brushes-set-brush", "gimp-context-set-brush" }, + { "gimp-brushes-set-opacity", "gimp-context-set-opacity" }, + { "gimp-brushes-set-paint-mode", "gimp-context-set-paint-mode" }, + { "gimp-channel-ops-duplicate", "gimp-image-duplicate" }, + { "gimp-channel-ops-offset", "gimp-drawable-offset" }, + { "gimp-gradients-get-active", "gimp-context-get-gradient" }, + { "gimp-gradients-get-gradient", "gimp-context-get-gradient" }, + { "gimp-gradients-set-active", "gimp-context-set-gradient" }, + { "gimp-gradients-set-gradient", "gimp-context-set-gradient" }, + { "gimp-image-get-cmap", "gimp-image-get-colormap" }, + { "gimp-image-set-cmap", "gimp-image-set-colormap" }, + { "gimp-palette-get-background", "gimp-context-get-background" }, + { "gimp-palette-get-foreground", "gimp-context-get-foreground" }, + { "gimp-palette-set-background", "gimp-context-set-background" }, + { "gimp-palette-set-default-colors", "gimp-context-set-default-colors" }, + { "gimp-palette-set-foreground", "gimp-context-set-foreground" }, + { "gimp-palette-swap-colors", "gimp-context-swap-colors" }, + { "gimp-palettes-set-palette", "gimp-context-set-palette" }, + { "gimp-patterns-set-pattern", "gimp-context-set-pattern" }, + { "gimp-selection-clear", "gimp-selection-none" }, /* deprecations since 2.2 */ - { "gimp-layer-get-preserve-trans", "gimp-layer-get-lock-alpha" }, - { "gimp-layer-set-preserve-trans", "gimp-layer-set-lock-alpha" }, + { "gimp-layer-get-preserve-trans", "gimp-layer-get-lock-alpha" }, + { "gimp-layer-set-preserve-trans", "gimp-layer-set-lock-alpha" }, /* deprecations since 2.6 */ - { "gimp-drawable-is-valid", "gimp-item-is-valid" }, - { "gimp-drawable-is-layer", "gimp-item-is-layer" }, - { "gimp-drawable-is-text-layer", "gimp-item-is-text-layer" }, - { "gimp-drawable-is-layer-mask", "gimp-item-is-layer-mask" }, - { "gimp-drawable-is-channel", "gimp-item-is-channel" }, - { "gimp-drawable-delete", "gimp-item-delete" }, - { "gimp-drawable-get-image", "gimp-item-get-image" }, - { "gimp-drawable-get-name", "gimp-item-get-name" }, - { "gimp-drawable-set-name", "gimp-item-set-name" }, - { "gimp-drawable-get-visible", "gimp-item-get-visible" }, - { "gimp-drawable-set-visible", "gimp-item-set-visible" }, - { "gimp-drawable-get-linked", "gimp-item-get-linked" }, - { "gimp-drawable-set-linked", "gimp-item-set-linked" }, - { "gimp-drawable-get-tattoo", "gimp-item-get-tattoo" }, - { "gimp-drawable-set-tattoo", "gimp-item-set-tattoo" }, - { "gimp-drawable-parasite-find", "gimp-item-find-parasite" }, - { "gimp-drawable-parasite-attach", "gimp-item-attach-parasite" }, - { "gimp-drawable-parasite-detach", "gimp-item-detach-parasite" }, - { "gimp-drawable-parasite-list", "gimp-item-list-parasites" }, - { "gimp-vectors-is-valid", "gimp-item-is-valid" }, - { "gimp-vectors-get-image", "gimp-item-get-image" }, - { "gimp-vectors-get-name", "gimp-item-get-name" }, - { "gimp-vectors-set-name", "gimp-item-set-name" }, - { "gimp-vectors-get-visible", "gimp-item-get-visible" }, - { "gimp-vectors-set-visible", "gimp-item-set-visible" }, - { "gimp-vectors-get-linked", "gimp-item-get-linked" }, - { "gimp-vectors-set-linked", "gimp-item-set-linked" }, - { "gimp-vectors-get-tattoo", "gimp-item-get-tattoo" }, - { "gimp-vectors-set-tattoo", "gimp-item-set-tattoo" }, - { "gimp-vectors-parasite-find", "gimp-item-find-parasite" }, - { "gimp-vectors-parasite-attach", "gimp-item-attach-parasite" }, - { "gimp-vectors-parasite-detach", "gimp-item-detach-parasite" }, - { "gimp-vectors-parasite-list", "gimp-item-list-parasites" } + { "gimp-drawable-is-valid", "gimp-item-is-valid" }, + { "gimp-drawable-is-layer", "gimp-item-is-layer" }, + { "gimp-drawable-is-text-layer", "gimp-item-is-text-layer" }, + { "gimp-drawable-is-layer-mask", "gimp-item-is-layer-mask" }, + { "gimp-drawable-is-channel", "gimp-item-is-channel" }, + { "gimp-drawable-delete", "gimp-item-delete" }, + { "gimp-drawable-get-image", "gimp-item-get-image" }, + { "gimp-drawable-get-name", "gimp-item-get-name" }, + { "gimp-drawable-set-name", "gimp-item-set-name" }, + { "gimp-drawable-get-visible", "gimp-item-get-visible" }, + { "gimp-drawable-set-visible", "gimp-item-set-visible" }, + { "gimp-drawable-get-linked", "gimp-item-get-linked" }, + { "gimp-drawable-set-linked", "gimp-item-set-linked" }, + { "gimp-drawable-get-tattoo", "gimp-item-get-tattoo" }, + { "gimp-drawable-set-tattoo", "gimp-item-set-tattoo" }, + { "gimp-drawable-parasite-find", "gimp-item-find-parasite" }, + { "gimp-drawable-parasite-attach", "gimp-item-attach-parasite" }, + { "gimp-drawable-parasite-detach", "gimp-item-detach-parasite" }, + { "gimp-drawable-parasite-list", "gimp-item-list-parasites" }, + { "gimp-image-get-layer-position", "gimp-image-get-item-position" }, + { "gimp-image-raise-layer", "gimp-image-raise-item" }, + { "gimp-image-lower-layer", "gimp-image-lower-item" }, + { "gimp-image-raise-layer-to-top", "gimp-image-raise-item-to-top" }, + { "gimp-image-lower-layer-to-bottom", "gimp-image-lower-item-to-bottom" }, + { "gimp-image-get-channel-position", "gimp-image-get-item-position" }, + { "gimp-image-raise-channel", "gimp-image-raise-item" }, + { "gimp-image-lower-channel", "gimp-image-lower-item" }, + { "gimp-image-get-vectors-position", "gimp-image-get-item-position" }, + { "gimp-image-raise-vectors", "gimp-image-raise-item" }, + { "gimp-image-lower-vectors", "gimp-image-lower-item" }, + { "gimp-image-raise-vectors-to-top", "gimp-image-raise-item-to-top" }, + { "gimp-image-lower-vectors-to-bottom", "gimp-image-lower-item-to-bottom" }, + { "gimp-vectors-is-valid", "gimp-item-is-valid" }, + { "gimp-vectors-get-image", "gimp-item-get-image" }, + { "gimp-vectors-get-name", "gimp-item-get-name" }, + { "gimp-vectors-set-name", "gimp-item-set-name" }, + { "gimp-vectors-get-visible", "gimp-item-get-visible" }, + { "gimp-vectors-set-visible", "gimp-item-set-visible" }, + { "gimp-vectors-get-linked", "gimp-item-get-linked" }, + { "gimp-vectors-set-linked", "gimp-item-set-linked" }, + { "gimp-vectors-get-tattoo", "gimp-item-get-tattoo" }, + { "gimp-vectors-set-tattoo", "gimp-item-set-tattoo" }, + { "gimp-vectors-parasite-find", "gimp-item-find-parasite" }, + { "gimp-vectors-parasite-attach", "gimp-item-attach-parasite" }, + { "gimp-vectors-parasite-detach", "gimp-item-detach-parasite" }, + { "gimp-vectors-parasite-list", "gimp-item-list-parasites" } }; g_return_if_fail (GIMP_IS_PDB (pdb)); diff --git a/app/pdb/image-cmds.c b/app/pdb/image-cmds.c index 14c295516b..120a6f2361 100644 --- a/app/pdb/image-cmds.c +++ b/app/pdb/image-cmds.c @@ -1389,384 +1389,6 @@ image_reorder_item_invoker (GimpProcedure *procedure, error ? *error : NULL); } -static GValueArray * -image_get_layer_position_invoker (GimpProcedure *procedure, - Gimp *gimp, - GimpContext *context, - GimpProgress *progress, - const GValueArray *args, - GError **error) -{ - gboolean success = TRUE; - GValueArray *return_vals; - GimpImage *image; - GimpLayer *layer; - gint32 position = 0; - - image = gimp_value_get_image (&args->values[0], gimp); - layer = gimp_value_get_layer (&args->values[1], gimp); - - if (success) - { - GimpContainer *container = gimp_image_get_layers (image); - - position = gimp_container_get_child_index (container, - GIMP_OBJECT (layer)); - if (position < 0) - success = FALSE; - } - - return_vals = gimp_procedure_get_return_values (procedure, success, - error ? *error : NULL); - - if (success) - g_value_set_int (&return_vals->values[1], position); - - return return_vals; -} - -static GValueArray * -image_raise_layer_invoker (GimpProcedure *procedure, - Gimp *gimp, - GimpContext *context, - GimpProgress *progress, - const GValueArray *args, - GError **error) -{ - gboolean success = TRUE; - GimpImage *image; - GimpLayer *layer; - - image = gimp_value_get_image (&args->values[0], gimp); - layer = gimp_value_get_layer (&args->values[1], gimp); - - if (success) - { - if (gimp_pdb_item_is_attached (GIMP_ITEM (layer), image, FALSE, error)) - success = gimp_image_raise_item (image, GIMP_ITEM (layer), error); - else - success = FALSE; - } - - return gimp_procedure_get_return_values (procedure, success, - error ? *error : NULL); -} - -static GValueArray * -image_lower_layer_invoker (GimpProcedure *procedure, - Gimp *gimp, - GimpContext *context, - GimpProgress *progress, - const GValueArray *args, - GError **error) -{ - gboolean success = TRUE; - GimpImage *image; - GimpLayer *layer; - - image = gimp_value_get_image (&args->values[0], gimp); - layer = gimp_value_get_layer (&args->values[1], gimp); - - if (success) - { - if (gimp_pdb_item_is_attached (GIMP_ITEM (layer), image, FALSE, error)) - success = gimp_image_lower_item (image, GIMP_ITEM (layer), error); - else - success = FALSE; - } - - return gimp_procedure_get_return_values (procedure, success, - error ? *error : NULL); -} - -static GValueArray * -image_raise_layer_to_top_invoker (GimpProcedure *procedure, - Gimp *gimp, - GimpContext *context, - GimpProgress *progress, - const GValueArray *args, - GError **error) -{ - gboolean success = TRUE; - GimpImage *image; - GimpLayer *layer; - - image = gimp_value_get_image (&args->values[0], gimp); - layer = gimp_value_get_layer (&args->values[1], gimp); - - if (success) - { - if (gimp_pdb_item_is_attached (GIMP_ITEM (layer), image, FALSE, error)) - success = gimp_image_raise_item_to_top (image, GIMP_ITEM (layer)); - else - success = FALSE; - } - - return gimp_procedure_get_return_values (procedure, success, - error ? *error : NULL); -} - -static GValueArray * -image_lower_layer_to_bottom_invoker (GimpProcedure *procedure, - Gimp *gimp, - GimpContext *context, - GimpProgress *progress, - const GValueArray *args, - GError **error) -{ - gboolean success = TRUE; - GimpImage *image; - GimpLayer *layer; - - image = gimp_value_get_image (&args->values[0], gimp); - layer = gimp_value_get_layer (&args->values[1], gimp); - - if (success) - { - if (gimp_pdb_item_is_attached (GIMP_ITEM (layer), image, FALSE, error)) - success = gimp_image_lower_item_to_bottom (image, GIMP_ITEM (layer)); - else - success = FALSE; - } - - return gimp_procedure_get_return_values (procedure, success, - error ? *error : NULL); -} - -static GValueArray * -image_get_channel_position_invoker (GimpProcedure *procedure, - Gimp *gimp, - GimpContext *context, - GimpProgress *progress, - const GValueArray *args, - GError **error) -{ - gboolean success = TRUE; - GValueArray *return_vals; - GimpImage *image; - GimpChannel *channel; - gint32 position = 0; - - image = gimp_value_get_image (&args->values[0], gimp); - channel = gimp_value_get_channel (&args->values[1], gimp); - - if (success) - { - GimpContainer *container = gimp_image_get_channels (image); - - position = gimp_container_get_child_index (container, - GIMP_OBJECT (channel)); - if (position < 0) - success = FALSE; - } - - return_vals = gimp_procedure_get_return_values (procedure, success, - error ? *error : NULL); - - if (success) - g_value_set_int (&return_vals->values[1], position); - - return return_vals; -} - -static GValueArray * -image_raise_channel_invoker (GimpProcedure *procedure, - Gimp *gimp, - GimpContext *context, - GimpProgress *progress, - const GValueArray *args, - GError **error) -{ - gboolean success = TRUE; - GimpImage *image; - GimpChannel *channel; - - image = gimp_value_get_image (&args->values[0], gimp); - channel = gimp_value_get_channel (&args->values[1], gimp); - - if (success) - { - if (gimp_pdb_item_is_attached (GIMP_ITEM (channel), image, FALSE, error)) - success = gimp_image_raise_item (image, GIMP_ITEM (channel), error); - else - success = FALSE; - } - - return gimp_procedure_get_return_values (procedure, success, - error ? *error : NULL); -} - -static GValueArray * -image_lower_channel_invoker (GimpProcedure *procedure, - Gimp *gimp, - GimpContext *context, - GimpProgress *progress, - const GValueArray *args, - GError **error) -{ - gboolean success = TRUE; - GimpImage *image; - GimpChannel *channel; - - image = gimp_value_get_image (&args->values[0], gimp); - channel = gimp_value_get_channel (&args->values[1], gimp); - - if (success) - { - if (gimp_pdb_item_is_attached (GIMP_ITEM (channel), image, FALSE, error)) - success = gimp_image_lower_item (image, GIMP_ITEM (channel), error); - else - success = FALSE; - } - - return gimp_procedure_get_return_values (procedure, success, - error ? *error : NULL); -} - -static GValueArray * -image_get_vectors_position_invoker (GimpProcedure *procedure, - Gimp *gimp, - GimpContext *context, - GimpProgress *progress, - const GValueArray *args, - GError **error) -{ - gboolean success = TRUE; - GValueArray *return_vals; - GimpImage *image; - GimpVectors *vectors; - gint32 position = 0; - - image = gimp_value_get_image (&args->values[0], gimp); - vectors = gimp_value_get_vectors (&args->values[1], gimp); - - if (success) - { - GimpContainer *container = gimp_image_get_vectors (image); - - position = gimp_container_get_child_index (container, - GIMP_OBJECT (vectors)); - if (position < 0) - success = FALSE; - } - - return_vals = gimp_procedure_get_return_values (procedure, success, - error ? *error : NULL); - - if (success) - g_value_set_int (&return_vals->values[1], position); - - return return_vals; -} - -static GValueArray * -image_raise_vectors_invoker (GimpProcedure *procedure, - Gimp *gimp, - GimpContext *context, - GimpProgress *progress, - const GValueArray *args, - GError **error) -{ - gboolean success = TRUE; - GimpImage *image; - GimpVectors *vectors; - - image = gimp_value_get_image (&args->values[0], gimp); - vectors = gimp_value_get_vectors (&args->values[1], gimp); - - if (success) - { - if (gimp_pdb_item_is_attached (GIMP_ITEM (vectors), image, FALSE, error)) - success = gimp_image_raise_item (image, GIMP_ITEM (vectors), error); - else - success = FALSE; - } - - return gimp_procedure_get_return_values (procedure, success, - error ? *error : NULL); -} - -static GValueArray * -image_lower_vectors_invoker (GimpProcedure *procedure, - Gimp *gimp, - GimpContext *context, - GimpProgress *progress, - const GValueArray *args, - GError **error) -{ - gboolean success = TRUE; - GimpImage *image; - GimpVectors *vectors; - - image = gimp_value_get_image (&args->values[0], gimp); - vectors = gimp_value_get_vectors (&args->values[1], gimp); - - if (success) - { - if (gimp_pdb_item_is_attached (GIMP_ITEM (vectors), image, FALSE, error)) - success = gimp_image_lower_item (image, GIMP_ITEM (vectors), error); - else - success = FALSE; - } - - return gimp_procedure_get_return_values (procedure, success, - error ? *error : NULL); -} - -static GValueArray * -image_raise_vectors_to_top_invoker (GimpProcedure *procedure, - Gimp *gimp, - GimpContext *context, - GimpProgress *progress, - const GValueArray *args, - GError **error) -{ - gboolean success = TRUE; - GimpImage *image; - GimpVectors *vectors; - - image = gimp_value_get_image (&args->values[0], gimp); - vectors = gimp_value_get_vectors (&args->values[1], gimp); - - if (success) - { - if (gimp_pdb_item_is_attached (GIMP_ITEM (vectors), image, FALSE, error)) - success = gimp_image_raise_item_to_top (image, GIMP_ITEM (vectors)); - else - success = FALSE; - } - - return gimp_procedure_get_return_values (procedure, success, - error ? *error : NULL); -} - -static GValueArray * -image_lower_vectors_to_bottom_invoker (GimpProcedure *procedure, - Gimp *gimp, - GimpContext *context, - GimpProgress *progress, - const GValueArray *args, - GError **error) -{ - gboolean success = TRUE; - GimpImage *image; - GimpVectors *vectors; - - image = gimp_value_get_image (&args->values[0], gimp); - vectors = gimp_value_get_vectors (&args->values[1], gimp); - - if (success) - { - if (gimp_pdb_item_is_attached (GIMP_ITEM (vectors), image, FALSE, error)) - success = gimp_image_lower_item_to_bottom (image, GIMP_ITEM (vectors)); - else - success = FALSE; - } - - return gimp_procedure_get_return_values (procedure, success, - error ? *error : NULL); -} - static GValueArray * image_flatten_invoker (GimpProcedure *procedure, Gimp *gimp, @@ -4209,401 +3831,6 @@ register_image_procs (GimpPDB *pdb) gimp_pdb_register_procedure (pdb, procedure); g_object_unref (procedure); - /* - * gimp-image-get-layer-position - */ - procedure = gimp_procedure_new (image_get_layer_position_invoker); - gimp_object_set_static_name (GIMP_OBJECT (procedure), - "gimp-image-get-layer-position"); - gimp_procedure_set_static_strings (procedure, - "gimp-image-get-layer-position", - "Deprecated: Use 'gimp-image-get-item-position' instead.", - "Deprecated: Use 'gimp-image-get-item-position' instead.", - "Simon Budig", - "Simon Budig", - "2006", - "gimp-image-get-item-position"); - gimp_procedure_add_argument (procedure, - gimp_param_spec_image_id ("image", - "image", - "The image", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_procedure_add_argument (procedure, - gimp_param_spec_layer_id ("layer", - "layer", - "The layer", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_procedure_add_return_value (procedure, - gimp_param_spec_int32 ("position", - "position", - "The position of the layer in the layer stack", - G_MININT32, G_MAXINT32, 0, - GIMP_PARAM_READWRITE)); - gimp_pdb_register_procedure (pdb, procedure); - g_object_unref (procedure); - - /* - * gimp-image-raise-layer - */ - procedure = gimp_procedure_new (image_raise_layer_invoker); - gimp_object_set_static_name (GIMP_OBJECT (procedure), - "gimp-image-raise-layer"); - gimp_procedure_set_static_strings (procedure, - "gimp-image-raise-layer", - "Deprecated: Use 'gimp-image-raise-item' instead.", - "Deprecated: Use 'gimp-image-raise-item' instead.", - "", - "", - "", - "gimp-image-raise-item"); - gimp_procedure_add_argument (procedure, - gimp_param_spec_image_id ("image", - "image", - "The image", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_procedure_add_argument (procedure, - gimp_param_spec_layer_id ("layer", - "layer", - "The layer to raise", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_pdb_register_procedure (pdb, procedure); - g_object_unref (procedure); - - /* - * gimp-image-lower-layer - */ - procedure = gimp_procedure_new (image_lower_layer_invoker); - gimp_object_set_static_name (GIMP_OBJECT (procedure), - "gimp-image-lower-layer"); - gimp_procedure_set_static_strings (procedure, - "gimp-image-lower-layer", - "Deprecated: Use 'gimp-image-lower-item' instead.", - "Deprecated: Use 'gimp-image-lower-item' instead.", - "", - "", - "", - "gimp-image-lower-item"); - gimp_procedure_add_argument (procedure, - gimp_param_spec_image_id ("image", - "image", - "The image", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_procedure_add_argument (procedure, - gimp_param_spec_layer_id ("layer", - "layer", - "The layer to lower", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_pdb_register_procedure (pdb, procedure); - g_object_unref (procedure); - - /* - * gimp-image-raise-layer-to-top - */ - procedure = gimp_procedure_new (image_raise_layer_to_top_invoker); - gimp_object_set_static_name (GIMP_OBJECT (procedure), - "gimp-image-raise-layer-to-top"); - gimp_procedure_set_static_strings (procedure, - "gimp-image-raise-layer-to-top", - "Deprecated: Use 'gimp-image-raise-item-to-top' instead.", - "Deprecated: Use 'gimp-image-raise-item-to-top' instead.", - "", - "", - "", - "gimp-image-raise-item-to-top"); - gimp_procedure_add_argument (procedure, - gimp_param_spec_image_id ("image", - "image", - "The image", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_procedure_add_argument (procedure, - gimp_param_spec_layer_id ("layer", - "layer", - "The layer to raise to top", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_pdb_register_procedure (pdb, procedure); - g_object_unref (procedure); - - /* - * gimp-image-lower-layer-to-bottom - */ - procedure = gimp_procedure_new (image_lower_layer_to_bottom_invoker); - gimp_object_set_static_name (GIMP_OBJECT (procedure), - "gimp-image-lower-layer-to-bottom"); - gimp_procedure_set_static_strings (procedure, - "gimp-image-lower-layer-to-bottom", - "Deprecated: Use 'gimp-image-lower-item-to-bottom' instead.", - "Deprecated: Use 'gimp-image-lower-item-to-bottom' instead.", - "", - "", - "", - "gimp-image-lower-item-to-bottom"); - gimp_procedure_add_argument (procedure, - gimp_param_spec_image_id ("image", - "image", - "The image", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_procedure_add_argument (procedure, - gimp_param_spec_layer_id ("layer", - "layer", - "The layer to lower to bottom", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_pdb_register_procedure (pdb, procedure); - g_object_unref (procedure); - - /* - * gimp-image-get-channel-position - */ - procedure = gimp_procedure_new (image_get_channel_position_invoker); - gimp_object_set_static_name (GIMP_OBJECT (procedure), - "gimp-image-get-channel-position"); - gimp_procedure_set_static_strings (procedure, - "gimp-image-get-channel-position", - "Deprecated: Use 'gimp-image-get-item-position' instead.", - "Deprecated: Use 'gimp-image-get-item-position' instead.", - "Simon Budig", - "Simon Budig", - "2006", - "gimp-image-get-item-position"); - gimp_procedure_add_argument (procedure, - gimp_param_spec_image_id ("image", - "image", - "The image", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_procedure_add_argument (procedure, - gimp_param_spec_channel_id ("channel", - "channel", - "The channel", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_procedure_add_return_value (procedure, - gimp_param_spec_int32 ("position", - "position", - "The position of the channel in the channel stack", - G_MININT32, G_MAXINT32, 0, - GIMP_PARAM_READWRITE)); - gimp_pdb_register_procedure (pdb, procedure); - g_object_unref (procedure); - - /* - * gimp-image-raise-channel - */ - procedure = gimp_procedure_new (image_raise_channel_invoker); - gimp_object_set_static_name (GIMP_OBJECT (procedure), - "gimp-image-raise-channel"); - gimp_procedure_set_static_strings (procedure, - "gimp-image-raise-channel", - "Deprecated: Use 'gimp-image-raise-item' instead.", - "Deprecated: Use 'gimp-image-raise-item' instead.", - "", - "", - "", - "gimp-image-raise-item"); - gimp_procedure_add_argument (procedure, - gimp_param_spec_image_id ("image", - "image", - "The image", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_procedure_add_argument (procedure, - gimp_param_spec_channel_id ("channel", - "channel", - "The channel to raise", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_pdb_register_procedure (pdb, procedure); - g_object_unref (procedure); - - /* - * gimp-image-lower-channel - */ - procedure = gimp_procedure_new (image_lower_channel_invoker); - gimp_object_set_static_name (GIMP_OBJECT (procedure), - "gimp-image-lower-channel"); - gimp_procedure_set_static_strings (procedure, - "gimp-image-lower-channel", - "Deprecated: Use 'gimp-image-lower-item' instead.", - "Deprecated: Use 'gimp-image-lower-item' instead.", - "", - "", - "", - "gimp-image-lower-item"); - gimp_procedure_add_argument (procedure, - gimp_param_spec_image_id ("image", - "image", - "The image", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_procedure_add_argument (procedure, - gimp_param_spec_channel_id ("channel", - "channel", - "The channel to lower", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_pdb_register_procedure (pdb, procedure); - g_object_unref (procedure); - - /* - * gimp-image-get-vectors-position - */ - procedure = gimp_procedure_new (image_get_vectors_position_invoker); - gimp_object_set_static_name (GIMP_OBJECT (procedure), - "gimp-image-get-vectors-position"); - gimp_procedure_set_static_strings (procedure, - "gimp-image-get-vectors-position", - "Deprecated: Use 'gimp-image-get-item-position' instead.", - "Deprecated: Use 'gimp-image-get-item-position' instead.", - "Simon Budig", - "Simon Budig", - "2006", - "gimp-image-get-item-position"); - gimp_procedure_add_argument (procedure, - gimp_param_spec_image_id ("image", - "image", - "The image", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_procedure_add_argument (procedure, - gimp_param_spec_vectors_id ("vectors", - "vectors", - "The vectors object", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_procedure_add_return_value (procedure, - gimp_param_spec_int32 ("position", - "position", - "The position of the vectors object in the vectors stack", - G_MININT32, G_MAXINT32, 0, - GIMP_PARAM_READWRITE)); - gimp_pdb_register_procedure (pdb, procedure); - g_object_unref (procedure); - - /* - * gimp-image-raise-vectors - */ - procedure = gimp_procedure_new (image_raise_vectors_invoker); - gimp_object_set_static_name (GIMP_OBJECT (procedure), - "gimp-image-raise-vectors"); - gimp_procedure_set_static_strings (procedure, - "gimp-image-raise-vectors", - "Deprecated: Use 'gimp-image-raise-item' instead.", - "Deprecated: Use 'gimp-image-raise-item' instead.", - "Simon Budig", - "Simon Budig", - "2005", - "gimp-image-raise-item"); - gimp_procedure_add_argument (procedure, - gimp_param_spec_image_id ("image", - "image", - "The image", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_procedure_add_argument (procedure, - gimp_param_spec_vectors_id ("vectors", - "vectors", - "The vectors object to raise", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_pdb_register_procedure (pdb, procedure); - g_object_unref (procedure); - - /* - * gimp-image-lower-vectors - */ - procedure = gimp_procedure_new (image_lower_vectors_invoker); - gimp_object_set_static_name (GIMP_OBJECT (procedure), - "gimp-image-lower-vectors"); - gimp_procedure_set_static_strings (procedure, - "gimp-image-lower-vectors", - "Deprecated: Use 'gimp-image-lower-item' instead.", - "Deprecated: Use 'gimp-image-lower-item' instead.", - "Simon Budig", - "Simon Budig", - "2005", - "gimp-image-lower-item"); - gimp_procedure_add_argument (procedure, - gimp_param_spec_image_id ("image", - "image", - "The image", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_procedure_add_argument (procedure, - gimp_param_spec_vectors_id ("vectors", - "vectors", - "The vectors object to lower", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_pdb_register_procedure (pdb, procedure); - g_object_unref (procedure); - - /* - * gimp-image-raise-vectors-to-top - */ - procedure = gimp_procedure_new (image_raise_vectors_to_top_invoker); - gimp_object_set_static_name (GIMP_OBJECT (procedure), - "gimp-image-raise-vectors-to-top"); - gimp_procedure_set_static_strings (procedure, - "gimp-image-raise-vectors-to-top", - "Deprecated: Use 'gimp-image-raise-item-to-top' instead.", - "Deprecated: Use 'gimp-image-raise-item-to-top' instead.", - "Simon Budig", - "Simon Budig", - "2005", - "gimp-image-raise-item-to-top"); - gimp_procedure_add_argument (procedure, - gimp_param_spec_image_id ("image", - "image", - "The image", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_procedure_add_argument (procedure, - gimp_param_spec_vectors_id ("vectors", - "vectors", - "The vectors object to raise to top", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_pdb_register_procedure (pdb, procedure); - g_object_unref (procedure); - - /* - * gimp-image-lower-vectors-to-bottom - */ - procedure = gimp_procedure_new (image_lower_vectors_to_bottom_invoker); - gimp_object_set_static_name (GIMP_OBJECT (procedure), - "gimp-image-lower-vectors-to-bottom"); - gimp_procedure_set_static_strings (procedure, - "gimp-image-lower-vectors-to-bottom", - "Deprecated: Use 'gimp-image-lower-item-to-bottom' instead.", - "Deprecated: Use 'gimp-image-lower-item-to-bottom' instead.", - "Simon Budig", - "Simon Budig", - "2005", - "gimp-image-lower-item-to-bottom"); - gimp_procedure_add_argument (procedure, - gimp_param_spec_image_id ("image", - "image", - "The image", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_procedure_add_argument (procedure, - gimp_param_spec_vectors_id ("vectors", - "vectors", - "The vectors object to lower to bottom", - pdb->gimp, FALSE, - GIMP_PARAM_READWRITE)); - gimp_pdb_register_procedure (pdb, procedure); - g_object_unref (procedure); - /* * gimp-image-flatten */ diff --git a/app/pdb/internal-procs.c b/app/pdb/internal-procs.c index 466694e478..2409ded19a 100644 --- a/app/pdb/internal-procs.c +++ b/app/pdb/internal-procs.c @@ -28,7 +28,7 @@ #include "internal-procs.h" -/* 642 procedures registered total */ +/* 629 procedures registered total */ void internal_procs_init (GimpPDB *pdb) diff --git a/libgimp/gimpimage.c b/libgimp/gimpimage.c index af639b535a..870c4c0fd5 100644 --- a/libgimp/gimpimage.c +++ b/libgimp/gimpimage.c @@ -136,6 +136,228 @@ gimp_image_set_cmap (gint32 image_ID, return gimp_image_set_colormap (image_ID, cmap, num_colors); } +/** + * gimp_image_get_layer_position: + * @image_ID: The image. + * @layer_ID: The layer. + * + * Deprecated: Use gimp_image_get_item_position() instead. + * + * Returns: The position of the layer in the layer stack. + * + * Since: GIMP 2.4 + **/ +gint +gimp_image_get_layer_position (gint32 image_ID, + gint32 layer_ID) +{ + return gimp_image_get_item_position (image_ID, layer_ID); +} + +/** + * gimp_image_raise_layer: + * @image_ID: The image. + * @layer_ID: The layer to raise. + * + * Deprecated: Use gimp_image_raise_item() instead. + * + * Returns: TRUE on success. + **/ +gboolean +gimp_image_raise_layer (gint32 image_ID, + gint32 layer_ID) +{ + return gimp_image_raise_item (image_ID, layer_ID); +} + +/** + * gimp_image_lower_layer: + * @image_ID: The image. + * @layer_ID: The layer to lower. + * + * Deprecated: Use gimp_image_lower_item() instead. + * + * Returns: TRUE on success. + **/ +gboolean +gimp_image_lower_layer (gint32 image_ID, + gint32 layer_ID) +{ + return gimp_image_lower_item (image_ID, layer_ID); +} + +/** + * gimp_image_raise_layer_to_top: + * @image_ID: The image. + * @layer_ID: The layer to raise to top. + * + * Deprecated: Use gimp_image_raise_item_to_top() instead. + * + * Returns: TRUE on success. + **/ +gboolean +gimp_image_raise_layer_to_top (gint32 image_ID, + gint32 layer_ID) +{ + return gimp_image_raise_item_to_top (image_ID, layer_ID); +} + +/** + * gimp_image_lower_layer_to_bottom: + * @image_ID: The image. + * @layer_ID: The layer to lower to bottom. + * + * Deprecated: Use gimp_image_lower_item_to_bottom() instead. + * + * Returns: TRUE on success. + **/ +gboolean +gimp_image_lower_layer_to_bottom (gint32 image_ID, + gint32 layer_ID) +{ + return gimp_image_lower_item_to_bottom (image_ID, layer_ID); +} + +/** + * gimp_image_get_channel_position: + * @image_ID: The image. + * @channel_ID: The channel. + * + * Deprecated: Use gimp_image_get_item_position() instead. + * + * Returns: The position of the channel in the channel stack. + * + * Since: GIMP 2.4 + **/ +gint +gimp_image_get_channel_position (gint32 image_ID, + gint32 channel_ID) +{ + return gimp_image_get_item_position (image_ID, channel_ID); +} + +/** + * gimp_image_raise_channel: + * @image_ID: The image. + * @channel_ID: The channel to raise. + * + * Deprecated: Use gimp_image_raise_item() instead. + * + * Returns: TRUE on success. + **/ +gboolean +gimp_image_raise_channel (gint32 image_ID, + gint32 channel_ID) +{ + return gimp_image_raise_item (image_ID, channel_ID); +} + +/** + * gimp_image_lower_channel: + * @image_ID: The image. + * @channel_ID: The channel to lower. + * + * Deprecated: Use gimp_image_lower_item() instead. + * + * Returns: TRUE on success. + **/ +gboolean +gimp_image_lower_channel (gint32 image_ID, + gint32 channel_ID) +{ + return gimp_image_lower_item (image_ID, channel_ID); +} + +/** + * gimp_image_get_vectors_position: + * @image_ID: The image. + * @vectors_ID: The vectors object. + * + * Deprecated: Use gimp_image_get_item_position() instead. + * + * Returns: The position of the vectors object in the vectors stack. + * + * Since: GIMP 2.4 + **/ +gint +gimp_image_get_vectors_position (gint32 image_ID, + gint32 vectors_ID) +{ + return gimp_image_get_item_position (image_ID, vectors_ID); +} + +/** + * gimp_image_raise_vectors: + * @image_ID: The image. + * @vectors_ID: The vectors object to raise. + * + * Deprecated: Use gimp_image_raise_item() instead. + * + * Returns: TRUE on success. + * + * Since: GIMP 2.4 + **/ +gboolean +gimp_image_raise_vectors (gint32 image_ID, + gint32 vectors_ID) +{ + return gimp_image_raise_item (image_ID, vectors_ID); +} + +/** + * gimp_image_lower_vectors: + * @image_ID: The image. + * @vectors_ID: The vectors object to lower. + * + * Deprecated: Use gimp_image_lower_item() instead. + * + * Returns: TRUE on success. + * + * Since: GIMP 2.4 + **/ +gboolean +gimp_image_lower_vectors (gint32 image_ID, + gint32 vectors_ID) +{ + return gimp_image_lower_item (image_ID, vectors_ID); +} + +/** + * gimp_image_raise_vectors_to_top: + * @image_ID: The image. + * @vectors_ID: The vectors object to raise to top. + * + * Deprecated: Use gimp_image_raise_item_to_top() instead. + * + * Returns: TRUE on success. + * + * Since: GIMP 2.4 + **/ +gboolean +gimp_image_raise_vectors_to_top (gint32 image_ID, + gint32 vectors_ID) +{ + return gimp_image_raise_item_to_top (image_ID, vectors_ID); +} + +/** + * gimp_image_lower_vectors_to_bottom: + * @image_ID: The image. + * @vectors_ID: The vectors object to lower to bottom. + * + * Deprecated: Use gimp_image_lower_item_to_bottom() instead. + * + * Returns: TRUE on success. + * + * Since: GIMP 2.4 + **/ +gboolean +gimp_image_lower_vectors_to_bottom (gint32 image_ID, + gint32 vectors_ID) +{ + return gimp_image_lower_item_to_bottom (image_ID, vectors_ID); +} + /** * gimp_image_attach_new_parasite: * @image_ID: the ID of the image to attach the #GimpParasite to. diff --git a/libgimp/gimpimage.h b/libgimp/gimpimage.h index 1aca262354..12f0792e8f 100644 --- a/libgimp/gimpimage.h +++ b/libgimp/gimpimage.h @@ -26,28 +26,54 @@ G_BEGIN_DECLS /* For information look into the C source or the html documentation */ -guchar * gimp_image_get_colormap (gint32 image_ID, - gint *num_colors); -gboolean gimp_image_set_colormap (gint32 image_ID, - const guchar *colormap, - gint num_colors); +guchar * gimp_image_get_colormap (gint32 image_ID, + gint *num_colors); +gboolean gimp_image_set_colormap (gint32 image_ID, + const guchar *colormap, + gint num_colors); -guchar * gimp_image_get_thumbnail_data (gint32 image_ID, - gint *width, - gint *height, - gint *bpp); +guchar * gimp_image_get_thumbnail_data (gint32 image_ID, + gint *width, + gint *height, + gint *bpp); #ifndef GIMP_DISABLE_DEPRECATED -guchar * gimp_image_get_cmap (gint32 image_ID, - gint *num_colors); -gboolean gimp_image_set_cmap (gint32 image_ID, - const guchar *cmap, - gint num_colors); -gboolean gimp_image_attach_new_parasite (gint32 image_ID, - const gchar *name, - gint flags, - gint size, - gconstpointer data); +guchar * gimp_image_get_cmap (gint32 image_ID, + gint *num_colors); +gboolean gimp_image_set_cmap (gint32 image_ID, + const guchar *cmap, + gint num_colors); +gint gimp_image_get_layer_position (gint32 image_ID, + gint32 layer_ID); +gboolean gimp_image_raise_layer (gint32 image_ID, + gint32 layer_ID); +gboolean gimp_image_lower_layer (gint32 image_ID, + gint32 layer_ID); +gboolean gimp_image_raise_layer_to_top (gint32 image_ID, + gint32 layer_ID); +gboolean gimp_image_lower_layer_to_bottom (gint32 image_ID, + gint32 layer_ID); +gint gimp_image_get_channel_position (gint32 image_ID, + gint32 channel_ID); +gboolean gimp_image_raise_channel (gint32 image_ID, + gint32 channel_ID); +gboolean gimp_image_lower_channel (gint32 image_ID, + gint32 channel_ID); +gint gimp_image_get_vectors_position (gint32 image_ID, + gint32 vectors_ID); +gboolean gimp_image_raise_vectors (gint32 image_ID, + gint32 vectors_ID); +gboolean gimp_image_lower_vectors (gint32 image_ID, + gint32 vectors_ID); +gboolean gimp_image_raise_vectors_to_top (gint32 image_ID, + gint32 vectors_ID); +gboolean gimp_image_lower_vectors_to_bottom (gint32 image_ID, + gint32 vectors_ID); +gboolean gimp_image_attach_new_parasite (gint32 image_ID, + const gchar *name, + gint flags, + gint size, + gconstpointer data); #endif /* GIMP_DISABLE_DEPRECATED */ diff --git a/libgimp/gimpimage_pdb.c b/libgimp/gimpimage_pdb.c index 7f0f94ee5a..67ea72dfa5 100644 --- a/libgimp/gimpimage_pdb.c +++ b/libgimp/gimpimage_pdb.c @@ -1517,413 +1517,6 @@ gimp_image_reorder_item (gint32 image_ID, return success; } -/** - * gimp_image_get_layer_position: - * @image_ID: The image. - * @layer_ID: The layer. - * - * Deprecated: Use gimp_image_get_item_position() instead. - * - * Returns: The position of the layer in the layer stack. - * - * Since: GIMP 2.4 - **/ -gint -gimp_image_get_layer_position (gint32 image_ID, - gint32 layer_ID) -{ - GimpParam *return_vals; - gint nreturn_vals; - gint position = 0; - - return_vals = gimp_run_procedure ("gimp-image-get-layer-position", - &nreturn_vals, - GIMP_PDB_IMAGE, image_ID, - GIMP_PDB_LAYER, layer_ID, - GIMP_PDB_END); - - if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS) - position = return_vals[1].data.d_int32; - - gimp_destroy_params (return_vals, nreturn_vals); - - return position; -} - -/** - * gimp_image_raise_layer: - * @image_ID: The image. - * @layer_ID: The layer to raise. - * - * Deprecated: Use gimp_image_raise_item() instead. - * - * Returns: TRUE on success. - **/ -gboolean -gimp_image_raise_layer (gint32 image_ID, - gint32 layer_ID) -{ - GimpParam *return_vals; - gint nreturn_vals; - gboolean success = TRUE; - - return_vals = gimp_run_procedure ("gimp-image-raise-layer", - &nreturn_vals, - GIMP_PDB_IMAGE, image_ID, - GIMP_PDB_LAYER, layer_ID, - GIMP_PDB_END); - - success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; - - gimp_destroy_params (return_vals, nreturn_vals); - - return success; -} - -/** - * gimp_image_lower_layer: - * @image_ID: The image. - * @layer_ID: The layer to lower. - * - * Deprecated: Use gimp_image_lower_item() instead. - * - * Returns: TRUE on success. - **/ -gboolean -gimp_image_lower_layer (gint32 image_ID, - gint32 layer_ID) -{ - GimpParam *return_vals; - gint nreturn_vals; - gboolean success = TRUE; - - return_vals = gimp_run_procedure ("gimp-image-lower-layer", - &nreturn_vals, - GIMP_PDB_IMAGE, image_ID, - GIMP_PDB_LAYER, layer_ID, - GIMP_PDB_END); - - success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; - - gimp_destroy_params (return_vals, nreturn_vals); - - return success; -} - -/** - * gimp_image_raise_layer_to_top: - * @image_ID: The image. - * @layer_ID: The layer to raise to top. - * - * Deprecated: Use gimp_image_raise_item_to_top() instead. - * - * Returns: TRUE on success. - **/ -gboolean -gimp_image_raise_layer_to_top (gint32 image_ID, - gint32 layer_ID) -{ - GimpParam *return_vals; - gint nreturn_vals; - gboolean success = TRUE; - - return_vals = gimp_run_procedure ("gimp-image-raise-layer-to-top", - &nreturn_vals, - GIMP_PDB_IMAGE, image_ID, - GIMP_PDB_LAYER, layer_ID, - GIMP_PDB_END); - - success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; - - gimp_destroy_params (return_vals, nreturn_vals); - - return success; -} - -/** - * gimp_image_lower_layer_to_bottom: - * @image_ID: The image. - * @layer_ID: The layer to lower to bottom. - * - * Deprecated: Use gimp_image_lower_item_to_bottom() instead. - * - * Returns: TRUE on success. - **/ -gboolean -gimp_image_lower_layer_to_bottom (gint32 image_ID, - gint32 layer_ID) -{ - GimpParam *return_vals; - gint nreturn_vals; - gboolean success = TRUE; - - return_vals = gimp_run_procedure ("gimp-image-lower-layer-to-bottom", - &nreturn_vals, - GIMP_PDB_IMAGE, image_ID, - GIMP_PDB_LAYER, layer_ID, - GIMP_PDB_END); - - success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; - - gimp_destroy_params (return_vals, nreturn_vals); - - return success; -} - -/** - * gimp_image_get_channel_position: - * @image_ID: The image. - * @channel_ID: The channel. - * - * Deprecated: Use gimp_image_get_item_position() instead. - * - * Returns: The position of the channel in the channel stack. - * - * Since: GIMP 2.4 - **/ -gint -gimp_image_get_channel_position (gint32 image_ID, - gint32 channel_ID) -{ - GimpParam *return_vals; - gint nreturn_vals; - gint position = 0; - - return_vals = gimp_run_procedure ("gimp-image-get-channel-position", - &nreturn_vals, - GIMP_PDB_IMAGE, image_ID, - GIMP_PDB_CHANNEL, channel_ID, - GIMP_PDB_END); - - if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS) - position = return_vals[1].data.d_int32; - - gimp_destroy_params (return_vals, nreturn_vals); - - return position; -} - -/** - * gimp_image_raise_channel: - * @image_ID: The image. - * @channel_ID: The channel to raise. - * - * Deprecated: Use gimp_image_raise_item() instead. - * - * Returns: TRUE on success. - **/ -gboolean -gimp_image_raise_channel (gint32 image_ID, - gint32 channel_ID) -{ - GimpParam *return_vals; - gint nreturn_vals; - gboolean success = TRUE; - - return_vals = gimp_run_procedure ("gimp-image-raise-channel", - &nreturn_vals, - GIMP_PDB_IMAGE, image_ID, - GIMP_PDB_CHANNEL, channel_ID, - GIMP_PDB_END); - - success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; - - gimp_destroy_params (return_vals, nreturn_vals); - - return success; -} - -/** - * gimp_image_lower_channel: - * @image_ID: The image. - * @channel_ID: The channel to lower. - * - * Deprecated: Use gimp_image_lower_item() instead. - * - * Returns: TRUE on success. - **/ -gboolean -gimp_image_lower_channel (gint32 image_ID, - gint32 channel_ID) -{ - GimpParam *return_vals; - gint nreturn_vals; - gboolean success = TRUE; - - return_vals = gimp_run_procedure ("gimp-image-lower-channel", - &nreturn_vals, - GIMP_PDB_IMAGE, image_ID, - GIMP_PDB_CHANNEL, channel_ID, - GIMP_PDB_END); - - success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; - - gimp_destroy_params (return_vals, nreturn_vals); - - return success; -} - -/** - * gimp_image_get_vectors_position: - * @image_ID: The image. - * @vectors_ID: The vectors object. - * - * Deprecated: Use gimp_image_get_item_position() instead. - * - * Returns: The position of the vectors object in the vectors stack. - * - * Since: GIMP 2.4 - **/ -gint -gimp_image_get_vectors_position (gint32 image_ID, - gint32 vectors_ID) -{ - GimpParam *return_vals; - gint nreturn_vals; - gint position = 0; - - return_vals = gimp_run_procedure ("gimp-image-get-vectors-position", - &nreturn_vals, - GIMP_PDB_IMAGE, image_ID, - GIMP_PDB_VECTORS, vectors_ID, - GIMP_PDB_END); - - if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS) - position = return_vals[1].data.d_int32; - - gimp_destroy_params (return_vals, nreturn_vals); - - return position; -} - -/** - * gimp_image_raise_vectors: - * @image_ID: The image. - * @vectors_ID: The vectors object to raise. - * - * Deprecated: Use gimp_image_raise_item() instead. - * - * Returns: TRUE on success. - * - * Since: GIMP 2.4 - **/ -gboolean -gimp_image_raise_vectors (gint32 image_ID, - gint32 vectors_ID) -{ - GimpParam *return_vals; - gint nreturn_vals; - gboolean success = TRUE; - - return_vals = gimp_run_procedure ("gimp-image-raise-vectors", - &nreturn_vals, - GIMP_PDB_IMAGE, image_ID, - GIMP_PDB_VECTORS, vectors_ID, - GIMP_PDB_END); - - success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; - - gimp_destroy_params (return_vals, nreturn_vals); - - return success; -} - -/** - * gimp_image_lower_vectors: - * @image_ID: The image. - * @vectors_ID: The vectors object to lower. - * - * Deprecated: Use gimp_image_lower_item() instead. - * - * Returns: TRUE on success. - * - * Since: GIMP 2.4 - **/ -gboolean -gimp_image_lower_vectors (gint32 image_ID, - gint32 vectors_ID) -{ - GimpParam *return_vals; - gint nreturn_vals; - gboolean success = TRUE; - - return_vals = gimp_run_procedure ("gimp-image-lower-vectors", - &nreturn_vals, - GIMP_PDB_IMAGE, image_ID, - GIMP_PDB_VECTORS, vectors_ID, - GIMP_PDB_END); - - success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; - - gimp_destroy_params (return_vals, nreturn_vals); - - return success; -} - -/** - * gimp_image_raise_vectors_to_top: - * @image_ID: The image. - * @vectors_ID: The vectors object to raise to top. - * - * Deprecated: Use gimp_image_raise_item_to_top() instead. - * - * Returns: TRUE on success. - * - * Since: GIMP 2.4 - **/ -gboolean -gimp_image_raise_vectors_to_top (gint32 image_ID, - gint32 vectors_ID) -{ - GimpParam *return_vals; - gint nreturn_vals; - gboolean success = TRUE; - - return_vals = gimp_run_procedure ("gimp-image-raise-vectors-to-top", - &nreturn_vals, - GIMP_PDB_IMAGE, image_ID, - GIMP_PDB_VECTORS, vectors_ID, - GIMP_PDB_END); - - success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; - - gimp_destroy_params (return_vals, nreturn_vals); - - return success; -} - -/** - * gimp_image_lower_vectors_to_bottom: - * @image_ID: The image. - * @vectors_ID: The vectors object to lower to bottom. - * - * Deprecated: Use gimp_image_lower_item_to_bottom() instead. - * - * Returns: TRUE on success. - * - * Since: GIMP 2.4 - **/ -gboolean -gimp_image_lower_vectors_to_bottom (gint32 image_ID, - gint32 vectors_ID) -{ - GimpParam *return_vals; - gint nreturn_vals; - gboolean success = TRUE; - - return_vals = gimp_run_procedure ("gimp-image-lower-vectors-to-bottom", - &nreturn_vals, - GIMP_PDB_IMAGE, image_ID, - GIMP_PDB_VECTORS, vectors_ID, - GIMP_PDB_END); - - success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; - - gimp_destroy_params (return_vals, nreturn_vals); - - return success; -} - /** * gimp_image_flatten: * @image_ID: The image. diff --git a/libgimp/gimpimage_pdb.h b/libgimp/gimpimage_pdb.h index 88472f9b76..68060a56fb 100644 --- a/libgimp/gimpimage_pdb.h +++ b/libgimp/gimpimage_pdb.h @@ -133,34 +133,6 @@ gboolean gimp_image_reorder_item (gint32 gint32 item_ID, gint32 parent_ID, gint position); -#ifndef GIMP_DISABLE_DEPRECATED -gint gimp_image_get_layer_position (gint32 image_ID, - gint32 layer_ID); -gboolean gimp_image_raise_layer (gint32 image_ID, - gint32 layer_ID); -gboolean gimp_image_lower_layer (gint32 image_ID, - gint32 layer_ID); -gboolean gimp_image_raise_layer_to_top (gint32 image_ID, - gint32 layer_ID); -gboolean gimp_image_lower_layer_to_bottom (gint32 image_ID, - gint32 layer_ID); -gint gimp_image_get_channel_position (gint32 image_ID, - gint32 channel_ID); -gboolean gimp_image_raise_channel (gint32 image_ID, - gint32 channel_ID); -gboolean gimp_image_lower_channel (gint32 image_ID, - gint32 channel_ID); -gint gimp_image_get_vectors_position (gint32 image_ID, - gint32 vectors_ID); -gboolean gimp_image_raise_vectors (gint32 image_ID, - gint32 vectors_ID); -gboolean gimp_image_lower_vectors (gint32 image_ID, - gint32 vectors_ID); -gboolean gimp_image_raise_vectors_to_top (gint32 image_ID, - gint32 vectors_ID); -gboolean gimp_image_lower_vectors_to_bottom (gint32 image_ID, - gint32 vectors_ID); -#endif /* GIMP_DISABLE_DEPRECATED */ gint32 gimp_image_flatten (gint32 image_ID); gint32 gimp_image_merge_visible_layers (gint32 image_ID, GimpMergeType merge_type); diff --git a/tools/pdbgen/pdb/image.pdb b/tools/pdbgen/pdb/image.pdb index 349b27e2bc..66819bef6b 100644 --- a/tools/pdbgen/pdb/image.pdb +++ b/tools/pdbgen/pdb/image.pdb @@ -911,125 +911,6 @@ CODE ); } -sub image_get_layer_position { - &std_pdb_deprecated('gimp-image-get-item-position'); - &simon_pdb_misc('2006', '2.4'); - - @inargs = ( - { name => 'image', type => 'image', - desc => 'The image' }, - { name => 'layer', type => 'layer', - desc => 'The layer' } - ); - - @outargs = ( - { name => 'position', type => 'int32', - desc => "The position of the layer in the layer stack" } - ); - - - %invoke = ( - code => <<'CODE' -{ - GimpContainer *container = gimp_image_get_layers (image); - - position = gimp_container_get_child_index (container, - GIMP_OBJECT (layer)); - if (position < 0) - success = FALSE; -} -CODE - ); -} - -sub image_raise_layer { - &std_pdb_deprecated('gimp-image-raise-item'); - - @inargs = ( - { name => 'image', type => 'image', - desc => 'The image' }, - { name => 'layer', type => 'layer', - desc => 'The layer to raise' } - ); - - %invoke = ( - code => <<'CODE' -{ - if (gimp_pdb_item_is_attached (GIMP_ITEM (layer), image, FALSE, error)) - success = gimp_image_raise_item (image, GIMP_ITEM (layer), error); - else - success = FALSE; -} -CODE - ); -} - -sub image_lower_layer { - &std_pdb_deprecated('gimp-image-lower-item'); - - @inargs = ( - { name => 'image', type => 'image', - desc => 'The image' }, - { name => 'layer', type => 'layer', - desc => 'The layer to lower' } - ); - - %invoke = ( - code => <<'CODE' -{ - if (gimp_pdb_item_is_attached (GIMP_ITEM (layer), image, FALSE, error)) - success = gimp_image_lower_item (image, GIMP_ITEM (layer), error); - else - success = FALSE; -} -CODE - ); -} - -sub image_raise_layer_to_top { - &std_pdb_deprecated('gimp-image-raise-item-to-top'); - - @inargs = ( - { name => 'image', type => 'image', - desc => 'The image' }, - { name => 'layer', type => 'layer', - desc => 'The layer to raise to top' } - ); - - %invoke = ( - code => <<'CODE' -{ - if (gimp_pdb_item_is_attached (GIMP_ITEM (layer), image, FALSE, error)) - success = gimp_image_raise_item_to_top (image, GIMP_ITEM (layer)); - else - success = FALSE; -} -CODE - ); -} - -sub image_lower_layer_to_bottom { - &std_pdb_deprecated('gimp-image-lower-item-to-bottom'); - - @inargs = ( - { name => 'image', type => 'image', - desc => 'The image' }, - { name => 'layer', type => 'layer', - desc => 'The layer to lower to bottom' } - ); - - %invoke = ( - code => <<'CODE' -{ - if (gimp_pdb_item_is_attached (GIMP_ITEM (layer), image, FALSE, error)) - success = gimp_image_lower_item_to_bottom (image, GIMP_ITEM (layer)); - else - success = FALSE; -} -CODE - ); -} - sub image_merge_visible_layers { $blurb = 'Merge the visible image layers into one.'; @@ -1319,81 +1200,6 @@ CODE ); } -sub image_get_channel_position { - &std_pdb_deprecated('gimp-image-get-item-position'); - &simon_pdb_misc('2006', '2.4'); - - @inargs = ( - { name => 'image', type => 'image', - desc => 'The image' }, - { name => 'channel', type => 'channel', - desc => 'The channel' } - ); - - @outargs = ( - { name => 'position', type => 'int32', - desc => "The position of the channel in the channel stack" } - ); - - - %invoke = ( - code => <<'CODE' -{ - GimpContainer *container = gimp_image_get_channels (image); - - position = gimp_container_get_child_index (container, - GIMP_OBJECT (channel)); - if (position < 0) - success = FALSE; -} -CODE - ); -} - -sub image_raise_channel { - &std_pdb_deprecated('gimp-image-raise-item'); - - @inargs = ( - { name => 'image', type => 'image', - desc => 'The image' }, - { name => 'channel', type => 'channel', - desc => 'The channel to raise' } - ); - - %invoke = ( - code => <<'CODE' -{ - if (gimp_pdb_item_is_attached (GIMP_ITEM (channel), image, FALSE, error)) - success = gimp_image_raise_item (image, GIMP_ITEM (channel), error); - else - success = FALSE; -} -CODE - ); -} - -sub image_lower_channel { - &std_pdb_deprecated('gimp-image-lower-item'); - - @inargs = ( - { name => 'image', type => 'image', - desc => 'The image' }, - { name => 'channel', type => 'channel', - desc => 'The channel to lower' } - ); - - %invoke = ( - code => <<'CODE' -{ - if (gimp_pdb_item_is_attached (GIMP_ITEM (channel), image, FALSE, error)) - success = gimp_image_lower_item (image, GIMP_ITEM (channel), error); - else - success = FALSE; -} -CODE - ); -} - sub image_add_channel { &std_pdb_deprecated ('gimp-image-insert-channel'); @@ -1600,129 +1406,6 @@ CODE ); } -sub image_get_vectors_position { - &std_pdb_deprecated('gimp-image-get-item-position'); - &simon_pdb_misc('2006', '2.4'); - - @inargs = ( - { name => 'image', type => 'image', - desc => 'The image' }, - { name => 'vectors', type => 'vectors', - desc => 'The vectors object' } - ); - - @outargs = ( - { name => 'position', type => 'int32', - desc => "The position of the vectors object in the vectors stack" } - ); - - - %invoke = ( - code => <<'CODE' -{ - GimpContainer *container = gimp_image_get_vectors (image); - - position = gimp_container_get_child_index (container, - GIMP_OBJECT (vectors)); - if (position < 0) - success = FALSE; -} -CODE - ); -} - -sub image_raise_vectors { - &std_pdb_deprecated('gimp-image-raise-item'); - &simon_pdb_misc('2005', '2.4'); - - @inargs = ( - { name => 'image', type => 'image', - desc => 'The image' }, - { name => 'vectors', type => 'vectors', - desc => 'The vectors object to raise' } - ); - - %invoke = ( - code => <<'CODE' -{ - if (gimp_pdb_item_is_attached (GIMP_ITEM (vectors), image, FALSE, error)) - success = gimp_image_raise_item (image, GIMP_ITEM (vectors), error); - else - success = FALSE; -} -CODE - ); -} - -sub image_lower_vectors { - &std_pdb_deprecated('gimp-image-lower-item'); - &simon_pdb_misc('2005', '2.4'); - - @inargs = ( - { name => 'image', type => 'image', - desc => 'The image' }, - { name => 'vectors', type => 'vectors', - desc => 'The vectors object to lower' } - ); - - %invoke = ( - code => <<'CODE' -{ - if (gimp_pdb_item_is_attached (GIMP_ITEM (vectors), image, FALSE, error)) - success = gimp_image_lower_item (image, GIMP_ITEM (vectors), error); - else - success = FALSE; -} -CODE - ); -} - -sub image_raise_vectors_to_top { - &std_pdb_deprecated('gimp-image-raise-item-to-top'); - &simon_pdb_misc('2005', '2.4'); - - @inargs = ( - { name => 'image', type => 'image', - desc => 'The image' }, - { name => 'vectors', type => 'vectors', - desc => 'The vectors object to raise to top' } - ); - - %invoke = ( - code => <<'CODE' -{ - if (gimp_pdb_item_is_attached (GIMP_ITEM (vectors), image, FALSE, error)) - success = gimp_image_raise_item_to_top (image, GIMP_ITEM (vectors)); - else - success = FALSE; -} -CODE - ); -} - -sub image_lower_vectors_to_bottom { - &std_pdb_deprecated('gimp-image-lower-item-to-bottom'); - &simon_pdb_misc('2005', '2.4'); - - @inargs = ( - { name => 'image', type => 'image', - desc => 'The image' }, - { name => 'vectors', type => 'vectors', - desc => 'The vectors object to lower to bottom' } - ); - - %invoke = ( - code => <<'CODE' -{ - if (gimp_pdb_item_is_attached (GIMP_ITEM (vectors), image, FALSE, error)) - success = gimp_image_lower_item_to_bottom (image, GIMP_ITEM (vectors)); - else - success = FALSE; -} -CODE - ); -} - sub image_get_active_drawable { $blurb = "Get the image's active drawable"; @@ -2936,14 +2619,6 @@ CODE image_raise_item image_lower_item image_raise_item_to_top image_lower_item_to_bottom image_reorder_item - image_get_layer_position - image_raise_layer image_lower_layer - image_raise_layer_to_top image_lower_layer_to_bottom - image_get_channel_position - image_raise_channel image_lower_channel - image_get_vectors_position - image_raise_vectors image_lower_vectors - image_raise_vectors_to_top image_lower_vectors_to_bottom image_flatten image_merge_visible_layers image_merge_down image_add_layer_mask image_remove_layer_mask image_get_colormap image_set_colormap @@ -2965,7 +2640,7 @@ CODE image_get_channel_by_tattoo image_get_vectors_by_tattoo); -%exports = (app => [@procs], lib => [@procs[0..55,58..86]]); +%exports = (app => [@procs], lib => [@procs[0..42,45..73]]); $desc = 'Image'; $doc_title = 'gimpimage';