Make IPFeature use given Camera ID

Previously it was using the information available in Control Measure. Yet not always do I want to use this value.
harguess · Aug 12, 2010 · aefd201 · aefd201
1 parent a8e582d
commit aefd201
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/vw/BundleAdjustment/CameraRelation.cc b/src/vw/BundleAdjustment/CameraRelation.cc
@@ -95,7 +95,7 @@ namespace ba {
         }
 
         // Appending to list
-        features_added.push_back( f_ptr( new FeatureT(*cmiter, cp_i) ) );
+        features_added.push_back( f_ptr( new FeatureT(*cmiter, cmiter->image_id()) ) );
 
         // Attaching to camera node
         (*this)[cmiter->image_id()].relations.push_back( features_added.back() );

diff --git a/src/vw/BundleAdjustment/CameraRelation.h b/src/vw/BundleAdjustment/CameraRelation.h
@@ -107,8 +107,8 @@ namespace ba {
     FeatureBase<IPFeature>(id), m_ip(ip) {}
     // For building from control networks
     IPFeature ( ControlMeasure const& cmeas,
-                uint32 const& /*point_id*/ ) :
-    FeatureBase<IPFeature>( cmeas.image_id() ) {
+                uint32 const& cam_id ) :
+    FeatureBase<IPFeature>( cam_id ) {
       m_ip = ip::InterestPoint( cmeas.position()[0],
                                 cmeas.position()[1],
                                 cmeas.sigma()[0] );