diff --git a/libgimp/gimp.def b/libgimp/gimp.def index 94f6d3966c..109bb43063 100644 --- a/libgimp/gimp.def +++ b/libgimp/gimp.def @@ -382,7 +382,6 @@ EXPORTS gimp_image_get_channels gimp_image_get_color_profile gimp_image_get_colormap - gimp_image_get_colormap_deprecated gimp_image_get_component_active gimp_image_get_component_visible gimp_image_get_default_new_layer_mode @@ -398,7 +397,6 @@ EXPORTS gimp_image_get_layer_by_name gimp_image_get_layer_by_tattoo gimp_image_get_layers - gimp_image_get_layers_deprecated gimp_image_get_metadata gimp_image_get_name gimp_image_get_parasite @@ -470,7 +468,6 @@ EXPORTS gimp_image_set_color_profile gimp_image_set_color_profile_from_file gimp_image_set_colormap - gimp_image_set_colormap_deprecated gimp_image_set_component_active gimp_image_set_component_visible gimp_image_set_filename diff --git a/libgimp/gimpimage.c b/libgimp/gimpimage.c index 5d26e57f0d..6e8271eb9c 100644 --- a/libgimp/gimpimage.c +++ b/libgimp/gimpimage.c @@ -670,74 +670,3 @@ gimp_image_set_metadata (GimpImage *image, return success; } - - -/* Deprecated API. */ - - -/** - * gimp_image_get_layers_deprecated: (skip) - * @image_id: The image id. - * @num_layers: (out): The number of layers contained in the image. - * - * Returns the list of layers contained in the specified image. - * - * This procedure returns the list of layers contained in the specified - * image. The order of layers is from topmost to bottommost. - * - * Returns: (array length=num_layers) (element-type gint32) (transfer full): - * The list of layers contained in the image. - * The returned value must be freed with g_free(). - **/ -gint * -gimp_image_get_layers_deprecated (gint32 image_id, - gint *num_layers) -{ - return _gimp_image_get_layers (gimp_image_get_by_id (image_id), - num_layers); -} - -/** - * gimp_image_get_colormap_deprecated: (skip) - * @image_id: The image. - * @num_colors: Returns the number of colors in the colormap array. - * - * Returns the image's colormap - * - * This procedure returns an actual pointer to the image's colormap, as - * well as the number of colors contained in the colormap. If the image - * is not of base type INDEXED, this pointer will be NULL. - * - * Returns: The image's colormap. - */ -guchar * -gimp_image_get_colormap_deprecated (gint32 image_id, - gint *num_colors) -{ - return gimp_image_get_colormap (gimp_image_get_by_id (image_id), - num_colors); -} - -/** - * gimp_image_set_colormap_deprecated: (skip) - * @image_id: The image. - * @colormap: The new colormap values. - * @num_colors: Number of colors in the colormap array. - * - * Sets the entries in the image's colormap. - * - * This procedure sets the entries in the specified image's colormap. - * The number of colors is specified by the "num_colors" parameter - * and corresponds to the number of INT8 triples that must be contained - * in the "cmap" array. - * - * Returns: TRUE on success. - */ -gboolean -gimp_image_set_colormap_deprecated (gint32 image_id, - const guchar *colormap, - gint num_colors) -{ - return gimp_image_set_colormap (gimp_image_get_by_id (image_id), - colormap, num_colors); -} diff --git a/libgimp/gimpimage.h b/libgimp/gimpimage.h index f5fbc7d824..91167e6d63 100644 --- a/libgimp/gimpimage.h +++ b/libgimp/gimpimage.h @@ -74,8 +74,6 @@ gboolean gimp_image_is_valid (GimpImage *image); GimpImage ** gimp_get_images (gint *num_images); GList * gimp_list_images (void); -#ifndef GIMP_DEPRECATED_REPLACE_NEW_API - GimpLayer ** gimp_image_get_layers (GimpImage *image, gint *num_layers); GimpChannel ** gimp_image_get_channels (GimpImage *image, @@ -106,22 +104,6 @@ GimpMetadata * gimp_image_get_metadata (GimpImage *image); gboolean gimp_image_set_metadata (GimpImage *image, GimpMetadata *metadata); -#else /* GIMP_DEPRECATED_REPLACE_NEW_API */ - -#define gimp_image_get_layers gimp_image_get_layers_deprecated -#define gimp_image_get_colormap gimp_image_get_colormap_deprecated -#define gimp_image_set_colormap gimp_image_set_colormap_deprecated - -#endif /* GIMP_DEPRECATED_REPLACE_NEW_API */ - -gint * gimp_image_get_layers_deprecated (gint32 image_id, - gint *num_layers); -guchar * gimp_image_get_colormap_deprecated (gint32 image_id, - gint *num_colors); -gboolean gimp_image_set_colormap_deprecated (gint32 image_id, - const guchar *colormap, - gint num_colors); - G_END_DECLS