callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Proper refcounting for layer masks. Well, ok, almost proper. :)

Browse Source 
--sg
This commit is contained in:
scott 1998-02-14 19:19:16 +00:00
parent ff6cbbb8e6
commit b23afad472
6 changed files with 60 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/core/gimplayer.c
View File

@ -353,7 +353,7 @@ layer_copy (layer, add_alpha)
/* duplicate the layer mask if necessary */
if (layer->mask)
{
new_layer->mask = layer_mask_copy (layer->mask);
new_layer->mask = layer_mask_ref (layer_mask_copy (layer->mask));
new_layer->apply_mask = layer->apply_mask;
new_layer->edit_mask = layer->edit_mask;
new_layer->show_mask = layer->show_mask;
@ -428,7 +428,7 @@ layer_add_mask (layer, mask)
if (layer->mask)
return NULL;
layer->mask = mask;
layer->mask = layer_mask_ref (mask);
mask->layer = layer;
/* Set the application mode in the layer to "apply" */
@ -1429,7 +1429,22 @@ layer_mask_get_ID (int ID)
void
layer_mask_delete (LayerMask * layermask)
{
gtk_object_destroy (GTK_OBJECT (layermask));
gtk_object_unref (GTK_OBJECT (layermask));
}
LayerMask *
layer_mask_ref (LayerMask *mask)
{
gtk_object_ref (GTK_OBJECT (mask));
gtk_object_sink (GTK_OBJECT (mask));
return mask;
}
void
layer_mask_unref (LayerMask *mask)
{
gtk_object_unref (GTK_OBJECT (mask));
}
void

2
app/core/gimplayer.h
View File

@ -118,6 +118,8 @@ LayerMask * layer_mask_new (int, int, int, char *,
LayerMask * layer_mask_copy (LayerMask *);
void layer_mask_delete (LayerMask *);
LayerMask * layer_mask_get_ID (int);
LayerMask * layer_mask_ref (LayerMask *);
void layer_mask_unref (LayerMask *);
/* access functions */

21
app/gimplayer.c
View File

@ -353,7 +353,7 @@ layer_copy (layer, add_alpha)
/* duplicate the layer mask if necessary */
if (layer->mask)
{
new_layer->mask = layer_mask_copy (layer->mask);
new_layer->mask = layer_mask_ref (layer_mask_copy (layer->mask));
new_layer->apply_mask = layer->apply_mask;
new_layer->edit_mask = layer->edit_mask;
new_layer->show_mask = layer->show_mask;
@ -428,7 +428,7 @@ layer_add_mask (layer, mask)
if (layer->mask)
return NULL;
layer->mask = mask;
layer->mask = layer_mask_ref (mask);
mask->layer = layer;
/* Set the application mode in the layer to "apply" */
@ -1429,7 +1429,22 @@ layer_mask_get_ID (int ID)
void
layer_mask_delete (LayerMask * layermask)
{
gtk_object_destroy (GTK_OBJECT (layermask));
gtk_object_unref (GTK_OBJECT (layermask));
}
LayerMask *
layer_mask_ref (LayerMask *mask)
{
gtk_object_ref (GTK_OBJECT (mask));
gtk_object_sink (GTK_OBJECT (mask));
return mask;
}
void
layer_mask_unref (LayerMask *mask)
{
gtk_object_unref (GTK_OBJECT (mask));
}
void

2
app/gimplayer.h
View File

@ -118,6 +118,8 @@ LayerMask * layer_mask_new (int, int, int, char *,
LayerMask * layer_mask_copy (LayerMask *);
void layer_mask_delete (LayerMask *);
LayerMask * layer_mask_get_ID (int);
LayerMask * layer_mask_ref (LayerMask *);
void layer_mask_unref (LayerMask *);
/* access functions */

21
app/layer.c
View File

@ -353,7 +353,7 @@ layer_copy (layer, add_alpha)
/* duplicate the layer mask if necessary */
if (layer->mask)
{
new_layer->mask = layer_mask_copy (layer->mask);
new_layer->mask = layer_mask_ref (layer_mask_copy (layer->mask));
new_layer->apply_mask = layer->apply_mask;
new_layer->edit_mask = layer->edit_mask;
new_layer->show_mask = layer->show_mask;
@ -428,7 +428,7 @@ layer_add_mask (layer, mask)
if (layer->mask)
return NULL;
layer->mask = mask;
layer->mask = layer_mask_ref (mask);
mask->layer = layer;
/* Set the application mode in the layer to "apply" */
@ -1429,7 +1429,22 @@ layer_mask_get_ID (int ID)
void
layer_mask_delete (LayerMask * layermask)
{
gtk_object_destroy (GTK_OBJECT (layermask));
gtk_object_unref (GTK_OBJECT (layermask));
}
LayerMask *
layer_mask_ref (LayerMask *mask)
{
gtk_object_ref (GTK_OBJECT (mask));
gtk_object_sink (GTK_OBJECT (mask));
return mask;
}
void
layer_mask_unref (LayerMask *mask)
{
gtk_object_unref (GTK_OBJECT (mask));
}
void

2
app/layer.h
View File

@ -118,6 +118,8 @@ LayerMask * layer_mask_new (int, int, int, char *,
LayerMask * layer_mask_copy (LayerMask *);
void layer_mask_delete (LayerMask *);
LayerMask * layer_mask_get_ID (int);
LayerMask * layer_mask_ref (LayerMask *);
void layer_mask_unref (LayerMask *);
/* access functions */