From cb13929f5c57816fb2891e4ad4e8174a6a6873ef Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Thu, 22 May 2008 16:58:21 +0000 Subject: [PATCH] app/tools/gimpfreeselecttool.[ch] Fix that some 2008-05-22 Martin Nordholts * app/tools/gimpfreeselecttool.[ch] * app/tools/gimpforegroundselecttool.c: Fix that some gimp_free_select_tool_-functions had the wrong name. svn path=/trunk/; revision=25759 --- ChangeLog | 6 +++ app/tools/gimpforegroundselecttool.c | 6 +-- app/tools/gimpfreeselecttool.c | 76 ++++++++++++++-------------- app/tools/gimpfreeselecttool.h | 16 +++--- 4 files changed, 55 insertions(+), 49 deletions(-) diff --git a/ChangeLog b/ChangeLog index a3daa5841f..a31027ed6e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-05-22 Martin Nordholts + + * app/tools/gimpfreeselecttool.[ch] + * app/tools/gimpforegroundselecttool.c: Fix that some + gimp_free_select_tool_-functions had the wrong name. + 2008-05-22 Michael Natterer Applied slightly modified and fixed patch from Alexia Death which diff --git a/app/tools/gimpforegroundselecttool.c b/app/tools/gimpforegroundselecttool.c index e634178706..57ac51512b 100644 --- a/app/tools/gimpforegroundselecttool.c +++ b/app/tools/gimpforegroundselecttool.c @@ -642,9 +642,9 @@ gimp_foreground_select_tool_select (GimpFreeSelectTool *free_sel, scan_convert = gimp_scan_convert_new (); - gimp_free_select_get_points (free_sel, - &points, - &n_points); + gimp_free_select_tool_get_points (free_sel, + &points, + &n_points); gimp_scan_convert_add_polyline (scan_convert, n_points, diff --git a/app/tools/gimpfreeselecttool.c b/app/tools/gimpfreeselecttool.c index 8c87095ea1..a10eaed56b 100644 --- a/app/tools/gimpfreeselecttool.c +++ b/app/tools/gimpfreeselecttool.c @@ -241,11 +241,11 @@ gimp_free_select_tool_finalize (GObject *object) } static void -gimp_free_select_get_segment (GimpFreeSelectTool *fst, - GimpVector2 **points, - gint *n_points, - gint segment_start, - gint segment_end) +gimp_free_select_tool_get_segment (GimpFreeSelectTool *fst, + GimpVector2 **points, + gint *n_points, + gint segment_start, + gint segment_end) { Private *priv = GET_PRIVATE (fst); @@ -604,11 +604,11 @@ gimp_free_select_tool_move_segment_vertex_to (GimpFreeSelectTool *fst, /* Handle the segment before the grabbed point */ if (segment_index > 0) { - gimp_free_select_get_segment (fst, - &dest, - &n_points, - priv->grabbed_segment_index - 1, - priv->grabbed_segment_index); + gimp_free_select_tool_get_segment (fst, + &dest, + &n_points, + priv->grabbed_segment_index - 1, + priv->grabbed_segment_index); dest_start_target = &dest[0]; dest_end_target = &cursor_point; @@ -624,11 +624,11 @@ gimp_free_select_tool_move_segment_vertex_to (GimpFreeSelectTool *fst, /* Handle the segment after the grabbed point */ if (segment_index < priv->n_segment_indices - 1) { - gimp_free_select_get_segment (fst, - &dest, - &n_points, - priv->grabbed_segment_index, - priv->grabbed_segment_index + 1); + gimp_free_select_tool_get_segment (fst, + &dest, + &n_points, + priv->grabbed_segment_index, + priv->grabbed_segment_index + 1); dest_start_target = &cursor_point; dest_end_target = &dest[n_points - 1]; @@ -736,11 +736,11 @@ gimp_free_select_tool_revert_to_saved_state (GimpFreeSelectTool *fst) if (priv->grabbed_segment_index > 0) { - gimp_free_select_get_segment (fst, - &source, - &n_points, - priv->grabbed_segment_index - 1, - priv->grabbed_segment_index); + gimp_free_select_tool_get_segment (fst, + &source, + &n_points, + priv->grabbed_segment_index - 1, + priv->grabbed_segment_index); memcpy (source, priv->saved_points_lower_segment, @@ -749,11 +749,11 @@ gimp_free_select_tool_revert_to_saved_state (GimpFreeSelectTool *fst) if (priv->grabbed_segment_index < priv->n_segment_indices - 1) { - gimp_free_select_get_segment (fst, - &source, - &n_points, - priv->grabbed_segment_index, - priv->grabbed_segment_index + 1); + gimp_free_select_tool_get_segment (fst, + &source, + &n_points, + priv->grabbed_segment_index, + priv->grabbed_segment_index + 1); memcpy (source, priv->saved_points_higher_segment, @@ -794,11 +794,11 @@ gimp_free_select_tool_prepare_for_move (GimpFreeSelectTool *fst) if (priv->grabbed_segment_index > 0) { - gimp_free_select_get_segment (fst, - &source, - &n_points, - priv->grabbed_segment_index - 1, - priv->grabbed_segment_index); + gimp_free_select_tool_get_segment (fst, + &source, + &n_points, + priv->grabbed_segment_index - 1, + priv->grabbed_segment_index); priv->saved_points_lower_segment = g_new0 (GimpVector2, n_points); @@ -809,11 +809,11 @@ gimp_free_select_tool_prepare_for_move (GimpFreeSelectTool *fst) if (priv->grabbed_segment_index < priv->n_segment_indices - 1) { - gimp_free_select_get_segment (fst, - &source, - &n_points, - priv->grabbed_segment_index, - priv->grabbed_segment_index + 1); + gimp_free_select_tool_get_segment (fst, + &source, + &n_points, + priv->grabbed_segment_index, + priv->grabbed_segment_index + 1); priv->saved_points_higher_segment = g_new0 (GimpVector2, n_points); @@ -1192,9 +1192,9 @@ gimp_free_select_tool_real_select (GimpFreeSelectTool *fst, } void -gimp_free_select_get_points (GimpFreeSelectTool *fst, - const GimpVector2 **points, - gint *n_points) +gimp_free_select_tool_get_points (GimpFreeSelectTool *fst, + const GimpVector2 **points, + gint *n_points) { Private *priv = GET_PRIVATE (fst); diff --git a/app/tools/gimpfreeselecttool.h b/app/tools/gimpfreeselecttool.h index e8f46b1c7a..40154c2d58 100644 --- a/app/tools/gimpfreeselecttool.h +++ b/app/tools/gimpfreeselecttool.h @@ -52,17 +52,17 @@ struct _GimpFreeSelectToolClass }; -void gimp_free_select_tool_register (GimpToolRegisterCallback callback, - gpointer data); +void gimp_free_select_tool_register (GimpToolRegisterCallback callback, + gpointer data); -GType gimp_free_select_tool_get_type (void) G_GNUC_CONST; +GType gimp_free_select_tool_get_type (void) G_GNUC_CONST; -void gimp_free_select_tool_select (GimpFreeSelectTool *free_sel, - GimpDisplay *display); +void gimp_free_select_tool_select (GimpFreeSelectTool *free_sel, + GimpDisplay *display); -void gimp_free_select_get_points (GimpFreeSelectTool *free_sel, - const GimpVector2 **points, - gint *n_points); +void gimp_free_select_tool_get_points (GimpFreeSelectTool *free_sel, + const GimpVector2 **points, + gint *n_points); #endif /* __GIMP_FREE_SELECT_TOOL_H__ */