[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40297] branches/soc-2011-tomato/source/ blender/blenkernel/intern/tracking.c: Camera tracking integration

[Sergey Sharybin]

Revision: 40297
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40297
Author:   nazgul
Date:     2011-09-17 13:22:13 +0000 (Sat, 17 Sep 2011)
Log Message:
-----------
Camera tracking integration
===========================

Fix for crash on pyramid tracker caused by precision error
when calculating pyramid level.

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c	2011-09-17 13:15:38 UTC (rev 40296)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c	2011-09-17 13:22:13 UTC (rev 40297)
@@ -553,7 +553,7 @@
 							float pattern_size_x= (track->pat_max[0]-track->pat_min[0])*width;
 							float pattern_size_y= (track->pat_max[1]-track->pat_min[1])*height;
 
-							int level= log(2.0f * MIN2(search_size_x, search_size_y) / MAX2(pattern_size_x, pattern_size_y))/M_LN2;
+							int level= (log(2.0f * MIN2(search_size_x, search_size_y) / MAX2(pattern_size_x, pattern_size_y))/M_LN2+0.5f);
 
 							track_context->region_tracker= libmv_regionTrackerNew(100, level, 0.2);
 						}