[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55803] trunk/blender/extern/libmv: Update libmv to current upstream version

Sergey Sharybin sergey.vfx at gmail.com
Fri Apr 5 11:23:20 CEST 2013


Revision: 55803
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55803
Author:   nazgul
Date:     2013-04-05 09:23:20 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
Update libmv to current upstream version

- Solves some strict compilation warning
- Style/code cleanup

Modified Paths:
--------------
    trunk/blender/extern/libmv/CMakeLists.txt
    trunk/blender/extern/libmv/ChangeLog
    trunk/blender/extern/libmv/files.txt
    trunk/blender/extern/libmv/libmv/base/vector.h
    trunk/blender/extern/libmv/libmv/base/vector_utils.h
    trunk/blender/extern/libmv/libmv/image/array_nd.cc
    trunk/blender/extern/libmv/libmv/image/array_nd.h
    trunk/blender/extern/libmv/libmv/image/convolve.cc
    trunk/blender/extern/libmv/libmv/image/convolve.h
    trunk/blender/extern/libmv/libmv/image/correlation.h
    trunk/blender/extern/libmv/libmv/image/image.h
    trunk/blender/extern/libmv/libmv/image/sample.h
    trunk/blender/extern/libmv/libmv/image/tuple.h
    trunk/blender/extern/libmv/libmv/multiview/conditioning.cc
    trunk/blender/extern/libmv/libmv/multiview/conditioning.h
    trunk/blender/extern/libmv/libmv/multiview/euclidean_resection.cc
    trunk/blender/extern/libmv/libmv/multiview/euclidean_resection.h
    trunk/blender/extern/libmv/libmv/multiview/fundamental.cc
    trunk/blender/extern/libmv/libmv/multiview/homography.cc
    trunk/blender/extern/libmv/libmv/multiview/homography.h
    trunk/blender/extern/libmv/libmv/multiview/homography_parameterization.h
    trunk/blender/extern/libmv/libmv/multiview/nviewtriangulation.h
    trunk/blender/extern/libmv/libmv/multiview/panography.h
    trunk/blender/extern/libmv/libmv/multiview/projection.cc
    trunk/blender/extern/libmv/libmv/multiview/projection.h
    trunk/blender/extern/libmv/libmv/multiview/resection.h
    trunk/blender/extern/libmv/libmv/multiview/triangulation.cc
    trunk/blender/extern/libmv/libmv/multiview/triangulation.h
    trunk/blender/extern/libmv/libmv/numeric/dogleg.h
    trunk/blender/extern/libmv/libmv/numeric/function_derivative.h
    trunk/blender/extern/libmv/libmv/numeric/levenberg_marquardt.h
    trunk/blender/extern/libmv/libmv/numeric/numeric.cc
    trunk/blender/extern/libmv/libmv/numeric/numeric.h
    trunk/blender/extern/libmv/libmv/numeric/poly.cc
    trunk/blender/extern/libmv/libmv/numeric/poly.h
    trunk/blender/extern/libmv/libmv/simple_pipeline/bundle.cc
    trunk/blender/extern/libmv/libmv/simple_pipeline/bundle.h
    trunk/blender/extern/libmv/libmv/simple_pipeline/callbacks.h
    trunk/blender/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc
    trunk/blender/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h
    trunk/blender/extern/libmv/libmv/simple_pipeline/detect.cc
    trunk/blender/extern/libmv/libmv/simple_pipeline/detect.h
    trunk/blender/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc
    trunk/blender/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.h
    trunk/blender/extern/libmv/libmv/simple_pipeline/intersect.cc
    trunk/blender/extern/libmv/libmv/simple_pipeline/intersect.h
    trunk/blender/extern/libmv/libmv/simple_pipeline/modal_solver.cc
    trunk/blender/extern/libmv/libmv/simple_pipeline/modal_solver.h
    trunk/blender/extern/libmv/libmv/simple_pipeline/pipeline.cc
    trunk/blender/extern/libmv/libmv/simple_pipeline/pipeline.h
    trunk/blender/extern/libmv/libmv/simple_pipeline/reconstruction.h
    trunk/blender/extern/libmv/libmv/simple_pipeline/resect.cc
    trunk/blender/extern/libmv/libmv/simple_pipeline/resect.h
    trunk/blender/extern/libmv/libmv/simple_pipeline/tracks.cc
    trunk/blender/extern/libmv/libmv/tracking/brute_region_tracker.cc
    trunk/blender/extern/libmv/libmv/tracking/brute_region_tracker.h
    trunk/blender/extern/libmv/libmv/tracking/esm_region_tracker.cc
    trunk/blender/extern/libmv/libmv/tracking/esm_region_tracker.h
    trunk/blender/extern/libmv/libmv/tracking/hybrid_region_tracker.h
    trunk/blender/extern/libmv/libmv/tracking/klt_region_tracker.cc
    trunk/blender/extern/libmv/libmv/tracking/klt_region_tracker.h
    trunk/blender/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc
    trunk/blender/extern/libmv/libmv/tracking/lmicklt_region_tracker.h
    trunk/blender/extern/libmv/libmv/tracking/pyramid_region_tracker.cc
    trunk/blender/extern/libmv/libmv/tracking/retrack_region_tracker.cc
    trunk/blender/extern/libmv/libmv/tracking/track_region.cc
    trunk/blender/extern/libmv/libmv/tracking/trklt_region_tracker.cc
    trunk/blender/extern/libmv/third_party/fast/fast_10.c
    trunk/blender/extern/libmv/third_party/fast/fast_11.c
    trunk/blender/extern/libmv/third_party/fast/fast_12.c
    trunk/blender/extern/libmv/third_party/fast/fast_9.c
    trunk/blender/extern/libmv/third_party/gflags/gflags_completions.cc
    trunk/blender/extern/libmv/third_party/glog/src/logging.cc
    trunk/blender/extern/libmv/third_party/glog/src/utilities.cc
    trunk/blender/extern/libmv/third_party/glog/src/vlog_is_on.cc

Added Paths:
-----------
    trunk/blender/extern/libmv/libmv/multiview/panography.cc

Removed Paths:
-------------
    trunk/blender/extern/libmv/libmv/simple_pipeline/callbacks.cc

Modified: trunk/blender/extern/libmv/CMakeLists.txt
===================================================================
--- trunk/blender/extern/libmv/CMakeLists.txt	2013-04-05 09:22:54 UTC (rev 55802)
+++ trunk/blender/extern/libmv/CMakeLists.txt	2013-04-05 09:23:20 UTC (rev 55803)
@@ -45,12 +45,12 @@
 	libmv/multiview/euclidean_resection.cc
 	libmv/multiview/fundamental.cc
 	libmv/multiview/homography.cc
+	libmv/multiview/panography.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

Modified: trunk/blender/extern/libmv/ChangeLog
===================================================================
--- trunk/blender/extern/libmv/ChangeLog	2013-04-05 09:22:54 UTC (rev 55802)
+++ trunk/blender/extern/libmv/ChangeLog	2013-04-05 09:23:20 UTC (rev 55803)
@@ -1,3 +1,169 @@
+commit e3b2bccba6145290738a6677c14f7369ec7a38cd
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Thu Apr 4 02:59:58 2013 +0600
+
+    Suppress strict compiler warnings in glags/glog libraries
+
+commit 5fca459adcf0a3419fa9cd8d983dc2c952d02647
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Thu Apr 4 01:20:18 2013 +0600
+
+    Lint cleanup, mostly white space and line width.
+    
+    Also moved own includes to the top of files.
+    
+    Should be no functional changes :)
+
+commit 9a9dd458a622928b91dbd3c79900577923283838
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Fri Mar 29 00:20:29 2013 +0600
+
+    Fix for TransformTracks in uncalibrated pipeline
+    
+    Transformation matrix was completely ignored by
+    TransformTracks() and final marker coordinate
+    exactly matched it's source coordinates.
+    
+    Seems to be just a typo in vector usage: need to
+    use "b" (which is transformed one) instead of "a"
+    when converting projective coordinate to 2D space.
+
+commit d35766cc9901609e32f4d80faba715695bea3c40
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Fri Mar 29 00:19:11 2013 +0600
+
+    Revert part of e2eb58c4230f94ef0c72fb4005e5434088d52e80
+    
+    That commit included one change which shall have been
+    go as separate commit with more detailed description.
+
+commit e8d71b4e96fd78eb60773b6557d66da672e65753
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Wed Mar 27 20:37:05 2013 +0600
+
+    Silenced more warnings
+    
+    - Added includes of own header to fast implementation files.
+    
+    - Camera intrinsics wouldn't complain about unknown pragma when
+      building without OpenMP support.
+    
+    TODO: Make it a CMake option to build libmv with OpenMP support.
+    	  Currently multi-threaded intrinsics only available when
+          using custom CMake rules for bundled libmv version
+          (as it's done in Blender).
+
+commit ad442812654f270dc088394410fda1b81b8dc450
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Wed Mar 27 20:18:51 2013 +0600
+
+    Multithreaded camera intrinsics
+    
+    Implemented multithreaded buffer (un)distortion
+    for camera intrinsics using OpenMP.
+    
+    By default, (un)distortion is single-threaded,
+    but it is possible to as CameraIntrinsics to
+    use more threads by calling SetThreads method.
+
+commit c88b4881096174a16a9f9e6fc2c9dcad3e255b25
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Wed Mar 27 18:45:09 2013 +0600
+
+    Movie functions implementation from panography header
+    into own CC implementation file.
+    
+    Before this all panography functions were declared as
+    static, which is not so much useful from re-useability
+    point of view.
+
+commit 2d2faf9104bc035722cff6775e1b8e7c93143aba
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Wed Mar 27 18:37:36 2013 +0600
+
+    Build shared Ceres library only if BUILD_SHARED_LIBS is enabled
+
+commit daa3ddd3260ccaf2bf9c72eadb89213d91e549ec
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Wed Mar 27 18:21:52 2013 +0600
+
+    Update Ceres to upstream version 1.5.0
+
+commit cf5dc678878345ea3f221ce50cb2b9e539c2ab38
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Wed Mar 27 15:06:24 2013 +0600
+
+    Code cleanup: removed more deprecated FFmpeg API usage
+    
+    This time in qt-tracker application.
+
+commit e2eb58c4230f94ef0c72fb4005e5434088d52e80
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Tue Mar 26 17:19:51 2013 +0600
+
+    Code cleanup: silent unused variables warnings
+
+commit af89bb24667e39b7e655173ea807fdcfbeef4422
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Tue Mar 26 16:54:14 2013 +0600
+
+    Code cleanup: no need to declare empty body for ProgressUpdateCallback:invoke
+    
+    Make force this method to be overridden by derivative classes.
+    Also removed currently unneeded callbacks.cc.
+
+commit 0441d4ee06fad0219256a5704f931eec916a3868
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Tue Mar 26 16:37:27 2013 +0600
+
+    Code cleanup: silent type narrowing in qt-tracker
+
+commit cd4b61c976448d0fdedefb3ed4b21d70e078f94b
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Tue Mar 26 16:26:39 2013 +0600
+
+    Changes to unit testing
+    
+    - Move ceres test binaries to ${LIBMV_TESTS_OUTPUT_DIR}/ceres,
+      so they don't mess with libmv's application binaries and
+      tests.
+    
+    - Removed ceres_ prefix from ceres unit tests, only use this
+      prefix for targets (targets need to be unique name).
+    
+    - Added unit tests data for ceres, otherwise system_test fails.
+    
+    - Restored "test" makefile target.
+
+commit cf704ada08acc8b26167e7bfb3e1e88fd278de23
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Tue Mar 26 15:01:15 2013 +0600
+
+    Code cleanup: use rw-rw-r-- mode for source files
+
+commit 64b31e3e43acb52aaf6f591b9d1c2449bf6ef3bd
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Tue Mar 26 14:57:46 2013 +0600
+
+    Code cleanup: don't use deprecated FFmpeg API functions
+
+commit 2a3676499548ad5dba5a5c5eadf3bb71e640b612
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Tue Mar 5 17:40:52 2013 +0600
+
+    Switch from DENSE_NORMAL_CHOLESKY to DENSE_QR
+    
+    DENSE_QR is better behaved numerically and after recent
+    changes from Sameer there's no big difference in speed.
+
+commit bcb920df02133da5b7e55fbc74edb9222004eecc
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Tue Mar 5 17:15:43 2013 +0600
+
+    Update Ceres to 1.5RC3
+    
+    It brings optimization of DENSE_QR and DENSE_SCHUR solvers.
+
 commit 473996468a4e67e7c860169181a4ff31ce9b8c80
 Author: Sergey Sharybin <sergey.vfx at gmail.com>
 Date:   Fri Mar 1 17:44:54 2013 +0600
@@ -533,268 +699,3 @@
       aborts immediately. The workaround for now is to disable the
       correlation checking, and examine your tracks carefully. A
       fix will get added shortly.
-
-commit 81d028f13738ebe2304287dfce90e91bc782e2cf
-Author: Keir Mierle <mierle at gmail.com>
-Date:   Fri May 18 20:04:43 2012 +0000
-
-    Remove an unnecessary template<> line in libmv. Convert debug logs to LG.
-
-commit 238aaba241ef99995d254aadc974db719da04b96
-Author: Keir Mierle <mierle at gmail.com>
-Date:   Fri May 18 12:05:10 2012 +0000
-
-    Support normalization in the tracking prepass
-    
-    The last tracker commit added normalized tracking. This makes
-    tracking patches undergoing uniform illumination change easier.
-    However, the prepass which computes a quick translation-only
-    estimate of the warp did not take this into account. This commit
-    fixes that.
-    
-    This works reasonably well but in some examples the brute
-    initialization fails. I suspect this is due to the warped template
-    estimate in the current  frame being too different from the
-    original, so there are multiple peaks in the normalized-SAD
-    correlation function.
-    
-    The solution is to use the previous frame for the brute
-    initialization and the keyframe for refinement, but that requires
-    architecture changes.
-
-commit 981ca4f6a679cd9ac3d086eae3cd946ce72ca8a5
-Author: Keir Mierle <mierle at gmail.com>
-Date:   Fri May 18 02:12:47 2012 +0000
-
-    Add light-normalized tracking to the planar tracker
-    
-    This commit adds the ability to normalize patterns by their
-    average value while tracking, to make them invariant to global
-    illumination changes.
-    
-    To see this in action, check out the "Lobby" scene from Hollywood
-    VFX. If you track the markers that are shadowed by the actress,
-    previously they would not track. With the scale adaption on, the
-    tracker would shrink the area to compensate for the changed
-    illumination, losing the track. With "Normalize" turned on, the
-    patch is correctly tracked and scale is maintained.
-    
-    A remaining problem is that only the Ceres cost function is
-    updated to handle the normalization. The brute translation search
-    does not take this into account. Perhaps "Prepass" (see below)
-    should get disabled if normalization is enabled until I fix the
-    prepass to normalize as well.
-    
-    There are a few other changes:
-    
-    - Bail out of the sampling loop early if the mask is zero; this
-      saves expensive samples of the image derivatives.
-    
-    - Fix a bug where the mask was ignored when sampling in the cost
-      functor.
-
-commit e9384b15fb2a6a5b81346d5758fa136f0911e945
-Author: Keir Mierle <mierle at gmail.com>
-Date:   Thu May 17 23:53:32 2012 +0000
-
-    Implement support for affine tracking in the planar tracker; cleanups.
-
-commit 021d41eed8b4ce6a4e37786ccd357ed5dc83a13f
-Author: Keir Mierle <mierle at gmail.com>
-Date:   Thu May 17 21:26:06 2012 +0000
-
-    For the planar tracker, initialize the warp from the four correspondences
-    after brute force translation search.
-
-commit 003d1bf6145cfd30938b35f6e10d43708dbf916c
-Author: Sergey Sharybin <sergey.vfx at gmail.com>
-Date:   Thu Dec 6 16:56:01 2012 +0600
-
-    Correction to region tracker options initialization.
-    
-    Based on patch from Keir to Blender:
-    https://svn.blender.org/svnroot/bf-blender/branches/soc-2011-tomato@46743
-
-commit 6af47b218cfdf5219f0ebb3cb95459817cf9abf2
-Author: Keir Mierle <mierle at gmail.com>
-Date:   Thu May 17 02:31:52 2012 +0000
-

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list