[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41656] trunk/blender/source/blender/ blenkernel/intern/tracking.c: Attempt to fix #29200: Camera Tracking Solver

[Sergey Sharybin]

Revision: 41656
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41656
Author:   nazgul
Date:     2011-11-08 14:03:16 +0000 (Tue, 08 Nov 2011)
Log Message:
-----------
Attempt to fix #29200: Camera Tracking Solver

It was an mistake in join tracks operator which lead to reading unitialized memory.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/tracking.c

Modified: trunk/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/tracking.c	2011-11-08 13:57:32 UTC (rev 41655)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c	2011-11-08 14:03:16 UTC (rev 41656)
@@ -446,13 +446,13 @@
 	int i, a= 0, b= 0, tot= dst_track->markersnr+src_track->markersnr;
 	int count= 0;
 
-	for(i= 0; i<tot; i++) {
-		if(a>=src_track->markersnr) {
-			b++;
+	while(a<src_track->markersnr || b<dst_track->markersnr) {
+		if(b>=dst_track->markersnr) {
+			a++;
 			count++;
 		}
-		else if(b>=dst_track->markersnr) {
-			a++;
+		else if(a>=src_track->markersnr) {
+			b++;
 			count++;
 		}
 		else if(src_track->markers[a].framenr<dst_track->markers[b].framenr) {