Commit 460b3e84 authored by Simon Budig's avatar Simon Budig Committed by Simon Budig
Browse files

Adjusted to make sure that no successive LINETOs to the same coordinate

2003-09-21  Simon Budig  <simon@gimp.org>

	* app/core/gimpscanconvert.c: Adjusted to make sure that
	no successive LINETOs to the same coordinate are in the
	path. Libart chokes on that.

	* app/core/gimpdrawable-stroke.c: Respect the offsets of the
	target drawable.

	* app/tools/gimpvectortool.c: Removed status message in
	VECTORS_FINISHED mode as requested by Ville Pätsi.

	* app/vectors/gimpvectors.c: Determine the stroke parameters
	from the current context (opacity/color/paint_mode).
	The other parameters are not yet supported.
parent 8c0012c5
2003-09-21 Simon Budig <simon@gimp.org>
* app/core/gimpscanconvert.c: Adjusted to make sure that
no successive LINETOs to the same coordinate are in the
path. Libart chokes on that.
* app/core/gimpdrawable-stroke.c: Respect the offsets of the
target drawable.
* app/tools/gimpvectortool.c: Removed status message in
VECTORS_FINISHED mode as requested by Ville Pätsi.
* app/vectors/gimpvectors.c: Determine the stroke parameters
from the current context (opacity/color/paint_mode).
The other parameters are not yet supported.
2003-09-21 Dave Neary <bolsh@gimp.org>
 
* app/gui/image-menu.c: Changed default shortcut for Redo to
......@@ -76,6 +76,8 @@ gimp_drawable_stroke_vectors (GimpDrawable *drawable,
w = x2 - x1;
h = y2 - y1;
gimp_item_offsets (GIMP_ITEM (drawable), &x2, &y2);
scan_convert = gimp_scan_convert_new (w, h, antialias ? 1 : 0);
/* For each Stroke in the vector, interpolate it, and add it to the
......@@ -122,7 +124,7 @@ gimp_drawable_stroke_vectors (GimpDrawable *drawable,
/* fill a 1-bpp Tilemanager with black, this will describe the shape
* of the stroke. */
mask = tile_manager_new (w, h, 1);
tile_manager_set_offsets (mask, x1, y1);
tile_manager_set_offsets (mask, x1+x2, y1+y2);
pixel_region_init (&maskPR, mask, 0, 0, w, h, TRUE);
color_region (&maskPR, bg);
......@@ -138,7 +140,7 @@ gimp_drawable_stroke_vectors (GimpDrawable *drawable,
/* Fill a TileManager with the stroke color */
gimp_rgb_get_uchar (color, &(ucolor[0]), &(ucolor[1]), &(ucolor[2]));
base = tile_manager_new (w, h, bytes);
tile_manager_set_offsets (base, x1, y1);
tile_manager_set_offsets (base, x1+x2, y1+y2);
pixel_region_init (&basePR, base, 0, 0, w, h, TRUE);
color_region (&basePR, ucolor);
......
......@@ -43,10 +43,13 @@ struct _GimpScanConvert
gboolean antialias; /* do we want antialiasing? */
/* record the first and last points so we can close the current polygon. */
/* stuff necessary for the _add_polygons API... :-/ */
gboolean got_first;
gboolean have_open;
gboolean need_closing;
GimpVector2 first;
GimpVector2 prev;
gboolean have_open;
guint num_nodes;
ArtVpath *vpath;
......@@ -55,7 +58,8 @@ struct _GimpScanConvert
};
/* Private functions */
static void gimp_scan_convert_finish (GimpScanConvert *sc);
static void gimp_scan_convert_finish (GimpScanConvert *sc);
static void gimp_scan_convert_close_add_points (GimpScanConvert *sc);
/* public functions */
GimpScanConvert *
......@@ -75,7 +79,9 @@ gimp_scan_convert_new (guint width,
sc->width = width;
sc->height = height;
sc->got_first = FALSE;
sc->got_first = FALSE;
sc->need_closing = FALSE;
sc->have_open = FALSE;
sc->num_nodes = 0;
......@@ -102,7 +108,6 @@ gimp_scan_convert_add_points (GimpScanConvert *sc,
GimpVector2 *points,
gboolean new_polygon)
{
GimpVector2 prev;
gint i;
g_return_if_fail (sc != NULL);
......@@ -111,36 +116,62 @@ gimp_scan_convert_add_points (GimpScanConvert *sc,
g_return_if_fail (sc->svp == NULL);
/* We need an extra nodes to end the path */
sc->vpath = art_renew (sc->vpath, ArtVpath, sc->num_nodes + n_points + 2);
sc->vpath = art_renew (sc->vpath, ArtVpath, sc->num_nodes + n_points + 1);
sc->vpath[sc->num_nodes].code = ((! sc->got_first) || new_polygon) ?
ART_MOVETO : ART_LINETO;
sc->vpath[sc->num_nodes].x = points[0].x;
sc->vpath[sc->num_nodes].y = points[0].y;
sc->num_nodes++;
sc->got_first = TRUE;
prev = points[0];
if (sc->num_nodes == 0 || new_polygon)
{
if (sc->need_closing)
gimp_scan_convert_close_add_points (sc);
for (i = 1; i < n_points; i++)
sc->got_first = FALSE;
}
/* We have to compress multiple identical coordinates */
for (i = 0; i < n_points; i++)
{
if (prev.x != points[i].x || prev.y != points[i].y)
if (sc->got_first == FALSE ||
sc->prev.x != points[i].x || sc->prev.y != points[i].y)
{
sc->vpath[sc->num_nodes].code = ART_LINETO;
sc->vpath[sc->num_nodes].code = ((! sc->got_first) || new_polygon) ?
ART_MOVETO : ART_LINETO;
sc->vpath[sc->num_nodes].x = points[i].x;
sc->vpath[sc->num_nodes].y = points[i].y;
sc->num_nodes++;
prev = points[i];
sc->prev = points[i];
if (!sc->got_first)
{
sc->got_first = TRUE;
sc->first = points[i];
}
}
}
/* for some reason we need to duplicate the last node?? */
sc->need_closing = TRUE;
sc->vpath[sc->num_nodes] = sc->vpath[sc->num_nodes - 1];
sc->num_nodes++;
sc->vpath[sc->num_nodes].code = ART_END;
}
static void
gimp_scan_convert_close_add_points (GimpScanConvert *sc)
{
if (sc->need_closing &&
(sc->prev.x != sc->first.x || sc->prev.y != sc->first.y))
{
sc->vpath = art_renew (sc->vpath, ArtVpath, sc->num_nodes + 2);
sc->vpath[sc->num_nodes].code = ART_LINETO;
sc->vpath[sc->num_nodes].x = sc->first.x;
sc->vpath[sc->num_nodes].y = sc->first.y;
sc->num_nodes++;
sc->vpath[sc->num_nodes].code = ART_END;
}
sc->need_closing = FALSE;
}
/* Add a polygon with "npoints" "points" that may be open or closed.
* It is not recommended to mix gimp_scan_convert_add_polyline with
* gimp_scan_convert_add_points.
......@@ -163,6 +194,9 @@ gimp_scan_convert_add_polyline (GimpScanConvert *sc,
g_return_if_fail (n_points > 0);
g_return_if_fail (sc->svp == NULL);
if (sc->need_closing)
gimp_scan_convert_close_add_points (sc);
if (!closed)
sc->have_open = TRUE;
......@@ -221,6 +255,9 @@ gimp_scan_convert_stroke (GimpScanConvert *sc,
g_return_if_fail (sc->svp == NULL);
if (sc->need_closing)
gimp_scan_convert_close_add_points (sc);
switch (join)
{
case GIMP_JOIN_MITER:
......@@ -344,8 +381,8 @@ gimp_scan_convert_finish (GimpScanConvert *sc)
g_return_if_fail (sc->vpath != NULL);
/* gimp_scan_convert_stroke (sc, GIMP_JOIN_MITER, GIMP_CAP_BUTT, 15.0);
*/
if (sc->need_closing)
gimp_scan_convert_close_add_points (sc);
if (sc->svp)
return; /* We already have a valid SVP */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment