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

fixed a small typo that prevented the composite image from being updated 

Wed Jul  8 21:08:03 CDT 1998  Larry Ewing  <lewing@gimp.org>

	* app/gimpimage.c (gimp_image_raise_layer): fixed a small typo
	that prevented the composite image from being updated properly


CV: ----------------------------------------------------------------------
This commit is contained in:
CDT 1998 Larry Ewing 1998-07-09 02:07:37 +00:00 committed by Larry Ewing
parent 57abc91fd9
commit 1a1393983b
9 changed files with 117 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Jul 8 21:08:03 CDT 1998 Larry Ewing <lewing@gimp.org>
* app/gimpimage.c (gimp_image_raise_layer): fixed a small typo
that prevented the composite image from being updated properly
Wed Jul 8 10:47:51 CDT 1998 Larry Ewing <lewing@gimp.org>
* app/preferences_dialog.c: replaced old invalidate calls

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

@ -1583,13 +1583,14 @@ gimp_image_raise_layer (GimpImage *gimage, Layer *layer_arg)
x1 = MAX (off_x, off2_x);
y1 = MAX (off_y, off2_y);
x2 = MIN (off_x + drawable_width (GIMP_DRAWABLE(layer)),
off2_x + drawable_width (GIMP_DRAWABLE(prev_layer)));
off2_x + drawable_width (GIMP_DRAWABLE(prev_layer)));
y2 = MIN (off_y + drawable_height (GIMP_DRAWABLE(layer)),
off2_y + drawable_height (GIMP_DRAWABLE(prev_layer)));
off2_y + drawable_height (GIMP_DRAWABLE(prev_layer)));
if ((x2 - x1) > 0 && (y2 - y1) > 0)
gtk_signal_emit(GTK_OBJECT(gimage),
gimp_image_signals[REPAINT],
x1, x2, x2-x1, y2-y1);
gtk_signal_emit(GTK_OBJECT(gimage),
gimp_image_signals[REPAINT],
x1, y1, x2-x1, y2-y1);
/* invalidate the composite preview */
gimp_image_invalidate_preview (gimage);
@ -1649,19 +1650,20 @@ gimp_image_lower_layer (GimpImage *gimage, Layer *layer_arg)
next->data = layer;
drawable_offsets (GIMP_DRAWABLE(layer), &off_x, &off_y);
drawable_offsets (GIMP_DRAWABLE(next_layer), &off2_x, &off2_y);
/* calculate minimum area to update */
x1 = MAX (off_x, off2_x);
y1 = MAX (off_y, off2_y);
x2 = MIN (off_x + drawable_width (GIMP_DRAWABLE(layer)),
off2_x + drawable_width (GIMP_DRAWABLE(next_layer)));
off2_x + drawable_width (GIMP_DRAWABLE(next_layer)));
y2 = MIN (off_y + drawable_height (GIMP_DRAWABLE(layer)),
off2_y + drawable_height (GIMP_DRAWABLE(next_layer)));
if ((x2 - x1) > 0 && (y2 - y1) > 0)
gtk_signal_emit(GTK_OBJECT(gimage),
gimp_image_signals[REPAINT],
x1, y1, x2-x1, y2-y1);
off2_y + drawable_height (GIMP_DRAWABLE(next_layer)));
if ((x2 - x1) > 0 && (y2 - y1) > 0)
gtk_signal_emit(GTK_OBJECT(gimage),
gimp_image_signals[REPAINT],
x1, y1, x2-x1, y2-y1);
/* invalidate the composite preview */
gimp_image_invalidate_preview (gimage);

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

@ -1583,13 +1583,14 @@ gimp_image_raise_layer (GimpImage *gimage, Layer *layer_arg)
x1 = MAX (off_x, off2_x);
y1 = MAX (off_y, off2_y);
x2 = MIN (off_x + drawable_width (GIMP_DRAWABLE(layer)),
off2_x + drawable_width (GIMP_DRAWABLE(prev_layer)));
off2_x + drawable_width (GIMP_DRAWABLE(prev_layer)));
y2 = MIN (off_y + drawable_height (GIMP_DRAWABLE(layer)),
off2_y + drawable_height (GIMP_DRAWABLE(prev_layer)));
off2_y + drawable_height (GIMP_DRAWABLE(prev_layer)));
if ((x2 - x1) > 0 && (y2 - y1) > 0)
gtk_signal_emit(GTK_OBJECT(gimage),
gimp_image_signals[REPAINT],
x1, x2, x2-x1, y2-y1);
gtk_signal_emit(GTK_OBJECT(gimage),
gimp_image_signals[REPAINT],
x1, y1, x2-x1, y2-y1);
/* invalidate the composite preview */
gimp_image_invalidate_preview (gimage);
@ -1649,19 +1650,20 @@ gimp_image_lower_layer (GimpImage *gimage, Layer *layer_arg)
next->data = layer;
drawable_offsets (GIMP_DRAWABLE(layer), &off_x, &off_y);
drawable_offsets (GIMP_DRAWABLE(next_layer), &off2_x, &off2_y);
/* calculate minimum area to update */
x1 = MAX (off_x, off2_x);
y1 = MAX (off_y, off2_y);
x2 = MIN (off_x + drawable_width (GIMP_DRAWABLE(layer)),
off2_x + drawable_width (GIMP_DRAWABLE(next_layer)));
off2_x + drawable_width (GIMP_DRAWABLE(next_layer)));
y2 = MIN (off_y + drawable_height (GIMP_DRAWABLE(layer)),
off2_y + drawable_height (GIMP_DRAWABLE(next_layer)));
if ((x2 - x1) > 0 && (y2 - y1) > 0)
gtk_signal_emit(GTK_OBJECT(gimage),
gimp_image_signals[REPAINT],
x1, y1, x2-x1, y2-y1);
off2_y + drawable_height (GIMP_DRAWABLE(next_layer)));
if ((x2 - x1) > 0 && (y2 - y1) > 0)
gtk_signal_emit(GTK_OBJECT(gimage),
gimp_image_signals[REPAINT],
x1, y1, x2-x1, y2-y1);
/* invalidate the composite preview */
gimp_image_invalidate_preview (gimage);

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

@ -1583,13 +1583,14 @@ gimp_image_raise_layer (GimpImage *gimage, Layer *layer_arg)
x1 = MAX (off_x, off2_x);
y1 = MAX (off_y, off2_y);
x2 = MIN (off_x + drawable_width (GIMP_DRAWABLE(layer)),
off2_x + drawable_width (GIMP_DRAWABLE(prev_layer)));
off2_x + drawable_width (GIMP_DRAWABLE(prev_layer)));
y2 = MIN (off_y + drawable_height (GIMP_DRAWABLE(layer)),
off2_y + drawable_height (GIMP_DRAWABLE(prev_layer)));
off2_y + drawable_height (GIMP_DRAWABLE(prev_layer)));
if ((x2 - x1) > 0 && (y2 - y1) > 0)
gtk_signal_emit(GTK_OBJECT(gimage),
gimp_image_signals[REPAINT],
x1, x2, x2-x1, y2-y1);
gtk_signal_emit(GTK_OBJECT(gimage),
gimp_image_signals[REPAINT],
x1, y1, x2-x1, y2-y1);
/* invalidate the composite preview */
gimp_image_invalidate_preview (gimage);
@ -1649,19 +1650,20 @@ gimp_image_lower_layer (GimpImage *gimage, Layer *layer_arg)
next->data = layer;
drawable_offsets (GIMP_DRAWABLE(layer), &off_x, &off_y);
drawable_offsets (GIMP_DRAWABLE(next_layer), &off2_x, &off2_y);
/* calculate minimum area to update */
x1 = MAX (off_x, off2_x);
y1 = MAX (off_y, off2_y);
x2 = MIN (off_x + drawable_width (GIMP_DRAWABLE(layer)),
off2_x + drawable_width (GIMP_DRAWABLE(next_layer)));
off2_x + drawable_width (GIMP_DRAWABLE(next_layer)));
y2 = MIN (off_y + drawable_height (GIMP_DRAWABLE(layer)),
off2_y + drawable_height (GIMP_DRAWABLE(next_layer)));
if ((x2 - x1) > 0 && (y2 - y1) > 0)
gtk_signal_emit(GTK_OBJECT(gimage),
gimp_image_signals[REPAINT],
x1, y1, x2-x1, y2-y1);
off2_y + drawable_height (GIMP_DRAWABLE(next_layer)));
if ((x2 - x1) > 0 && (y2 - y1) > 0)
gtk_signal_emit(GTK_OBJECT(gimage),
gimp_image_signals[REPAINT],
x1, y1, x2-x1, y2-y1);
/* invalidate the composite preview */
gimp_image_invalidate_preview (gimage);

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

@ -1583,13 +1583,14 @@ gimp_image_raise_layer (GimpImage *gimage, Layer *layer_arg)
x1 = MAX (off_x, off2_x);
y1 = MAX (off_y, off2_y);
x2 = MIN (off_x + drawable_width (GIMP_DRAWABLE(layer)),
off2_x + drawable_width (GIMP_DRAWABLE(prev_layer)));
off2_x + drawable_width (GIMP_DRAWABLE(prev_layer)));
y2 = MIN (off_y + drawable_height (GIMP_DRAWABLE(layer)),
off2_y + drawable_height (GIMP_DRAWABLE(prev_layer)));
off2_y + drawable_height (GIMP_DRAWABLE(prev_layer)));
if ((x2 - x1) > 0 && (y2 - y1) > 0)
gtk_signal_emit(GTK_OBJECT(gimage),
gimp_image_signals[REPAINT],
x1, x2, x2-x1, y2-y1);
gtk_signal_emit(GTK_OBJECT(gimage),
gimp_image_signals[REPAINT],
x1, y1, x2-x1, y2-y1);
/* invalidate the composite preview */
gimp_image_invalidate_preview (gimage);
@ -1649,19 +1650,20 @@ gimp_image_lower_layer (GimpImage *gimage, Layer *layer_arg)
next->data = layer;
drawable_offsets (GIMP_DRAWABLE(layer), &off_x, &off_y);
drawable_offsets (GIMP_DRAWABLE(next_layer), &off2_x, &off2_y);
/* calculate minimum area to update */
x1 = MAX (off_x, off2_x);
y1 = MAX (off_y, off2_y);
x2 = MIN (off_x + drawable_width (GIMP_DRAWABLE(layer)),
off2_x + drawable_width (GIMP_DRAWABLE(next_layer)));
off2_x + drawable_width (GIMP_DRAWABLE(next_layer)));
y2 = MIN (off_y + drawable_height (GIMP_DRAWABLE(layer)),
off2_y + drawable_height (GIMP_DRAWABLE(next_layer)));
if ((x2 - x1) > 0 && (y2 - y1) > 0)
gtk_signal_emit(GTK_OBJECT(gimage),
gimp_image_signals[REPAINT],
x1, y1, x2-x1, y2-y1);
off2_y + drawable_height (GIMP_DRAWABLE(next_layer)));
if ((x2 - x1) > 0 && (y2 - y1) > 0)
gtk_signal_emit(GTK_OBJECT(gimage),
gimp_image_signals[REPAINT],
x1, y1, x2-x1, y2-y1);
/* invalidate the composite preview */
gimp_image_invalidate_preview (gimage);

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

@ -1583,13 +1583,14 @@ gimp_image_raise_layer (GimpImage *gimage, Layer *layer_arg)
x1 = MAX (off_x, off2_x);
y1 = MAX (off_y, off2_y);
x2 = MIN (off_x + drawable_width (GIMP_DRAWABLE(layer)),
off2_x + drawable_width (GIMP_DRAWABLE(prev_layer)));
off2_x + drawable_width (GIMP_DRAWABLE(prev_layer)));
y2 = MIN (off_y + drawable_height (GIMP_DRAWABLE(layer)),
off2_y + drawable_height (GIMP_DRAWABLE(prev_layer)));
off2_y + drawable_height (GIMP_DRAWABLE(prev_layer)));
if ((x2 - x1) > 0 && (y2 - y1) > 0)
gtk_signal_emit(GTK_OBJECT(gimage),
gimp_image_signals[REPAINT],
x1, x2, x2-x1, y2-y1);
gtk_signal_emit(GTK_OBJECT(gimage),
gimp_image_signals[REPAINT],
x1, y1, x2-x1, y2-y1);
/* invalidate the composite preview */
gimp_image_invalidate_preview (gimage);
@ -1649,19 +1650,20 @@ gimp_image_lower_layer (GimpImage *gimage, Layer *layer_arg)
next->data = layer;
drawable_offsets (GIMP_DRAWABLE(layer), &off_x, &off_y);
drawable_offsets (GIMP_DRAWABLE(next_layer), &off2_x, &off2_y);
/* calculate minimum area to update */
x1 = MAX (off_x, off2_x);
y1 = MAX (off_y, off2_y);
x2 = MIN (off_x + drawable_width (GIMP_DRAWABLE(layer)),
off2_x + drawable_width (GIMP_DRAWABLE(next_layer)));
off2_x + drawable_width (GIMP_DRAWABLE(next_layer)));
y2 = MIN (off_y + drawable_height (GIMP_DRAWABLE(layer)),
off2_y + drawable_height (GIMP_DRAWABLE(next_layer)));
if ((x2 - x1) > 0 && (y2 - y1) > 0)
gtk_signal_emit(GTK_OBJECT(gimage),
gimp_image_signals[REPAINT],
x1, y1, x2-x1, y2-y1);
off2_y + drawable_height (GIMP_DRAWABLE(next_layer)));
if ((x2 - x1) > 0 && (y2 - y1) > 0)
gtk_signal_emit(GTK_OBJECT(gimage),
gimp_image_signals[REPAINT],
x1, y1, x2-x1, y2-y1);
/* invalidate the composite preview */
gimp_image_invalidate_preview (gimage);

26
app/core/gimpimage.c
View File

@ -1583,13 +1583,14 @@ gimp_image_raise_layer (GimpImage *gimage, Layer *layer_arg)
x1 = MAX (off_x, off2_x);
y1 = MAX (off_y, off2_y);
x2 = MIN (off_x + drawable_width (GIMP_DRAWABLE(layer)),
off2_x + drawable_width (GIMP_DRAWABLE(prev_layer)));
off2_x + drawable_width (GIMP_DRAWABLE(prev_layer)));
y2 = MIN (off_y + drawable_height (GIMP_DRAWABLE(layer)),
off2_y + drawable_height (GIMP_DRAWABLE(prev_layer)));
off2_y + drawable_height (GIMP_DRAWABLE(prev_layer)));
if ((x2 - x1) > 0 && (y2 - y1) > 0)
gtk_signal_emit(GTK_OBJECT(gimage),
gimp_image_signals[REPAINT],
x1, x2, x2-x1, y2-y1);
gtk_signal_emit(GTK_OBJECT(gimage),
gimp_image_signals[REPAINT],
x1, y1, x2-x1, y2-y1);
/* invalidate the composite preview */
gimp_image_invalidate_preview (gimage);
@ -1649,19 +1650,20 @@ gimp_image_lower_layer (GimpImage *gimage, Layer *layer_arg)
next->data = layer;
drawable_offsets (GIMP_DRAWABLE(layer), &off_x, &off_y);
drawable_offsets (GIMP_DRAWABLE(next_layer), &off2_x, &off2_y);
/* calculate minimum area to update */
x1 = MAX (off_x, off2_x);
y1 = MAX (off_y, off2_y);
x2 = MIN (off_x + drawable_width (GIMP_DRAWABLE(layer)),
off2_x + drawable_width (GIMP_DRAWABLE(next_layer)));
off2_x + drawable_width (GIMP_DRAWABLE(next_layer)));
y2 = MIN (off_y + drawable_height (GIMP_DRAWABLE(layer)),
off2_y + drawable_height (GIMP_DRAWABLE(next_layer)));
if ((x2 - x1) > 0 && (y2 - y1) > 0)
gtk_signal_emit(GTK_OBJECT(gimage),
gimp_image_signals[REPAINT],
x1, y1, x2-x1, y2-y1);
off2_y + drawable_height (GIMP_DRAWABLE(next_layer)));
if ((x2 - x1) > 0 && (y2 - y1) > 0)
gtk_signal_emit(GTK_OBJECT(gimage),
gimp_image_signals[REPAINT],
x1, y1, x2-x1, y2-y1);
/* invalidate the composite preview */
gimp_image_invalidate_preview (gimage);

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

@ -1583,13 +1583,14 @@ gimp_image_raise_layer (GimpImage *gimage, Layer *layer_arg)
x1 = MAX (off_x, off2_x);
y1 = MAX (off_y, off2_y);
x2 = MIN (off_x + drawable_width (GIMP_DRAWABLE(layer)),
off2_x + drawable_width (GIMP_DRAWABLE(prev_layer)));
off2_x + drawable_width (GIMP_DRAWABLE(prev_layer)));
y2 = MIN (off_y + drawable_height (GIMP_DRAWABLE(layer)),
off2_y + drawable_height (GIMP_DRAWABLE(prev_layer)));
off2_y + drawable_height (GIMP_DRAWABLE(prev_layer)));
if ((x2 - x1) > 0 && (y2 - y1) > 0)
gtk_signal_emit(GTK_OBJECT(gimage),
gimp_image_signals[REPAINT],
x1, x2, x2-x1, y2-y1);
gtk_signal_emit(GTK_OBJECT(gimage),
gimp_image_signals[REPAINT],
x1, y1, x2-x1, y2-y1);
/* invalidate the composite preview */
gimp_image_invalidate_preview (gimage);
@ -1649,19 +1650,20 @@ gimp_image_lower_layer (GimpImage *gimage, Layer *layer_arg)
next->data = layer;
drawable_offsets (GIMP_DRAWABLE(layer), &off_x, &off_y);
drawable_offsets (GIMP_DRAWABLE(next_layer), &off2_x, &off2_y);
/* calculate minimum area to update */
x1 = MAX (off_x, off2_x);
y1 = MAX (off_y, off2_y);
x2 = MIN (off_x + drawable_width (GIMP_DRAWABLE(layer)),
off2_x + drawable_width (GIMP_DRAWABLE(next_layer)));
off2_x + drawable_width (GIMP_DRAWABLE(next_layer)));
y2 = MIN (off_y + drawable_height (GIMP_DRAWABLE(layer)),
off2_y + drawable_height (GIMP_DRAWABLE(next_layer)));
if ((x2 - x1) > 0 && (y2 - y1) > 0)
gtk_signal_emit(GTK_OBJECT(gimage),
gimp_image_signals[REPAINT],
x1, y1, x2-x1, y2-y1);
off2_y + drawable_height (GIMP_DRAWABLE(next_layer)));
if ((x2 - x1) > 0 && (y2 - y1) > 0)
gtk_signal_emit(GTK_OBJECT(gimage),
gimp_image_signals[REPAINT],
x1, y1, x2-x1, y2-y1);
/* invalidate the composite preview */
gimp_image_invalidate_preview (gimage);

26
app/gimpimage.c
View File

@ -1583,13 +1583,14 @@ gimp_image_raise_layer (GimpImage *gimage, Layer *layer_arg)
x1 = MAX (off_x, off2_x);
y1 = MAX (off_y, off2_y);
x2 = MIN (off_x + drawable_width (GIMP_DRAWABLE(layer)),
off2_x + drawable_width (GIMP_DRAWABLE(prev_layer)));
off2_x + drawable_width (GIMP_DRAWABLE(prev_layer)));
y2 = MIN (off_y + drawable_height (GIMP_DRAWABLE(layer)),
off2_y + drawable_height (GIMP_DRAWABLE(prev_layer)));
off2_y + drawable_height (GIMP_DRAWABLE(prev_layer)));
if ((x2 - x1) > 0 && (y2 - y1) > 0)
gtk_signal_emit(GTK_OBJECT(gimage),
gimp_image_signals[REPAINT],
x1, x2, x2-x1, y2-y1);
gtk_signal_emit(GTK_OBJECT(gimage),
gimp_image_signals[REPAINT],
x1, y1, x2-x1, y2-y1);
/* invalidate the composite preview */
gimp_image_invalidate_preview (gimage);
@ -1649,19 +1650,20 @@ gimp_image_lower_layer (GimpImage *gimage, Layer *layer_arg)
next->data = layer;
drawable_offsets (GIMP_DRAWABLE(layer), &off_x, &off_y);
drawable_offsets (GIMP_DRAWABLE(next_layer), &off2_x, &off2_y);
/* calculate minimum area to update */
x1 = MAX (off_x, off2_x);
y1 = MAX (off_y, off2_y);
x2 = MIN (off_x + drawable_width (GIMP_DRAWABLE(layer)),
off2_x + drawable_width (GIMP_DRAWABLE(next_layer)));
off2_x + drawable_width (GIMP_DRAWABLE(next_layer)));
y2 = MIN (off_y + drawable_height (GIMP_DRAWABLE(layer)),
off2_y + drawable_height (GIMP_DRAWABLE(next_layer)));
if ((x2 - x1) > 0 && (y2 - y1) > 0)
gtk_signal_emit(GTK_OBJECT(gimage),
gimp_image_signals[REPAINT],
x1, y1, x2-x1, y2-y1);
off2_y + drawable_height (GIMP_DRAWABLE(next_layer)));
if ((x2 - x1) > 0 && (y2 - y1) > 0)
gtk_signal_emit(GTK_OBJECT(gimage),
gimp_image_signals[REPAINT],
x1, y1, x2-x1, y2-y1);
/* invalidate the composite preview */
gimp_image_invalidate_preview (gimage);