Merging r51923 through r52851 from trunk into soc-2011-tomato

7 files changed, 19 insertions, 9 deletions

diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 151df493062..2640c528c94 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -32,9 +32,10 @@ if(WITH_BULLET)
 	add_subdirectory(bullet2)
 endif()
 
-if(WITH_MOD_CLOTH_ELTOPO)
-	add_subdirectory(eltopo)
-endif()
+# now only available in a branch
+#if(WITH_MOD_CLOTH_ELTOPO)
+#	add_subdirectory(eltopo)
+#endif()
 
 if(WITH_BINRELOC)
 	add_subdirectory(binreloc)
diff --git a/extern/SConscript b/extern/SConscript
index ce366deb38a..71998ee072c 100644
--- a/extern/SConscript
+++ b/extern/SConscript
@@ -8,8 +8,11 @@ SConscript(['colamd/SConscript'])
 if env['WITH_BF_GAMEENGINE']:
     SConscript(['recastnavigation/SConscript'])
 
+# now only available in a branch
+'''
 if env['WITH_BF_ELTOPO']:
     SConscript(['eltopo/SConscript'])
+'''
 
 if env['WITH_BF_BULLET']:
     SConscript(['bullet2/src/SConscript'])
diff --git a/extern/glew/src/glew.c b/extern/glew/src/glew.c
index 5d886ce7807..833d3999268 100644
--- a/extern/glew/src/glew.c
+++ b/extern/glew/src/glew.c
@@ -93,7 +93,7 @@ void* dlGetProcAddress (const GLubyte* name)
 #include <string.h>
 #include <AvailabilityMacros.h>
 
-#ifdef MAC_OS_X_VERSION_10_3
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_3
 
 #include <dlfcn.h>
 
@@ -142,7 +142,7 @@ void* NSGLGetProcAddress (const GLubyte *name)
   return NULL;
 #endif
 }
-#endif /* MAC_OS_X_VERSION_10_3 */
+#endif /* MAC_OS_X_VERSION_MIN_REQUIRED */
 #endif /* __APPLE__ */
 
 /*
diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt
index 38be34add75..ebc5953d956 100644
--- a/extern/libmv/CMakeLists.txt
+++ b/extern/libmv/CMakeLists.txt
@@ -102,6 +102,8 @@ set(SRC
 	libmv/multiview/conditioning.h
 	libmv/multiview/euclidean_resection.h
 	libmv/multiview/fundamental.h
+	libmv/multiview/homography.h
+	libmv/multiview/homography_parameterization.h
 	libmv/multiview/nviewtriangulation.h
 	libmv/multiview/projection.h
 	libmv/multiview/resection.h
@@ -131,6 +133,7 @@ set(SRC
 	libmv/tracking/pyramid_region_tracker.h
 	libmv/tracking/region_tracker.h
 	libmv/tracking/retrack_region_tracker.h
+	libmv/tracking/track_region.h
 	libmv/tracking/trklt_region_tracker.h
 
 	third_party/fast/fast.h
diff --git a/extern/libmv/libmv-capi.cpp b/extern/libmv/libmv-capi.cpp
index a15927f881d..8e483abd386 100644
--- a/extern/libmv/libmv-capi.cpp
+++ b/extern/libmv/libmv-capi.cpp
@@ -192,7 +192,7 @@ static void imageToFloatBuf(const libmv::FloatImage *image, int channels, float
 }
 
 #if defined(DUMP_FAILURE) || defined (DUMP_ALWAYS)
-void savePNGImage(png_bytep *row_pointers, int width, int height, int depth, int color_type, char *file_name)
+static void savePNGImage(png_bytep *row_pointers, int width, int height, int depth, int color_type, char *file_name)
 {
 	png_infop info_ptr;
 	png_structp png_ptr;
@@ -437,6 +437,9 @@ int libmv_trackRegion(const struct libmv_trackRegionOptions *options,
 #endif
 		saveImage("old_patch", old_patch, x1[4], y1[4]);
 		saveImage("new_patch", new_patch, x2[4], y2[4]);
+
+		if (options->image1_mask)
+			saveImage("mask", image1_mask, x2[4], y2[4]);
 	}
 #endif
 
@@ -897,7 +900,7 @@ void libmv_CameraIntrinsicsUpdate(struct libmv_CameraIntrinsics *libmvIntrinsics
 		intrinsics->SetFocalLength(focal_length, focal_length);
 
 	if (intrinsics->principal_point_x() != principal_x || intrinsics->principal_point_y() != principal_y)
-		intrinsics->SetFocalLength(focal_length, focal_length);
+		intrinsics->SetPrincipalPoint(principal_x, principal_y);
 
 	if (intrinsics->k1() != k1 || intrinsics->k2() != k2 || intrinsics->k3() != k3)
 		intrinsics->SetRadialDistortion(k1, k2, k3);
diff --git a/extern/libmv/libmv/simple_pipeline/resect.cc b/extern/libmv/libmv/simple_pipeline/resect.cc
index 4c9ca6d8677..3929271e66f 100644
--- a/extern/libmv/libmv/simple_pipeline/resect.cc
+++ b/extern/libmv/libmv/simple_pipeline/resect.cc
@@ -57,7 +57,7 @@ struct EuclideanResectCostFunction {
 
   EuclideanResectCostFunction(const vector<Marker> &markers,
                               const EuclideanReconstruction &reconstruction,
-                              const Mat3 initial_R)
+                              const Mat3 &initial_R)
     : markers(markers),
       reconstruction(reconstruction),
       initial_R(initial_R) {}
diff --git a/extern/xdnd/xdnd.c b/extern/xdnd/xdnd.c
index 9bdee89c1ce..50d1fec4969 100644
--- a/extern/xdnd/xdnd.c
+++ b/extern/xdnd/xdnd.c
@@ -347,7 +347,7 @@ void xdnd_set_dnd_aware (DndClass * dnd, Window window, Atom * typelist)
                     &nchildren_return);
     if (children_return)
         XFree (children_return);
-    if (r)
+    if (r && parent != root_return)
         xdnd_set_dnd_aware (dnd, parent, typelist);
 }