[Bf-blender-cvs] [473653f3379] soc-2016-multiview: replace Set(Get)ClipNum() with MaxClip()+1

[Tianwei Shen]

Commit: 473653f33798b727148e8f6379f31cbba95de479
Author: Tianwei Shen
Date:   Sat Apr 15 18:34:24 2017 +0800
Branches: soc-2016-multiview
https://developer.blender.org/rB473653f33798b727148e8f6379f31cbba95de479

replace Set(Get)ClipNum() with MaxClip()+1

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

M	intern/libmv/intern/reconstructionN.cc
M	intern/libmv/libmv/autotrack/bundle.cc
M	intern/libmv/libmv/autotrack/pipeline.cc
M	intern/libmv/libmv/autotrack/reconstruction.cc
M	intern/libmv/libmv/autotrack/tracks.cc
M	intern/libmv/libmv/autotrack/tracks.h

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

diff --git a/intern/libmv/intern/reconstructionN.cc b/intern/libmv/intern/reconstructionN.cc
index 63a8d6fbd7c..2c6a6d741d4 100644
--- a/intern/libmv/intern/reconstructionN.cc
+++ b/intern/libmv/intern/reconstructionN.cc
@@ -105,7 +105,7 @@ bool ReconstructionUpdateFixedIntrinsics(libmv_ReconstructionN **all_libmv_recon
                                          Tracks *tracks,
                                          Reconstruction *reconstruction)
 {
-  int clip_num = tracks->GetClipNum();
+  int clip_num = tracks->MaxClip() + 1;
   for (int i = 0; i < clip_num; i++) {
     CameraIntrinsics *camera_intrinsics = all_libmv_reconstruction[i]->intrinsics;
     int cam_intrinsic_index = reconstruction->AddCameraIntrinsics(camera_intrinsics);
@@ -274,8 +274,6 @@ libmv_ReconstructionN** libmv_solveMultiviewReconstruction(
   int keyframe1, keyframe2;
 
   Tracks all_tracks, all_normalized_tracks;	// normalized tracks of all clips
-  all_tracks.SetClipNum(clip_num);
-  all_normalized_tracks.SetClipNum(clip_num);
   for (int i = 0; i < clip_num; i++) {
     all_libmv_reconstruction[i] = LIBMV_OBJECT_NEW(libmv_ReconstructionN);
     Tracks &tracks = *((Tracks *) all_libmv_tracks[i]);		// Tracks are just a bunch of markers
diff --git a/intern/libmv/libmv/autotrack/bundle.cc b/intern/libmv/libmv/autotrack/bundle.cc
index 1c8f7e9e410..495b1d6c1ef 100644
--- a/intern/libmv/libmv/autotrack/bundle.cc
+++ b/intern/libmv/libmv/autotrack/bundle.cc
@@ -245,7 +245,7 @@ vector<Vec6> PackMultiCamerasRotationAndTranslation(
         const Reconstruction &reconstruction,
         vector<vector<int> > &camera_pose_map)  {
   vector<Vec6> all_cameras_R_t;
-  int clip_num = tracks.GetClipNum();
+  int clip_num = tracks.MaxClip() + 1;
   camera_pose_map.resize(clip_num);
   int total_frame = 0;
   for(int i = 0; i < clip_num; i++) {
@@ -278,7 +278,7 @@ void UnpackMultiCamerasRotationAndTranslation(
     const Tracks &tracks,
     const vector<Vec6> &all_cameras_R_t,
     Reconstruction *reconstruction) {
-  int clip_num = tracks.GetClipNum();
+  int clip_num = tracks.MaxClip() + 1;
   int frame_count = 0;
   for(int i = 0; i < clip_num; i++) {
     int max_frame = tracks.MaxFrame(i);
@@ -361,7 +361,7 @@ void MultiviewBundlerPerformEvaluation(const Tracks &tracks,
 
       // Cameras goes first in the ordering.
     int frame_count = 0;
-    int clip_num = tracks.GetClipNum();
+    int clip_num = tracks.MaxClip() + 1;
     for(int i = 0; i < clip_num; i++) {
       int max_frame = tracks.MaxFrame(i);
       for(int j = 0; j < max_frame; j++) {
diff --git a/intern/libmv/libmv/autotrack/pipeline.cc b/intern/libmv/libmv/autotrack/pipeline.cc
index 1545ebda76f..ec85cc78e1f 100644
--- a/intern/libmv/libmv/autotrack/pipeline.cc
+++ b/intern/libmv/libmv/autotrack/pipeline.cc
@@ -110,7 +110,7 @@ bool InternalCompleteReconstruction(
     const Tracks &tracks,
     typename PipelineRoutines::Reconstruction *reconstruction,
     libmv::ProgressUpdateCallback *update_callback = NULL) {
-  int clip_num = tracks.GetClipNum();
+  int clip_num = tracks.MaxClip() + 1;
   int num_frames = 0;
   for(int i = 0; i < clip_num; i++) {
     num_frames += tracks.MaxFrame(i) + 1;
diff --git a/intern/libmv/libmv/autotrack/reconstruction.cc b/intern/libmv/libmv/autotrack/reconstruction.cc
index b62a3bf8fc9..3c1acf5dfff 100644
--- a/intern/libmv/libmv/autotrack/reconstruction.cc
+++ b/intern/libmv/libmv/autotrack/reconstruction.cc
@@ -206,7 +206,7 @@ int Reconstruction::GetReconstructedCameraNum() const {
 }
 
 void Reconstruction::InitIntrinsicsMap(Tracks &tracks) {
-  int clip_num = tracks.GetClipNum();
+  int clip_num = tracks.MaxClip() + 1;
   intrinsics_map.resize(clip_num);
   for (int i = 0; i < clip_num; i++) {
     intrinsics_map.resize(tracks.MaxFrame(i)+1);
@@ -217,7 +217,7 @@ void Reconstruction::InitIntrinsicsMap(Tracks &tracks) {
 }
 
 void Reconstruction::InitIntrinsicsMapFixed(Tracks &tracks) {
-  int clip_num = tracks.GetClipNum();
+  int clip_num = tracks.MaxClip() + 1;
   intrinsics_map.resize(clip_num);
   for (int i = 0; i < clip_num; i++) {
     intrinsics_map[i].resize(tracks.MaxFrame(i)+1);
diff --git a/intern/libmv/libmv/autotrack/tracks.cc b/intern/libmv/libmv/autotrack/tracks.cc
index 98a503d93c7..c72d0188769 100644
--- a/intern/libmv/libmv/autotrack/tracks.cc
+++ b/intern/libmv/libmv/autotrack/tracks.cc
@@ -215,14 +215,6 @@ int Tracks::NumMarkers() const {
   return markers_.size();
 }
 
-void Tracks::SetClipNum(int clip_num) {
-  clip_num_ = clip_num;
-}
-
-int Tracks::GetClipNum() const {
-  return clip_num_;
-}
-
 void CoordinatesForMarkersInFrame(const vector<Marker> &markers,
                                   int clip, int frame,
                                   libmv::Mat *coordinates) {
diff --git a/intern/libmv/libmv/autotrack/tracks.h b/intern/libmv/libmv/autotrack/tracks.h
index dbb23951606..8f63464a763 100644
--- a/intern/libmv/libmv/autotrack/tracks.h
+++ b/intern/libmv/libmv/autotrack/tracks.h
@@ -60,8 +60,6 @@ class Tracks {
                                        int clip2, int frame2,
                                        vector<Marker> *markers) const;
   void GetAllMarkers(vector<Marker> *markers) const;
-  void SetClipNum(int clip_num);
-  int GetClipNum() const;
 
   /// add a marker
   void AddMarker(const Marker& marker);
@@ -83,7 +81,6 @@ class Tracks {
 
  private:
   vector<Marker> markers_;
-  int clip_num_;		/* clips are indexed consecutively, [0, 1, ..., clip_num_-1] */
 
   // TODO(keir): Consider adding access-map data structures to avoid all the
   // linear lookup penalties for the accessors.