[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44190] trunk/blender/extern/libmv: Camera tracking: switch to own repo of libmv where most of patches are applied

Sergey Sharybin sergey.vfx at gmail.com
Fri Feb 17 16:39:41 CET 2012


Revision: 44190
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44190
Author:   nazgul
Date:     2012-02-17 15:39:32 +0000 (Fri, 17 Feb 2012)
Log Message:
-----------
Camera tracking: switch to own repo of libmv where most of patches are applied
and which includes latest changes from Keir's branch.

Hopefully it'll make backporting of changes back to main libmv repo easier.

Modified Paths:
--------------
    trunk/blender/extern/libmv/CMakeLists.txt
    trunk/blender/extern/libmv/ChangeLog
    trunk/blender/extern/libmv/bundle.sh
    trunk/blender/extern/libmv/libmv/base/vector.h
    trunk/blender/extern/libmv/libmv/simple_pipeline/pipeline.cc
    trunk/blender/extern/libmv/libmv/simple_pipeline/tracks.h
    trunk/blender/extern/libmv/libmv/tracking/esm_region_tracker.cc
    trunk/blender/extern/libmv/libmv/tracking/trklt_region_tracker.h
    trunk/blender/extern/libmv/patches/bundle_tweaks.patch
    trunk/blender/extern/libmv/patches/series
    trunk/blender/extern/libmv/patches/v3d_verbosity.patch

Removed Paths:
-------------
    trunk/blender/extern/libmv/patches/config_mac.patch
    trunk/blender/extern/libmv/patches/detect.patch
    trunk/blender/extern/libmv/patches/fast.patch
    trunk/blender/extern/libmv/patches/function_derivative.patch
    trunk/blender/extern/libmv/patches/high_distortion_crash_fix.patch
    trunk/blender/extern/libmv/patches/levenberg_marquardt.patch
    trunk/blender/extern/libmv/patches/mingw.patch
    trunk/blender/extern/libmv/patches/msvc2010.patch
    trunk/blender/extern/libmv/patches/overscan.patch
    trunk/blender/extern/libmv/patches/scaled_distortion.patch
    trunk/blender/extern/libmv/patches/snrptinf_fix.patch

Modified: trunk/blender/extern/libmv/CMakeLists.txt
===================================================================
--- trunk/blender/extern/libmv/CMakeLists.txt	2012-02-17 14:42:38 UTC (rev 44189)
+++ trunk/blender/extern/libmv/CMakeLists.txt	2012-02-17 15:39:32 UTC (rev 44190)
@@ -41,107 +41,107 @@
 
 set(SRC
 	libmv-capi.cpp
+	libmv/image/array_nd.cc
+	libmv/image/convolve.cc
+	libmv/multiview/conditioning.cc
+	libmv/multiview/euclidean_resection.cc
+	libmv/multiview/fundamental.cc
+	libmv/multiview/projection.cc
+	libmv/multiview/triangulation.cc
 	libmv/numeric/numeric.cc
 	libmv/numeric/poly.cc
+	libmv/simple_pipeline/bundle.cc
 	libmv/simple_pipeline/callbacks.cc
+	libmv/simple_pipeline/camera_intrinsics.cc
+	libmv/simple_pipeline/detect.cc
+	libmv/simple_pipeline/initialize_reconstruction.cc
+	libmv/simple_pipeline/intersect.cc
+	libmv/simple_pipeline/pipeline.cc
 	libmv/simple_pipeline/reconstruction.cc
 	libmv/simple_pipeline/resect.cc
-	libmv/simple_pipeline/intersect.cc
-	libmv/simple_pipeline/initialize_reconstruction.cc
-	libmv/simple_pipeline/camera_intrinsics.cc
-	libmv/simple_pipeline/pipeline.cc
-	libmv/simple_pipeline/detect.cc
 	libmv/simple_pipeline/tracks.cc
-	libmv/simple_pipeline/bundle.cc
-	libmv/image/convolve.cc
-	libmv/image/array_nd.cc
-	libmv/tracking/pyramid_region_tracker.cc
-	libmv/tracking/sad.cc
 	libmv/tracking/brute_region_tracker.cc
+	libmv/tracking/esm_region_tracker.cc
 	libmv/tracking/hybrid_region_tracker.cc
-	libmv/tracking/esm_region_tracker.cc
-	libmv/tracking/trklt_region_tracker.cc
 	libmv/tracking/klt_region_tracker.cc
 	libmv/tracking/lmicklt_region_tracker.cc
+	libmv/tracking/pyramid_region_tracker.cc
 	libmv/tracking/retrack_region_tracker.cc
-	libmv/multiview/projection.cc
-	libmv/multiview/conditioning.cc
-	libmv/multiview/fundamental.cc
-	libmv/multiview/euclidean_resection.cc
-	libmv/multiview/triangulation.cc
+	libmv/tracking/sad.cc
+	libmv/tracking/trklt_region_tracker.cc
 
-	third_party/ssba/Geometry/v3d_metricbundle.cpp
-	third_party/ssba/Math/v3d_optimization.cpp
-	third_party/gflags/gflags.cc
-	third_party/gflags/gflags_reporting.cc
-	third_party/gflags/gflags_completions.cc
-	third_party/fast/fast_9.c
 	third_party/fast/fast_10.c
 	third_party/fast/fast_11.c
 	third_party/fast/fast_12.c
+	third_party/fast/fast_9.c
 	third_party/fast/fast.c
 	third_party/fast/nonmax.c
+	third_party/gflags/gflags.cc
+	third_party/gflags/gflags_completions.cc
+	third_party/gflags/gflags_reporting.cc
 	third_party/ldl/Source/ldl.c
+	third_party/ssba/Geometry/v3d_metricbundle.cpp
+	third_party/ssba/Math/v3d_optimization.cpp
 
 	libmv-capi.h
+	libmv/base/id_generator.h
+	libmv/base/scoped_ptr.h
+	libmv/base/vector.h
+	libmv/base/vector_utils.h
+	libmv/image/array_nd.h
+	libmv/image/convolve.h
+	libmv/image/image.h
+	libmv/image/sample.h
+	libmv/image/tuple.h
 	libmv/logging/logging.h
+	libmv/multiview/conditioning.h
+	libmv/multiview/euclidean_resection.h
+	libmv/multiview/fundamental.h
+	libmv/multiview/nviewtriangulation.h
+	libmv/multiview/projection.h
+	libmv/multiview/resection.h
+	libmv/multiview/triangulation.h
 	libmv/numeric/dogleg.h
+	libmv/numeric/function_derivative.h
 	libmv/numeric/levenberg_marquardt.h
+	libmv/numeric/numeric.h
 	libmv/numeric/poly.h
-	libmv/numeric/function_derivative.h
-	libmv/numeric/numeric.h
+	libmv/simple_pipeline/bundle.h
 	libmv/simple_pipeline/callbacks.h
-	libmv/simple_pipeline/resect.h
-	libmv/simple_pipeline/reconstruction.h
 	libmv/simple_pipeline/camera_intrinsics.h
-	libmv/simple_pipeline/tracks.h
 	libmv/simple_pipeline/detect.h
+	libmv/simple_pipeline/initialize_reconstruction.h
+	libmv/simple_pipeline/intersect.h
 	libmv/simple_pipeline/pipeline.h
-	libmv/simple_pipeline/intersect.h
-	libmv/simple_pipeline/bundle.h
-	libmv/simple_pipeline/initialize_reconstruction.h
-	libmv/image/convolve.h
-	libmv/image/tuple.h
-	libmv/image/array_nd.h
-	libmv/image/sample.h
-	libmv/image/image.h
-	libmv/tracking/region_tracker.h
+	libmv/simple_pipeline/reconstruction.h
+	libmv/simple_pipeline/resect.h
+	libmv/simple_pipeline/tracks.h
 	libmv/tracking/brute_region_tracker.h
+	libmv/tracking/esm_region_tracker.h
 	libmv/tracking/hybrid_region_tracker.h
+	libmv/tracking/klt_region_tracker.h
+	libmv/tracking/lmicklt_region_tracker.h
+	libmv/tracking/pyramid_region_tracker.h
+	libmv/tracking/region_tracker.h
 	libmv/tracking/retrack_region_tracker.h
 	libmv/tracking/sad.h
-	libmv/tracking/pyramid_region_tracker.h
-	libmv/tracking/esm_region_tracker.h
 	libmv/tracking/trklt_region_tracker.h
-	libmv/tracking/klt_region_tracker.h
-	libmv/tracking/lmicklt_region_tracker.h
-	libmv/base/id_generator.h
-	libmv/base/vector.h
-	libmv/base/scoped_ptr.h
-	libmv/base/vector_utils.h
-	libmv/multiview/nviewtriangulation.h
-	libmv/multiview/resection.h
-	libmv/multiview/euclidean_resection.h
-	libmv/multiview/triangulation.h
-	libmv/multiview/projection.h
-	libmv/multiview/fundamental.h
-	libmv/multiview/conditioning.h
 
-	third_party/ssba/Geometry/v3d_metricbundle.h
+	third_party/fast/fast.h
+	third_party/gflags/config.h
+	third_party/gflags/gflags_completions.h
+	third_party/gflags/gflags.h
+	third_party/gflags/mutex.h
+	third_party/ldl/Include/ldl.h
+	third_party/msinttypes/inttypes.h
+	third_party/msinttypes/stdint.h
 	third_party/ssba/Geometry/v3d_cameramatrix.h
 	third_party/ssba/Geometry/v3d_distortion.h
+	third_party/ssba/Geometry/v3d_metricbundle.h
+	third_party/ssba/Math/v3d_linear.h
 	third_party/ssba/Math/v3d_linear_utils.h
+	third_party/ssba/Math/v3d_mathutilities.h
 	third_party/ssba/Math/v3d_optimization.h
-	third_party/ssba/Math/v3d_mathutilities.h
-	third_party/ssba/Math/v3d_linear.h
-	third_party/gflags/gflags_completions.h
-	third_party/gflags/mutex.h
-	third_party/gflags/config.h
-	third_party/gflags/gflags.h
-	third_party/fast/fast.h
-	third_party/ldl/Include/ldl.h
-	third_party/msinttypes/stdint.h
-	third_party/msinttypes/inttypes.h
 )
 
 if(WIN32)
@@ -152,23 +152,23 @@
 		third_party/glog/src/vlog_is_on.cc
 		third_party/glog/src/windows/port.cc
 
-		third_party/glog/src/config.h
+		third_party/glog/src/utilities.h
+		third_party/glog/src/stacktrace_generic-inl.h
 		third_party/glog/src/stacktrace.h
-		third_party/glog/src/stacktrace_generic-inl.h
-		third_party/glog/src/stacktrace_libunwind-inl.h
-		third_party/glog/src/stacktrace_powerpc-inl.h
-		third_party/glog/src/stacktrace_x86-inl.h
 		third_party/glog/src/stacktrace_x86_64-inl.h
-		third_party/glog/src/utilities.h
-		third_party/glog/src/base/commandlineflags.h
 		third_party/glog/src/base/googleinit.h
 		third_party/glog/src/base/mutex.h
-		third_party/glog/src/windows/config.h
-		third_party/glog/src/windows/port.h
-		third_party/glog/src/windows/glog/log_severity.h
-		third_party/glog/src/windows/glog/logging.h
+		third_party/glog/src/base/commandlineflags.h
+		third_party/glog/src/stacktrace_powerpc-inl.h
+		third_party/glog/src/stacktrace_x86-inl.h
+		third_party/glog/src/config.h
+		third_party/glog/src/stacktrace_libunwind-inl.h
 		third_party/glog/src/windows/glog/raw_logging.h
 		third_party/glog/src/windows/glog/vlog_is_on.h
+		third_party/glog/src/windows/glog/logging.h
+		third_party/glog/src/windows/glog/log_severity.h
+		third_party/glog/src/windows/port.h
+		third_party/glog/src/windows/config.h
 	)
 
 	list(APPEND INC
@@ -190,34 +190,34 @@
 	endif()
 else()
 	list(APPEND SRC
+		third_party/glog/src/demangle.cc
+		third_party/glog/src/logging.cc
+		third_party/glog/src/raw_logging.cc
+		third_party/glog/src/signalhandler.cc
+		third_party/glog/src/symbolize.cc
 		third_party/glog/src/utilities.cc
-		third_party/glog/src/symbolize.cc
 		third_party/glog/src/vlog_is_on.cc
-		third_party/glog/src/signalhandler.cc
-		third_party/glog/src/logging.cc
-		third_party/glog/src/demangle.cc
-		third_party/glog/src/raw_logging.cc
 
+		third_party/glog/src/base/commandlineflags.h
+		third_party/glog/src/base/googleinit.h
+		third_party/glog/src/base/mutex.h
+		third_party/glog/src/config_freebsd.h
 		third_party/glog/src/config.h
-		third_party/glog/src/config_freebsd.h
 		third_party/glog/src/config_linux.h
 		third_party/glog/src/config_mac.h
 		third_party/glog/src/demangle.h
+		third_party/glog/src/glog/logging.h
+		third_party/glog/src/glog/log_severity.h
+		third_party/glog/src/glog/raw_logging.h
+		third_party/glog/src/glog/vlog_is_on.h
+		third_party/glog/src/stacktrace_generic-inl.h
 		third_party/glog/src/stacktrace.h
-		third_party/glog/src/stacktrace_generic-inl.h
 		third_party/glog/src/stacktrace_libunwind-inl.h
 		third_party/glog/src/stacktrace_powerpc-inl.h
+		third_party/glog/src/stacktrace_x86_64-inl.h
 		third_party/glog/src/stacktrace_x86-inl.h
-		third_party/glog/src/stacktrace_x86_64-inl.h
 		third_party/glog/src/symbolize.h
 		third_party/glog/src/utilities.h
-		third_party/glog/src/base/commandlineflags.h
-		third_party/glog/src/base/googleinit.h
-		third_party/glog/src/base/mutex.h
-		third_party/glog/src/glog/log_severity.h
-		third_party/glog/src/glog/logging.h
-		third_party/glog/src/glog/raw_logging.h
-		third_party/glog/src/glog/vlog_is_on.h
 	)
 
 	list(APPEND INC

Modified: trunk/blender/extern/libmv/ChangeLog
===================================================================
--- trunk/blender/extern/libmv/ChangeLog	2012-02-17 14:42:38 UTC (rev 44189)
+++ trunk/blender/extern/libmv/ChangeLog	2012-02-17 15:39:32 UTC (rev 44190)
@@ -1,312 +1,447 @@
-commit 531c79bf95fddaaa70707d1abcd4fdafda16bbf0
-Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Sat Aug 20 00:00:42 2011 +0200
+commit f8c2b223f01551fd81a85f6d5221646165147035
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Fri Feb 17 21:32:05 2012 +0600
 
-    Display warped pattern in marker preview.
+    Picky edits: corrected EOL
 
-commit bb5c27e671b6f8eb56ddf490f0795d59bede591b
-Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Fri Aug 19 18:37:48 2011 +0200
+commit 3f2a4205ec5adadcdfa306b161c705c868a7be93
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Fri Feb 17 21:30:07 2012 +0600
 
-    Fix CMake build.
+    Fixed incorrect access to ucontext on linux. Caused by incorrect merge conflict resolve.
 
-commit 2ac7281ff6b9545b425dd84fb03bf9c5c98b4de2
-Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date:   Fri Aug 19 17:34:45 2011 +0200
+commit d360a21a5aa125cf9e83dd26b302508688ff7007
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Fri Feb 17 20:54:13 2012 +0600
 
-    Avoid symbol shadowing.

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list