[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58637] branches/soc-2013-motion_track/ extern/libmv/libmv-capi_stub.cc: Fix error when compiling with WITH_LIBMV= OFF

Joseph Mansfield sftrabbit at gmail.com
Sat Jul 27 01:13:15 CEST 2013


Revision: 58637
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58637
Author:   sftrabbit
Date:     2013-07-26 23:13:14 +0000 (Fri, 26 Jul 2013)
Log Message:
-----------
Fix error when compiling with WITH_LIBMV=OFF

Adjust libmv-capi_stub.cc to match recent changes to the C API header, otherwise it won't compile with WITH_LIBMV=OFF.

Modified Paths:
--------------
    branches/soc-2013-motion_track/extern/libmv/libmv-capi_stub.cc

Modified: branches/soc-2013-motion_track/extern/libmv/libmv-capi_stub.cc
===================================================================
--- branches/soc-2013-motion_track/extern/libmv/libmv-capi_stub.cc	2013-07-26 22:19:46 UTC (rev 58636)
+++ branches/soc-2013-motion_track/extern/libmv/libmv-capi_stub.cc	2013-07-26 23:13:14 UTC (rev 58637)
@@ -94,7 +94,7 @@
 
 /* ************ Reconstruction solver ************ */
 
-libmv_Reconstruction *libmv_solveReconstruction(const libmv_Tracks * /*libmv_tracks*/,
+libmv_Reconstruction *libmv_solve(const libmv_Tracks * /*libmv_tracks*/,
 			const libmv_cameraIntrinsicsOptions * /*libmv_camera_intrinsics_options*/,
 			libmv_reconstructionOptions * /*libmv_reconstruction_options*/,
 			reconstruct_progress_update_cb /*progress_update_callback*/,
@@ -103,15 +103,6 @@
 	return NULL;
 }
 
-struct libmv_Reconstruction *libmv_solveModal(const struct libmv_Tracks * /*libmv_tracks*/,
-			const libmv_cameraIntrinsicsOptions * /*libmv_camera_intrinsics_options*/,
-			const libmv_reconstructionOptions * /*libmv_reconstruction_options*/,
-			reconstruct_progress_update_cb /*progress_update_callback*/,
-			void * /*callback_customdata*/)
-{
-	return NULL;
-}
-
 int libmv_reporojectionPointForTrack(const libmv_Reconstruction * /*libmv_reconstruction*/,
                                      int /*track*/, double /*pos*/[3])
 {




More information about the Bf-blender-cvs mailing list