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

Fixed a merge error. --sg

This commit is contained in:
scott 1998-08-15 20:03:04 +00:00
parent 85393964a0
commit 01e6a823ad
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
Sat Aug 15 14:09:12 1998 Scott Goehring <scott@poverty.bloomington.in.us>
* app/transform_core.c (transform_core_do): Fixed a merge error
that I missed on the last commit.
* blend.c boundary.c by_color_select.c channel.c color_picker.c
convert.c drawable_cmds.c file_new_dialog.c flip_tool.c
floating_sel.c fuzzy_select.c gimage_mask.c gimpimage.c

5
app/tools/transform_core.c
View File

@ -1195,11 +1195,6 @@ transform_core_do (gimage, drawable, float_tiles, interpolation, matrix)
x2 = x1 + float_tiles->width;
y2 = y1 + float_tiles->height;
transform_point (matrix, x1, y1, &dx1, &dy1);
transform_point (matrix, x2, y1, &dx2, &dy2);
transform_point (matrix, x1, y2, &dx3, &dy3);
transform_point (matrix, x2, y2, &dx4, &dy4);
/* Find the bounding coordinates */
if (active_tool && transform_tool_clip ())
{

5
app/transform_core.c
View File

@ -1195,11 +1195,6 @@ transform_core_do (gimage, drawable, float_tiles, interpolation, matrix)
x2 = x1 + float_tiles->width;
y2 = y1 + float_tiles->height;
transform_point (matrix, x1, y1, &dx1, &dy1);
transform_point (matrix, x2, y1, &dx2, &dy2);
transform_point (matrix, x1, y2, &dx3, &dy3);
transform_point (matrix, x2, y2, &dx4, &dy4);
/* Find the bounding coordinates */
if (active_tool && transform_tool_clip ())
{