[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56949] branches/soc-2011-tomato/source/ blender: Fixes for wrong memory usage in mask tracking operator

[Sergey Sharybin]

Revision: 56949
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56949
Author:   nazgul
Date:     2013-05-21 17:25:35 +0000 (Tue, 21 May 2013)
Log Message:
-----------
Fixes for wrong memory usage in mask tracking operator

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c	2013-05-21 16:44:39 UTC (rev 56948)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c	2013-05-21 17:25:35 UTC (rev 56949)
@@ -904,7 +904,7 @@
 		if (mask_spline->points_deform) {
 			int i;
 			MaskSplinePoint *points_deform = mask_spline->points_deform;
-			for (i = i; i < mask_spline->tot_point; i++) {
+			for (i = 0; i < mask_spline->tot_point; i++) {
 				BKE_mask_point_free(&points_deform[i]);
 			}
 			MEM_freeN(points_deform);

Modified: branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c	2013-05-21 16:44:39 UTC (rev 56948)
+++ branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c	2013-05-21 17:25:35 UTC (rev 56949)
@@ -3673,7 +3673,7 @@
 	int i;
 	float *current_diff_point;
 
-	INIT_MINMAX(corner_min, corner_max);
+	INIT_MINMAX2(corner_min, corner_max);
 
 	spline_points = mask_spline->points;
 	for (i = 0, current_spline_point = spline_points;
@@ -3682,16 +3682,16 @@
 	{
 		BezTriple *bezt = &current_spline_point->bezt;
 
-		DO_MINMAX(bezt->vec[0], corner_min, corner_max);
-		DO_MINMAX(bezt->vec[1], corner_min, corner_max);
-		DO_MINMAX(bezt->vec[2], corner_min, corner_max);
+		DO_MINMAX2(bezt->vec[0], corner_min, corner_max);
+		DO_MINMAX2(bezt->vec[1], corner_min, corner_max);
+		DO_MINMAX2(bezt->vec[2], corner_min, corner_max);
 	}
 
 	for (i = 0, current_diff_point = diff_points[0];
 	     i < tot_diff_point;
 	     i++, current_diff_point += 2)
 	{
-		DO_MINMAX(current_diff_point, corner_min, corner_max);
+		DO_MINMAX2(current_diff_point, corner_min, corner_max);
 	}
 }