[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41358] branches/soc-2011-tomato: Camera tracing integration

[Sergey Sharybin]

Revision: 41358
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41358
Author:   nazgul
Date:     2011-10-29 09:46:53 +0000 (Sat, 29 Oct 2011)
Log Message:
-----------
Camera tracing integration
==========================

Fix for SAD tracking sliding marker.

Modified Paths:
--------------
    branches/soc-2011-tomato/extern/libmv/CMakeLists.txt
    branches/soc-2011-tomato/extern/libmv/SConscript
    branches/soc-2011-tomato/extern/libmv/bundle.sh
    branches/soc-2011-tomato/extern/libmv/libmv-capi.cpp
    branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c

Modified: branches/soc-2011-tomato/extern/libmv/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/extern/libmv/CMakeLists.txt	2011-10-29 08:18:42 UTC (rev 41357)
+++ branches/soc-2011-tomato/extern/libmv/CMakeLists.txt	2011-10-29 09:46:53 UTC (rev 41358)
@@ -31,7 +31,8 @@
 )
 
 set(INC_SYS
-
+	${PNG_INCLUDE_DIR}
+	${ZLIB_INCLUDE_DIRS}
 )
 
 set(SRC

Modified: branches/soc-2011-tomato/extern/libmv/SConscript
===================================================================
--- branches/soc-2011-tomato/extern/libmv/SConscript	2011-10-29 08:18:42 UTC (rev 41357)
+++ branches/soc-2011-tomato/extern/libmv/SConscript	2011-10-29 09:46:53 UTC (rev 41358)
@@ -26,6 +26,8 @@
 src += env.Glob('third_party/ssba/Math/*.cpp')
 
 incs = '. ../Eigen3'
+incs += ' ' + env['BF_PNG_INC']
+incs += ' ' + env['BF_ZLIB_INC']
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog ./third_party/msinttypes'

Modified: branches/soc-2011-tomato/extern/libmv/bundle.sh
===================================================================
--- branches/soc-2011-tomato/extern/libmv/bundle.sh	2011-10-29 08:18:42 UTC (rev 41357)
+++ branches/soc-2011-tomato/extern/libmv/bundle.sh	2011-10-29 09:46:53 UTC (rev 41358)
@@ -123,7 +123,8 @@
 )
 
 set(INC_SYS
-
+	${PNG_INCLUDE_DIR}
+	${ZLIB_INCLUDE_DIRS}
 )
 
 set(SRC
@@ -214,6 +215,8 @@
 $src
 
 incs = '. ../Eigen3'
+incs += ' ' + env['BF_PNG_INC']
+incs += ' ' + env['BF_ZLIB_INC']
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog ./third_party/msinttypes'

Modified: branches/soc-2011-tomato/extern/libmv/libmv-capi.cpp
===================================================================
--- branches/soc-2011-tomato/extern/libmv/libmv-capi.cpp	2011-10-29 08:18:42 UTC (rev 41357)
+++ branches/soc-2011-tomato/extern/libmv/libmv-capi.cpp	2011-10-29 09:46:53 UTC (rev 41358)
@@ -25,7 +25,7 @@
  */
 
 /* define this to generate PNG images with content of search areas
-  tracking between which failed */
+   tracking between which failed */
 #undef DUMP_FAILURE
 
 #include "libmv-capi.h"

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c	2011-10-29 08:18:42 UTC (rev 41357)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c	2011-10-29 09:46:53 UTC (rev 41358)
@@ -759,7 +759,7 @@
 
 				*cp= FTOCHAR(0.2126f*rrgbf[0] + 0.7152f*rrgbf[1] + 0.0722f*rrgbf[2]);
 			} else {
-				char *rrgb= (char*)ibuf->rect + pixel*4;
+				unsigned char *rrgb= (unsigned char*)ibuf->rect + pixel*4;
 
 				*cp= 0.2126f*rrgb[0] + 0.7152f*rrgb[1] + 0.0722f*rrgb[2];
 			}
@@ -776,16 +776,12 @@
 {
 	ImBuf *tmpibuf;
 	unsigned char *pixels;
-	int width, height;
 
-	width= (track->search_max[0]-track->search_min[0])*ibuf->x;
-	height= (track->search_max[1]-track->search_min[1])*ibuf->y;
-
 	tmpibuf= BKE_tracking_get_search_imbuf(ibuf, track, marker, 0, 0, pos, origin);
 	disable_imbuf_channels(tmpibuf, track);
 
-	*width_r= width;
-	*height_r= height;
+	*width_r= tmpibuf->x;
+	*height_r= tmpibuf->y;
 
 	pixels= get_ucharbuf(tmpibuf);