callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

honor the destination drawable's offsets and stroke multi-stroke vectors

Browse Source 
2003-07-24  Michael Natterer  <mitch@gimp.org>

	* app/paint/gimppaintcore-stroke.c
	(gimp_paint_core_stroke_vectors): honor the destination drawable's
	offsets and stroke multi-stroke vectors correctly.
This commit is contained in:
Michael Natterer
2003-07-24 15:57:06 +00:00
committed by Michael Natterer
parent d75a2f79ba
commit fc3c1b41d9
2 changed files with 76 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2003-07-24 Michael Natterer <mitch@gimp.org>
* app/paint/gimppaintcore-stroke.c
(gimp_paint_core_stroke_vectors): honor the destination drawable's
offsets and stroke multi-stroke vectors correctly.
2003-07-24 Sven Neumann <sven@gimp.org> 2003-07-24 Sven Neumann <sven@gimp.org>
* app/config/Makefile.am * app/config/Makefile.am

54
app/paint/gimppaintcore-stroke.c
View File

@ -88,27 +88,43 @@ gimp_paint_core_stroke_vectors (GimpPaintCore *core,
{ {
GList *stroke; GList *stroke;
GArray *coords = NULL; GArray *coords = NULL;
gboolean initialized = FALSE;
gboolean closed; gboolean closed;
gint off_x, off_y;
gint vectors_off_x, vectors_off_y;
g_return_val_if_fail (GIMP_IS_PAINT_CORE (core), FALSE); g_return_val_if_fail (GIMP_IS_PAINT_CORE (core), FALSE);
g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), FALSE); g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), FALSE);
g_return_val_if_fail (GIMP_IS_PAINT_OPTIONS (paint_options), FALSE); g_return_val_if_fail (GIMP_IS_PAINT_OPTIONS (paint_options), FALSE);
g_return_val_if_fail (GIMP_IS_VECTORS (vectors), FALSE); g_return_val_if_fail (GIMP_IS_VECTORS (vectors), FALSE);
gimp_item_offsets (GIMP_ITEM (vectors), &vectors_off_x, &vectors_off_y);
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
off_x -= vectors_off_x;
off_y -= vectors_off_y;
for (stroke = vectors->strokes; stroke; stroke = stroke->next)
{
gint i;
coords = gimp_stroke_interpolate (GIMP_STROKE (stroke->data),
1.0, &closed);
/* gimp_stroke_interpolate() may return NULL, so iterate over the /* gimp_stroke_interpolate() may return NULL, so iterate over the
* list of strokes until one returns coords * list of strokes until one returns coords
*/ */
for (stroke = vectors->strokes; stroke; stroke = stroke->next) if (! coords)
continue;
for (i = 0; i < coords->len; i++)
{ {
coords = gimp_stroke_interpolate (GIMP_STROKE (stroke->data), g_array_index (coords, GimpCoords, i).x -= off_x;
1.0, &closed); g_array_index (coords, GimpCoords, i).y -= off_y;
if (coords)
break;
} }
if (! coords) if (! initialized)
return FALSE; {
if (! gimp_paint_core_start (core, drawable, paint_options, if (! gimp_paint_core_start (core, drawable, paint_options,
&(g_array_index (coords, GimpCoords, 0)))) &(g_array_index (coords, GimpCoords, 0))))
{ {
@ -116,12 +132,14 @@ gimp_paint_core_stroke_vectors (GimpPaintCore *core,
return FALSE; return FALSE;
} }
initialized = TRUE;
}
gimp_paint_core_paint (core, drawable, paint_options, INIT_PAINT); gimp_paint_core_paint (core, drawable, paint_options, INIT_PAINT);
do do
{ {
GimpBrush *current_brush; GimpBrush *current_brush;
gint i;
core->start_coords = g_array_index (coords, GimpCoords, 0); core->start_coords = g_array_index (coords, GimpCoords, 0);
core->last_coords = g_array_index (coords, GimpCoords, 0); core->last_coords = g_array_index (coords, GimpCoords, 0);
@ -150,28 +168,18 @@ gimp_paint_core_stroke_vectors (GimpPaintCore *core,
g_array_free (coords, TRUE); g_array_free (coords, TRUE);
coords = NULL; coords = NULL;
if (stroke->next)
{
stroke = stroke->next;
/* see above */
for ( ; stroke; stroke = stroke->next)
{
coords = gimp_stroke_interpolate (GIMP_STROKE (stroke),
1.0, &closed);
if (coords)
break;
}
}
} }
while (coords); while (coords);
gimp_paint_core_paint (core, drawable, paint_options, FINISH_PAINT); gimp_paint_core_paint (core, drawable, paint_options, FINISH_PAINT);
}
if (initialized)
{
gimp_paint_core_finish (core, drawable); gimp_paint_core_finish (core, drawable);
gimp_paint_core_cleanup (core); gimp_paint_core_cleanup (core);
}
return TRUE; return TRUE;
} }