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

app: add boundary_offset() which offsets BoundSegs in place 

and use it in gimp_region_select_tool_calculate().
Also fix boundary_transform() indentation.
This commit is contained in:
Michael Natterer 2010-09-23 10:47:59 +02:00
parent 4d0c750327
commit a0cb4fe805
3 changed files with 75 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
app/base/boundary.c
View File

@ -363,45 +363,69 @@ boundary_simplify (BoundSeg *sorted_segs,
/*Transform boundary based on a matrix*/
BoundSeg * boundary_transform (const BoundSeg *segs,
gint *num_segs,
GimpMatrix3 *matrix)
BoundSeg *
boundary_transform (const BoundSeg *segs,
gint *num_segs,
GimpMatrix3 *matrix)
{
Boundary *boundary = boundary_new (NULL);
gint i;
Boundary *boundary = boundary_new(NULL);
for (i = 0; i < *num_segs; i++)
{
/* dont transform sorting sentinels */
if (!(segs[i].x1 == -1 &&
segs[i].y1 == -1 &&
segs[i].x2 == -1 &&
segs[i].y2 == -1))
{
gdouble x1, y1, x2, y2;
gimp_matrix3_transform_point (matrix, segs[i].x1, segs[i].y1, &x1, &y1);
gimp_matrix3_transform_point (matrix, segs[i].x2, segs[i].y2, &x2, &y2);
boundary_add_seg (boundary,
(gint) ceil(x1), (gint) ceil(y1),
(gint) ceil(x2), (gint) ceil(y2),
segs[i].open);
}
else
{
/* Keep the sorting sentinel */
boundary_add_seg (boundary,
-1, -1,
-1, -1,
segs[i].open);
}
}
*num_segs = boundary->num_segs;
return boundary_free (boundary, FALSE);
}
void
boundary_offset (BoundSeg *segs,
gint num_segs,
gint off_x,
gint off_y)
{
gint i;
for (i = 0; i < *num_segs; i++)
for (i = 0; i < num_segs; i++)
{
/* dont offset sorting sentinels */
if (!(segs[i].x1 == -1 &&
segs[i].y1 == -1 &&
segs[i].x2 == -1 &&
segs[i].y2 == -1))
{
/*dont transform sorting sentinels*/
if (!(segs[i].x1 == -1 &&
segs[i].y1 == -1 &&
segs[i].x2 == -1 &&
segs[i].y2 == -1))
{
gdouble x1, y1, x2, y2;
gimp_matrix3_transform_point (matrix, segs[i].x1, segs[i].y1, &x1, &y1);
gimp_matrix3_transform_point (matrix, segs[i].x2, segs[i].y2, &x2, &y2);
boundary_add_seg (boundary,
(gint) ceil(x1), (gint) ceil(y1),
(gint) ceil(x2), (gint) ceil(y2),
segs[i].open);
}
else
{
/*Keep the sorting sentinel*/
boundary_add_seg (boundary,
-1, -1,
-1, -1,
segs[i].open);
}
segs[i].x1 += off_x;
segs[i].y1 += off_y;
segs[i].x2 += off_x;
segs[i].y2 += off_y;
}
*num_segs = boundary->num_segs;
return boundary_free(boundary, FALSE);
}
}

6
app/base/boundary.h
View File

@ -60,5 +60,11 @@ BoundSeg * boundary_transform (const BoundSeg *segs,
gint *num_segs,
GimpMatrix3 *matrix);
/* offsets in-place */
void boundary_offset (BoundSeg *segs,
gint num_segs,
gint off_x,
gint off_y);
#endif /* __BOUNDARY_H__ */

14
app/tools/gimpregionselecttool.c
View File

@ -381,10 +381,20 @@ gimp_region_select_tool_calculate (GimpRegionSelectTool *region_sel,
BOUNDARY_HALF_WAY,
num_segs);
if (! options->sample_merged)
{
GimpImage *image = gimp_display_get_image (display);
GimpDrawable *drawable = gimp_image_get_active_drawable (image);
gint off_x, off_y;
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
boundary_offset (bsegs, *num_segs, off_x, off_y);
}
segs = g_new (GdkSegment, *num_segs);
gimp_display_shell_transform_segments (shell, bsegs, segs, *num_segs,
! options->sample_merged);
gimp_display_shell_transform_segments (shell, bsegs, segs, *num_segs, FALSE);
g_free (bsegs);
gimp_display_shell_unset_override_cursor (shell);