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

removed redundant GimpCoords parameter that use to cause valgrind warnings

Browse Source 
2008-01-28  Sven Neumann  <sven@gimp.org>

	* app/display/gimpdisplayshell.[ch] (gimp_display_shell_snap_coords):
	removed redundant GimpCoords parameter that use to cause valgrind
	warnings about overlapping memory regions in memcpy().

	* app/display/gimpdisplayshell-callbacks.c
	* app/display/gimpdisplayshell-autoscroll.c: changed accordingly.

svn path=/trunk/; revision=24730
This commit is contained in:
Sven Neumann
2008-01-28 16:00:30 +00:00
committed by Sven Neumann
parent d3e1c997c9
commit 8c30b1cda5
5 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2008-01-28 Sven Neumann <sven@gimp.org>
* app/display/gimpdisplayshell.[ch] (gimp_display_shell_snap_coords):
removed redundant GimpCoords parameter that use to cause valgrind
warnings about overlapping memory regions in memcpy().
* app/display/gimpdisplayshell-callbacks.c
* app/display/gimpdisplayshell-autoscroll.c: changed accordingly.
2008-01-28 Sven Neumann <sven@gimp.org>
* plug-ins/common/cubism.c: minor cleanups.

1
app/display/gimpdisplayshell-autoscroll.c
View File

@ -153,7 +153,6 @@ gimp_display_shell_autoscroll_timeout (gpointer data)
&x, &y, &width, &height);
gimp_display_shell_snap_coords (shell,
&image_coords,
&image_coords,
x, y, width, height);
}

4
app/display/gimpdisplayshell-callbacks.c
View File

@ -660,7 +660,6 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
&x, &y, &width, &height);
if (gimp_display_shell_snap_coords (shell,
&image_coords,
&image_coords,
x, y, width, height))
{
@ -1084,7 +1083,6 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
&x, &y, &width, &height);
if (gimp_display_shell_snap_coords (shell,
&image_coords,
&image_coords,
x, y, width, height))
{
@ -1144,7 +1142,6 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
&x, &y, &width, &height);
gimp_display_shell_snap_coords (shell,
&image_coords,
&image_coords,
x, y, width, height);
}
@ -1239,7 +1236,6 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
&x, &y, &width, &height);
gimp_display_shell_snap_coords (shell,
&image_coords,
&image_coords,
x, y, width, height);
}

30
app/display/gimpdisplayshell.c
View File

@ -1227,32 +1227,31 @@ gimp_display_shell_get_unit (GimpDisplayShell *shell)
gboolean
gimp_display_shell_snap_coords (GimpDisplayShell *shell,
GimpCoords *coords,
GimpCoords *snapped_coords,
gint snap_offset_x,
gint snap_offset_y,
gint snap_width,
gint snap_height)
{
gboolean snap_to_guides = FALSE;
gboolean snap_to_grid = FALSE;
gboolean snap_to_canvas = FALSE;
gboolean snap_to_vectors = FALSE;
gboolean snapped = FALSE;
GimpImage *image;
gboolean snap_to_guides = FALSE;
gboolean snap_to_grid = FALSE;
gboolean snap_to_canvas = FALSE;
gboolean snap_to_vectors = FALSE;
gboolean snapped = FALSE;
g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), FALSE);
g_return_val_if_fail (coords != NULL, FALSE);
g_return_val_if_fail (snapped_coords != NULL, FALSE);
*snapped_coords = *coords;
image = shell->display->image;
if (gimp_display_shell_get_snap_to_guides (shell) &&
gimp_image_get_guides (shell->display->image))
gimp_image_get_guides (image))
{
snap_to_guides = TRUE;
}
if (gimp_display_shell_get_snap_to_grid (shell) &&
gimp_image_get_grid (shell->display->image))
gimp_image_get_grid (image))
{
snap_to_grid = TRUE;
}
@ -1260,18 +1259,17 @@ gimp_display_shell_snap_coords (GimpDisplayShell *shell,
snap_to_canvas = gimp_display_shell_get_snap_to_canvas (shell);
if (gimp_display_shell_get_snap_to_vectors (shell) &&
gimp_image_get_active_vectors (shell->display->image))
gimp_image_get_active_vectors (image))
{
snap_to_vectors = TRUE;
}
if (snap_to_guides || snap_to_grid || snap_to_canvas || snap_to_vectors)
{
gdouble tx, ty;
gint snap_distance;
gdouble tx, ty;
snap_distance =
GIMP_DISPLAY_CONFIG (shell->display->image->gimp->config)->snap_distance;
snap_distance = GIMP_DISPLAY_CONFIG (image->gimp->config)->snap_distance;
if (snap_width > 0 && snap_height > 0)
{
@ -1308,8 +1306,8 @@ gimp_display_shell_snap_coords (GimpDisplayShell *shell,
if (snapped)
{
snapped_coords->x = tx - snap_offset_x;
snapped_coords->y = ty - snap_offset_y;
coords->x = tx - snap_offset_x;
coords->y = ty - snap_offset_y;
}
}

1
app/display/gimpdisplayshell.h
View File

@ -221,7 +221,6 @@ GimpUnit gimp_display_shell_get_unit (GimpDisplayShell *shell);
gboolean gimp_display_shell_snap_coords (GimpDisplayShell *shell,
GimpCoords *coords,
GimpCoords *snapped_coords,
gint snap_offset_x,
gint snap_offset_y,
gint snap_width,