[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44295] trunk/blender: Camera tracing: search area was always centered to marker's position when tracking

[Sergey Sharybin]

Revision: 44295
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44295
Author:   nazgul
Date:     2012-02-21 12:59:52 +0000 (Tue, 21 Feb 2012)
Log Message:
-----------
Camera tracing: search area was always centered to marker's position when tracking

Modified Paths:
--------------
    trunk/blender/extern/libmv/libmv-capi.cpp
    trunk/blender/source/blender/blenkernel/intern/tracking.c

Modified: trunk/blender/extern/libmv/libmv-capi.cpp
===================================================================
--- trunk/blender/extern/libmv/libmv-capi.cpp	2012-02-21 04:24:30 UTC (rev 44294)
+++ trunk/blender/extern/libmv/libmv-capi.cpp	2012-02-21 12:59:52 UTC (rev 44295)
@@ -296,7 +296,7 @@
 		double sx2 = *x2, sy2 = *y2;
 		int result = region_tracker->Track(old_patch, new_patch, x1, y1, x2, y2);
 
-		if (!result) {
+		if (!result {
 			saveImage("old_patch", old_patch, x1, y1);
 			saveImage("new_patch", new_patch, sx2, sy2);
 		}

Modified: trunk/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/tracking.c	2012-02-21 04:24:30 UTC (rev 44294)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c	2012-02-21 12:59:52 UTC (rev 44295)
@@ -1100,13 +1100,13 @@
 	w= (max[0]-min[0])*ibuf->x;
 	h= (max[1]-min[1])*ibuf->y;
 
+	/* dimensions should be odd */
 	w= w|1;
 	h= h|1;
 
-	x1= x-(int)(w/2.0f);
-	y1= y-(int)(h/2.0f);
+	x1= x-(int)(w * (-min[0] / (max[0] - min[0])));
+	y1= y-(int)(h * (-min[1] / (max[1] - min[1])));
 
-	/* dimensions should be odd */
 	tmpibuf= IMB_allocImBuf(w+margin*2, h+margin*2, 32, IB_rect);
 	IMB_rectcpy(tmpibuf, ibuf, 0, 0, x1-margin, y1-margin, w+margin*2, h+margin*2);