[Bf-blender-cvs] [8280dc4] soc-2016-multiview: confirm bugs in correspondence saving

[Tianwei Shen]

Commit: 8280dc41b36db413d83efde995fb62ef922ad26b
Author: Tianwei Shen
Date:   Tue Jul 5 17:46:20 2016 +0800
Branches: soc-2016-multiview
https://developer.blender.org/rB8280dc41b36db413d83efde995fb62ef922ad26b

confirm bugs in correspondence saving

===================================================================

M	intern/libmv/libmv/autotrack/bundle.cc
M	intern/libmv/libmv/autotrack/intersect.cc
M	source/blender/blenkernel/intern/tracking_correspondence.c

===================================================================

diff --git a/intern/libmv/libmv/autotrack/bundle.cc b/intern/libmv/libmv/autotrack/bundle.cc
index 3d2e275..1c8f7e9 100644
--- a/intern/libmv/libmv/autotrack/bundle.cc
+++ b/intern/libmv/libmv/autotrack/bundle.cc
@@ -252,7 +252,6 @@ vector<Vec6> PackMultiCamerasRotationAndTranslation(
   	total_frame += tracks.MaxFrame(i) + 1;
   	camera_pose_map[i].resize(tracks.MaxFrame(i) + 1);
   }
-  printf("total frame: %d\n", total_frame);
 
   all_cameras_R_t.resize(total_frame);	// maximum possible number of camera poses
 
diff --git a/intern/libmv/libmv/autotrack/intersect.cc b/intern/libmv/libmv/autotrack/intersect.cc
index b2e2a4a..e6d5139 100644
--- a/intern/libmv/libmv/autotrack/intersect.cc
+++ b/intern/libmv/libmv/autotrack/intersect.cc
@@ -100,7 +100,7 @@ bool EuclideanIntersect(const vector<Marker> &markers,
   }
 
   Vec4 Xp;
-  std::cout << "Intersecting with " << markers.size() << " markers.\n";
+  LG << "Intersecting with " << markers.size() << " markers.\n";
   libmv::NViewTriangulateAlgebraic(points, cameras, &Xp);
 
   // Get euclidean version of the homogeneous point.
@@ -131,9 +131,9 @@ bool EuclideanIntersect(const vector<Marker> &markers,
   // TODO(sergey): Once we'll update Ceres to the next version
   // we wouldn't need this check anymore -- Ceres will deal with
   // zero-sized problems nicely.
-  std::cout << "Number of residuals: " << num_residuals << "\n";
+  LG << "Number of residuals: " << num_residuals << "\n";
   if (!num_residuals) {
-    std::cout << "Skipping running minimizer with zero residuals\n";
+    LG << "Skipping running minimizer with zero residuals\n";
 
 	// We still add 3D point for the track regardless it was
 	// optimized or not. If track is a constant zero it'll use
diff --git a/source/blender/blenkernel/intern/tracking_correspondence.c b/source/blender/blenkernel/intern/tracking_correspondence.c
index 6e2ca14..c666bfb 100644
--- a/source/blender/blenkernel/intern/tracking_correspondence.c
+++ b/source/blender/blenkernel/intern/tracking_correspondence.c
@@ -312,6 +312,7 @@ BKE_tracking_multiview_reconstruction_context_new(MovieClip **clips,
 			int num_valid_corrs = libmv_CorrespondencesFromTracking(&tracking->correspondences, clips,
 			                                                        num_clips, context->correspondences,
 			                                                        context->track_global_index);
+			printf("num_valid_corrs: %d", num_valid_corrs);
 			BLI_assert(num_valid_corrs == BLI_listbase_count(&tracking->correspondences));
 
 			BLI_strncpy(context->object_name, object->name, sizeof(context->object_name));
@@ -512,7 +513,6 @@ static bool multiview_reconstruct_retrieve_libmv_info(MovieMultiviewReconstructC
 	}
 	else {
 		MovieTrackingObject *object = BKE_tracking_object_get_named(tracking, context->object_name);
-
 		tracksbase = &object->tracks;
 		reconstruction = &object->reconstruction;
 	}