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

fix bug #2168 

--Sven
This commit is contained in:
Sven Neumann 1999-11-30 00:18:44 +00:00
parent 7dfc54b956
commit 1fdea67422
9 changed files with 53 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue Nov 30 01:17:12 MET 1999 Sven Neumann <sven@gimp.org>
* app/gimpimage.c: correctly save the layer mode to the undo_stack
on layer_merge (fixes bug #2168)
Mon Nov 29 23:51:26 GMT 1999 Andy Thomas <alt@gimp.org>
* app/commands.c

10
app/core/gimpimage-guides.c
View File

@ -2397,6 +2397,7 @@ gimp_image_merge_layers (GimpImage *gimage,
Layer *merge_layer;
Layer *layer;
Layer *bottom;
gint bottom_mode;
guchar bg[4] = {0, 0, 0, 0};
GimpImageType type;
gint count;
@ -2411,6 +2412,7 @@ gimp_image_merge_layers (GimpImage *gimage,
type = RGBA_GIMAGE;
x1 = y1 = x2 = y2 = 0;
bottom = NULL;
bottom_mode = 0;
/* Get the layer extents */
count = 0;
@ -2549,9 +2551,9 @@ gimp_image_merge_layers (GimpImage *gimage,
* Keep a pointer to it so that we can set the mode right after it's been
* merged so that undo works correctly.
*/
layer->mode = NORMAL_MODE;
bottom = layer;
bottom_mode = bottom->mode;
bottom->mode = NORMAL_MODE;
}
while (reverse_list)
@ -2597,7 +2599,7 @@ gimp_image_merge_layers (GimpImage *gimage,
/* Save old mode in undo */
if (bottom)
bottom -> mode = merge_layer -> mode;
bottom->mode = bottom_mode;
g_slist_free (reverse_list);
@ -3389,7 +3391,7 @@ gimp_image_construct_composite_preview (GimpImage *gimage,
floating_sel = layer;
else
{
if (floating_sel && GIMP_LAYER (floating_sel)->fs.drawable == layer)
if (floating_sel && floating_sel->fs.drawable == GIMP_DRAWABLE (layer))
reverse_list = g_slist_prepend (reverse_list, floating_sel);
reverse_list = g_slist_prepend (reverse_list, layer);

10
app/core/gimpimage-merge.c
View File

@ -2397,6 +2397,7 @@ gimp_image_merge_layers (GimpImage *gimage,
Layer *merge_layer;
Layer *layer;
Layer *bottom;
gint bottom_mode;
guchar bg[4] = {0, 0, 0, 0};
GimpImageType type;
gint count;
@ -2411,6 +2412,7 @@ gimp_image_merge_layers (GimpImage *gimage,
type = RGBA_GIMAGE;
x1 = y1 = x2 = y2 = 0;
bottom = NULL;
bottom_mode = 0;
/* Get the layer extents */
count = 0;
@ -2549,9 +2551,9 @@ gimp_image_merge_layers (GimpImage *gimage,
* Keep a pointer to it so that we can set the mode right after it's been
* merged so that undo works correctly.
*/
layer->mode = NORMAL_MODE;
bottom = layer;
bottom_mode = bottom->mode;
bottom->mode = NORMAL_MODE;
}
while (reverse_list)
@ -2597,7 +2599,7 @@ gimp_image_merge_layers (GimpImage *gimage,
/* Save old mode in undo */
if (bottom)
bottom -> mode = merge_layer -> mode;
bottom->mode = bottom_mode;
g_slist_free (reverse_list);
@ -3389,7 +3391,7 @@ gimp_image_construct_composite_preview (GimpImage *gimage,
floating_sel = layer;
else
{
if (floating_sel && GIMP_LAYER (floating_sel)->fs.drawable == layer)
if (floating_sel && floating_sel->fs.drawable == GIMP_DRAWABLE (layer))
reverse_list = g_slist_prepend (reverse_list, floating_sel);
reverse_list = g_slist_prepend (reverse_list, layer);

10
app/core/gimpimage-projection.c
View File

@ -2397,6 +2397,7 @@ gimp_image_merge_layers (GimpImage *gimage,
Layer *merge_layer;
Layer *layer;
Layer *bottom;
gint bottom_mode;
guchar bg[4] = {0, 0, 0, 0};
GimpImageType type;
gint count;
@ -2411,6 +2412,7 @@ gimp_image_merge_layers (GimpImage *gimage,
type = RGBA_GIMAGE;
x1 = y1 = x2 = y2 = 0;
bottom = NULL;
bottom_mode = 0;
/* Get the layer extents */
count = 0;
@ -2549,9 +2551,9 @@ gimp_image_merge_layers (GimpImage *gimage,
* Keep a pointer to it so that we can set the mode right after it's been
* merged so that undo works correctly.
*/
layer->mode = NORMAL_MODE;
bottom = layer;
bottom_mode = bottom->mode;
bottom->mode = NORMAL_MODE;
}
while (reverse_list)
@ -2597,7 +2599,7 @@ gimp_image_merge_layers (GimpImage *gimage,
/* Save old mode in undo */
if (bottom)
bottom -> mode = merge_layer -> mode;
bottom->mode = bottom_mode;
g_slist_free (reverse_list);
@ -3389,7 +3391,7 @@ gimp_image_construct_composite_preview (GimpImage *gimage,
floating_sel = layer;
else
{
if (floating_sel && GIMP_LAYER (floating_sel)->fs.drawable == layer)
if (floating_sel && floating_sel->fs.drawable == GIMP_DRAWABLE (layer))
reverse_list = g_slist_prepend (reverse_list, floating_sel);
reverse_list = g_slist_prepend (reverse_list, layer);

10
app/core/gimpimage-resize.c
View File

@ -2397,6 +2397,7 @@ gimp_image_merge_layers (GimpImage *gimage,
Layer *merge_layer;
Layer *layer;
Layer *bottom;
gint bottom_mode;
guchar bg[4] = {0, 0, 0, 0};
GimpImageType type;
gint count;
@ -2411,6 +2412,7 @@ gimp_image_merge_layers (GimpImage *gimage,
type = RGBA_GIMAGE;
x1 = y1 = x2 = y2 = 0;
bottom = NULL;
bottom_mode = 0;
/* Get the layer extents */
count = 0;
@ -2549,9 +2551,9 @@ gimp_image_merge_layers (GimpImage *gimage,
* Keep a pointer to it so that we can set the mode right after it's been
* merged so that undo works correctly.
*/
layer->mode = NORMAL_MODE;
bottom = layer;
bottom_mode = bottom->mode;
bottom->mode = NORMAL_MODE;
}
while (reverse_list)
@ -2597,7 +2599,7 @@ gimp_image_merge_layers (GimpImage *gimage,
/* Save old mode in undo */
if (bottom)
bottom -> mode = merge_layer -> mode;
bottom->mode = bottom_mode;
g_slist_free (reverse_list);
@ -3389,7 +3391,7 @@ gimp_image_construct_composite_preview (GimpImage *gimage,
floating_sel = layer;
else
{
if (floating_sel && GIMP_LAYER (floating_sel)->fs.drawable == layer)
if (floating_sel && floating_sel->fs.drawable == GIMP_DRAWABLE (layer))
reverse_list = g_slist_prepend (reverse_list, floating_sel);
reverse_list = g_slist_prepend (reverse_list, layer);

10
app/core/gimpimage-scale.c
View File

@ -2397,6 +2397,7 @@ gimp_image_merge_layers (GimpImage *gimage,
Layer *merge_layer;
Layer *layer;
Layer *bottom;
gint bottom_mode;
guchar bg[4] = {0, 0, 0, 0};
GimpImageType type;
gint count;
@ -2411,6 +2412,7 @@ gimp_image_merge_layers (GimpImage *gimage,
type = RGBA_GIMAGE;
x1 = y1 = x2 = y2 = 0;
bottom = NULL;
bottom_mode = 0;
/* Get the layer extents */
count = 0;
@ -2549,9 +2551,9 @@ gimp_image_merge_layers (GimpImage *gimage,
* Keep a pointer to it so that we can set the mode right after it's been
* merged so that undo works correctly.
*/
layer->mode = NORMAL_MODE;
bottom = layer;
bottom_mode = bottom->mode;
bottom->mode = NORMAL_MODE;
}
while (reverse_list)
@ -2597,7 +2599,7 @@ gimp_image_merge_layers (GimpImage *gimage,
/* Save old mode in undo */
if (bottom)
bottom -> mode = merge_layer -> mode;
bottom->mode = bottom_mode;
g_slist_free (reverse_list);
@ -3389,7 +3391,7 @@ gimp_image_construct_composite_preview (GimpImage *gimage,
floating_sel = layer;
else
{
if (floating_sel && GIMP_LAYER (floating_sel)->fs.drawable == layer)
if (floating_sel && floating_sel->fs.drawable == GIMP_DRAWABLE (layer))
reverse_list = g_slist_prepend (reverse_list, floating_sel);
reverse_list = g_slist_prepend (reverse_list, layer);

10
app/core/gimpimage.c
View File

@ -2397,6 +2397,7 @@ gimp_image_merge_layers (GimpImage *gimage,
Layer *merge_layer;
Layer *layer;
Layer *bottom;
gint bottom_mode;
guchar bg[4] = {0, 0, 0, 0};
GimpImageType type;
gint count;
@ -2411,6 +2412,7 @@ gimp_image_merge_layers (GimpImage *gimage,
type = RGBA_GIMAGE;
x1 = y1 = x2 = y2 = 0;
bottom = NULL;
bottom_mode = 0;
/* Get the layer extents */
count = 0;
@ -2549,9 +2551,9 @@ gimp_image_merge_layers (GimpImage *gimage,
* Keep a pointer to it so that we can set the mode right after it's been
* merged so that undo works correctly.
*/
layer->mode = NORMAL_MODE;
bottom = layer;
bottom_mode = bottom->mode;
bottom->mode = NORMAL_MODE;
}
while (reverse_list)
@ -2597,7 +2599,7 @@ gimp_image_merge_layers (GimpImage *gimage,
/* Save old mode in undo */
if (bottom)
bottom -> mode = merge_layer -> mode;
bottom->mode = bottom_mode;
g_slist_free (reverse_list);
@ -3389,7 +3391,7 @@ gimp_image_construct_composite_preview (GimpImage *gimage,
floating_sel = layer;
else
{
if (floating_sel && GIMP_LAYER (floating_sel)->fs.drawable == layer)
if (floating_sel && floating_sel->fs.drawable == GIMP_DRAWABLE (layer))
reverse_list = g_slist_prepend (reverse_list, floating_sel);
reverse_list = g_slist_prepend (reverse_list, layer);

10
app/core/gimpprojection-construct.c
View File

@ -2397,6 +2397,7 @@ gimp_image_merge_layers (GimpImage *gimage,
Layer *merge_layer;
Layer *layer;
Layer *bottom;
gint bottom_mode;
guchar bg[4] = {0, 0, 0, 0};
GimpImageType type;
gint count;
@ -2411,6 +2412,7 @@ gimp_image_merge_layers (GimpImage *gimage,
type = RGBA_GIMAGE;
x1 = y1 = x2 = y2 = 0;
bottom = NULL;
bottom_mode = 0;
/* Get the layer extents */
count = 0;
@ -2549,9 +2551,9 @@ gimp_image_merge_layers (GimpImage *gimage,
* Keep a pointer to it so that we can set the mode right after it's been
* merged so that undo works correctly.
*/
layer->mode = NORMAL_MODE;
bottom = layer;
bottom_mode = bottom->mode;
bottom->mode = NORMAL_MODE;
}
while (reverse_list)
@ -2597,7 +2599,7 @@ gimp_image_merge_layers (GimpImage *gimage,
/* Save old mode in undo */
if (bottom)
bottom -> mode = merge_layer -> mode;
bottom->mode = bottom_mode;
g_slist_free (reverse_list);
@ -3389,7 +3391,7 @@ gimp_image_construct_composite_preview (GimpImage *gimage,
floating_sel = layer;
else
{
if (floating_sel && GIMP_LAYER (floating_sel)->fs.drawable == layer)
if (floating_sel && floating_sel->fs.drawable == GIMP_DRAWABLE (layer))
reverse_list = g_slist_prepend (reverse_list, floating_sel);
reverse_list = g_slist_prepend (reverse_list, layer);

10
app/gimpimage.c
View File

@ -2397,6 +2397,7 @@ gimp_image_merge_layers (GimpImage *gimage,
Layer *merge_layer;
Layer *layer;
Layer *bottom;
gint bottom_mode;
guchar bg[4] = {0, 0, 0, 0};
GimpImageType type;
gint count;
@ -2411,6 +2412,7 @@ gimp_image_merge_layers (GimpImage *gimage,
type = RGBA_GIMAGE;
x1 = y1 = x2 = y2 = 0;
bottom = NULL;
bottom_mode = 0;
/* Get the layer extents */
count = 0;
@ -2549,9 +2551,9 @@ gimp_image_merge_layers (GimpImage *gimage,
* Keep a pointer to it so that we can set the mode right after it's been
* merged so that undo works correctly.
*/
layer->mode = NORMAL_MODE;
bottom = layer;
bottom_mode = bottom->mode;
bottom->mode = NORMAL_MODE;
}
while (reverse_list)
@ -2597,7 +2599,7 @@ gimp_image_merge_layers (GimpImage *gimage,
/* Save old mode in undo */
if (bottom)
bottom -> mode = merge_layer -> mode;
bottom->mode = bottom_mode;
g_slist_free (reverse_list);
@ -3389,7 +3391,7 @@ gimp_image_construct_composite_preview (GimpImage *gimage,
floating_sel = layer;
else
{
if (floating_sel && GIMP_LAYER (floating_sel)->fs.drawable == layer)
if (floating_sel && floating_sel->fs.drawable == GIMP_DRAWABLE (layer))
reverse_list = g_slist_prepend (reverse_list, floating_sel);
reverse_list = g_slist_prepend (reverse_list, layer);