merged the trunk r8669:8702

2012-06-28 15:41:27 +00:00
parent 150aeee58f
commit 6cca6a4548
50 changed files with 2997 additions and 897 deletions
--- a/samples/cpp/rgbdodometry.cpp
+++ b/samples/cpp/rgbdodometry.cpp
@@ -146,7 +146,7 @@ int main(int argc, char** argv)
    minGradMagnitudes[3] = 1;

    const float minDepth = 0.f; //in meters
-    const float maxDepth = 3.f; //in meters
+    const float maxDepth = 4.f; //in meters
    const float maxDepthDiff = 0.07f; //in meters

    tm.start();