Merge pull request #257 from mleotta/dev/update-wrt-kwiver-feature-tr…

…acks Removed simple_feature_track_set in to match KWIVER API changes.
Kitware · Aug 11, 2017 · 26c3a2c · 26c3a2c
2 parents 48ea683 + 3058189
commit 26c3a2c
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/gui/tools/AbstractTool.cxx b/gui/tools/AbstractTool.cxx
@@ -72,7 +72,7 @@ void ToolData::copyTracks(feature_track_set_sptr const& newTracks)
       copiedTracks.push_back(ti->clone());
     }
     this->tracks =
-      std::make_shared<kwiver::vital::simple_feature_track_set>(copiedTracks);
+      std::make_shared<kwiver::vital::feature_track_set>(copiedTracks);
   }
   else
   {

diff --git a/maptk/colorize.cxx b/maptk/colorize.cxx
@@ -102,7 +102,7 @@ extract_feature_colors(
     }
   }
 
-  return std::make_shared<vital::simple_feature_track_set>(trks);
+  return std::make_shared<vital::feature_track_set>(trks);
 }
 
 

diff --git a/maptk/geo_reference_points_io.cxx b/maptk/geo_reference_points_io.cxx
@@ -157,7 +157,7 @@ void load_reference_file(vital::path_t const& reference_file,
   }
 
   ref_landmarks = std::make_shared<vital::simple_landmark_map>(reference_lms);
-  ref_track_set = std::make_shared<vital::simple_feature_track_set>(reference_tracks);
+  ref_track_set = std::make_shared<vital::feature_track_set>(reference_tracks);
 }
 
 

diff --git a/tools/apply_gcp.cxx b/tools/apply_gcp.cxx
@@ -406,7 +406,7 @@ static int maptk_main(int argc, char const* argv[])
   }
 
   kwiver::vital::landmark_map_sptr reference_landmarks(new kwiver::vital::simple_landmark_map());
-  kwiver::vital::feature_track_set_sptr reference_tracks = std::make_shared<kwiver::vital::simple_feature_track_set>();
+  kwiver::vital::feature_track_set_sptr reference_tracks = std::make_shared<kwiver::vital::feature_track_set>();
   if (config->get_value<std::string>("input_reference_points_file", "") != "")
   {
     kwiver::vital::path_t ref_file = config->get_value<kwiver::vital::path_t>("input_reference_points_file");

diff --git a/tools/bundle_adjust_tracks.cxx b/tools/bundle_adjust_tracks.cxx
@@ -625,7 +625,7 @@ static int maptk_main(int argc, char const* argv[])
   }
 
   kwiver::vital::landmark_map_sptr reference_landmarks(new kwiver::vital::simple_landmark_map());
-  kwiver::vital::feature_track_set_sptr reference_tracks = std::make_shared<kwiver::vital::simple_feature_track_set>();
+  kwiver::vital::feature_track_set_sptr reference_tracks = std::make_shared<kwiver::vital::feature_track_set>();
   if (config->get_value<std::string>("input_reference_points_file", "") != "")
   {
     kwiver::vital::path_t ref_file = config->get_value<kwiver::vital::path_t>("input_reference_points_file");