From bea6c5225d56ab1fe585ca2c3aab75374af9c9cd Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Mon, 21 May 2007 22:46:16 +0000 Subject: [PATCH] don't leak three GimpCoords per warped point (eek). 2007-05-22 Michael Natterer * app/vectors/gimpvectors-warp.c (gimp_stroke_warp_point): don't leak three GimpCoords per warped point (eek). svn path=/trunk/; revision=22555 --- ChangeLog | 5 +++++ app/vectors/gimpvectors-warp.c | 35 +++++++++++++++++----------------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee39484ae7..791eb19a3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-05-22 Michael Natterer + + * app/vectors/gimpvectors-warp.c (gimp_stroke_warp_point): don't + leak three GimpCoords per warped point (eek). + 2007-05-21 Sven Neumann * themes/Default/images/preferences/Makefile.am: formatting. diff --git a/app/vectors/gimpvectors-warp.c b/app/vectors/gimpvectors-warp.c index b9e5d4d64b..c0e4f4a7fa 100644 --- a/app/vectors/gimpvectors-warp.c +++ b/app/vectors/gimpvectors-warp.c @@ -92,34 +92,33 @@ gimp_stroke_warp_point (const GimpStroke *stroke, GimpCoords *point_warped, gdouble y_offset) { - GimpCoords *point_zero; - GimpCoords *point_minus; - GimpCoords *point_plus; - gdouble slope; - gdouble dx, dy, nx, ny, len; + GimpCoords point_zero = { 0, }; + GimpCoords point_minus = { 0, }; + GimpCoords point_plus = { 0, }; + gdouble slope; + gdouble dx, dy, nx, ny, len; - point_zero = (GimpCoords*) g_new0 (GimpCoords, 1); - point_minus = (GimpCoords*) g_new0 (GimpCoords, 1); - point_plus = (GimpCoords*) g_new0 (GimpCoords, 1); - - if (! gimp_stroke_get_point_at_dist (stroke, x, EPSILON, point_zero, &slope)) + if (! gimp_stroke_get_point_at_dist (stroke, x, EPSILON, + &point_zero, &slope)) { point_warped->x = 0; point_warped->y = 0; return; } - point_warped->x = point_zero->x; - point_warped->y = point_zero->y; + point_warped->x = point_zero.x; + point_warped->y = point_zero.y; - if (! gimp_stroke_get_point_at_dist (stroke, x - DX, EPSILON, point_minus, &slope)) + if (! gimp_stroke_get_point_at_dist (stroke, x - DX, EPSILON, + &point_minus, &slope)) return; - if (! gimp_stroke_get_point_at_dist (stroke, x + DX, EPSILON, point_plus, &slope)) + if (! gimp_stroke_get_point_at_dist (stroke, x + DX, EPSILON, + &point_plus, &slope)) return; - dx = point_plus->x - point_minus->x; - dy = point_plus->y - point_minus->y; + dx = point_plus.x - point_minus.x; + dy = point_plus.y - point_minus.y; len = hypot (dx, dy); @@ -129,8 +128,8 @@ gimp_stroke_warp_point (const GimpStroke *stroke, nx = - dy / len; ny = dx / len; - point_warped->x = point_zero->x + nx * (y - y_offset); - point_warped->y = point_zero->y + ny * (y - y_offset); + point_warped->x = point_zero.x + nx * (y - y_offset); + point_warped->y = point_zero.y + ny * (y - y_offset); } static void