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

Move "tattoo_state" to GimpImagePrivate

This commit is contained in:
Michael Natterer 2010-02-03 21:31:27 +01:00
parent 0b2c804e9d
commit bb624cb8c4
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/core/gimpimage-private.h
View File

@ -47,6 +47,8 @@ struct _GimpImagePrivate
gint instance_count; /* number of instances */
gint disp_count; /* number of displays */
GimpTattoo tattoo_state; /* the last used tattoo */
};
#define GIMP_IMAGE_GET_PRIVATE(image) \

16
app/core/gimpimage.c
View File

@ -610,7 +610,7 @@ gimp_image_init (GimpImage *image)
private->instance_count = 0;
private->disp_count = 0;
image->tattoo_state = 0;
private->tattoo_state = 0;
image->projection = gimp_projection_new (GIMP_PROJECTABLE (image));
@ -2641,14 +2641,18 @@ gimp_image_parasite_detach (GimpImage *image,
GimpTattoo
gimp_image_get_new_tattoo (GimpImage *image)
{
GimpImagePrivate *private;
g_return_val_if_fail (GIMP_IS_IMAGE (image), 0);
image->tattoo_state++;
private = GIMP_IMAGE_GET_PRIVATE (image);
if (G_UNLIKELY (image->tattoo_state == 0))
private->tattoo_state++;
if (G_UNLIKELY (private->tattoo_state == 0))
g_warning ("%s: Tattoo state corrupted (integer overflow).", G_STRFUNC);
return image->tattoo_state;
return private->tattoo_state;
}
GimpTattoo
@ -2656,7 +2660,7 @@ gimp_image_get_tattoo_state (GimpImage *image)
{
g_return_val_if_fail (GIMP_IS_IMAGE (image), 0);
return image->tattoo_state;
return GIMP_IMAGE_GET_PRIVATE (image)->tattoo_state;
}
gboolean
@ -2726,7 +2730,7 @@ gimp_image_set_tattoo_state (GimpImage *image,
/* Must check if the state is valid */
if (retval == TRUE)
image->tattoo_state = val;
GIMP_IMAGE_GET_PRIVATE (image)->tattoo_state = val;
return retval;
}

2
app/core/gimpimage.h
View File

@ -105,8 +105,6 @@ struct _GimpImage
Gimp *gimp; /* the GIMP the image belongs to*/
GimpTattoo tattoo_state; /* the last used tattoo */
GimpProjection *projection; /* projection layers & channels */
GeglNode *graph; /* GEGL projection graph */