dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libgimp: use item API instead of deprecated drawable API

This commit is contained in:
Michael Natterer 2010-07-09 11:29:35 +02:00
parent 3c2dcf2df5
commit ce9ea1e8d7
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libgimp/gimpaspectpreview.c
View File

@ -274,7 +274,7 @@ gimp_aspect_preview_draw_buffer (GimpPreview *preview,
GimpDrawable *drawable = GIMP_ASPECT_PREVIEW (preview)->drawable;
gint32 image_id;
image_id = gimp_drawable_get_image (drawable->drawable_id);
image_id = gimp_item_get_image (drawable->drawable_id);
if (gimp_selection_is_empty (image_id))
{

2
libgimp/gimpdrawable.c
View File

@ -346,7 +346,7 @@ gimp_drawable_attach_new_parasite (gint32 drawable_ID,
GimpParasite *parasite = gimp_parasite_new (name, flags, size, data);
gboolean success;
success = gimp_drawable_parasite_attach (drawable_ID, parasite);
success = gimp_item_parasite_attach (drawable_ID, parasite);
gimp_parasite_free (parasite);

4
libgimp/gimpdrawablepreview.c
View File

@ -388,7 +388,7 @@ gimp_drawable_preview_draw_area (GimpDrawablePreview *preview,
GimpDrawable *drawable = preview->drawable;
gint32 image_id;
image_id = gimp_drawable_get_image (drawable->drawable_id);
image_id = gimp_item_get_image (drawable->drawable_id);
if (gimp_selection_is_empty (image_id))
{
@ -494,7 +494,7 @@ gimp_drawable_preview_set_drawable (GimpDrawablePreview *drawable_preview,
if (gimp_drawable_is_indexed (drawable->drawable_id))
{
guint32 image = gimp_drawable_get_image (drawable->drawable_id);
guint32 image = gimp_item_get_image (drawable->drawable_id);
guchar *cmap;
gint num_colors;

14
libgimp/gimpexport.c
View File

@ -82,7 +82,7 @@ export_merge (gint32 image_ID,
layers = gimp_image_get_layers (image_ID, &nlayers);
for (i = 0; i < nlayers; i++)
{
if (gimp_drawable_get_visible (layers[i]))
if (gimp_item_get_visible (layers[i]))
nvisible++;
}
@ -716,16 +716,16 @@ gimp_export_image (gint32 *image_ID,
/* ask for confirmation if the user is not saving a layer (see bug #51114) */
if (format_name &&
! gimp_drawable_is_layer (*drawable_ID) &&
! gimp_item_is_layer (*drawable_ID) &&
! (capabilities & GIMP_EXPORT_CAN_HANDLE_LAYERS))
{
if (gimp_drawable_is_layer_mask (*drawable_ID))
if (gimp_item_is_layer_mask (*drawable_ID))
{
retval = confirm_save_dialog
(_("You are about to save a layer mask as %s.\n"
"This will not save the visible layers."), format_name);
}
else if (gimp_drawable_is_channel (*drawable_ID))
else if (gimp_item_is_channel (*drawable_ID))
{
retval = confirm_save_dialog
(_("You are about to save a channel (saved selection) as %s.\n"
@ -762,7 +762,7 @@ gimp_export_image (gint32 *image_ID,
/* If this is the last layer, it's visible and has no alpha
* channel, then the image has a "flat" background
*/
if (i == n_layers - 1 && gimp_drawable_get_visible (layers[i]))
if (i == n_layers - 1 && gimp_item_get_visible (layers[i]))
background_has_alpha = FALSE;
if (capabilities & GIMP_EXPORT_NEEDS_ALPHA)
@ -787,8 +787,8 @@ gimp_export_image (gint32 *image_ID,
if (! added_flatten)
{
/* check if layer size != canvas size, opacity != 100%, or offsets != 0 */
if (n_layers == 1 &&
gimp_drawable_is_layer (*drawable_ID) &&
if (n_layers == 1 &&
gimp_item_is_layer (*drawable_ID) &&
! (capabilities & GIMP_EXPORT_CAN_HANDLE_LAYERS))
{
gint offset_x;

2
libgimp/gimpzoompreview.c
View File

@ -501,7 +501,7 @@ gimp_zoom_preview_draw_buffer (GimpPreview *preview,
GimpDrawable *drawable = priv->drawable;
gint32 image_id;
image_id = gimp_drawable_get_image (drawable->drawable_id);
image_id = gimp_item_get_image (drawable->drawable_id);
if (gimp_selection_is_empty (image_id))
{