Commit ed048b9c authored by Ken Edmundson's avatar Ken Edmundson
Browse files

bugs after fixing merge conflicts

parent ea963c8d

isis/src/control/objs/BundleUtilities/BundleLidarControlPoint.cpp

+5 −2
Original line number Diff line number Diff line
@@ -31,13 +31,16 @@ namespace Isis { 
   * Constructs a BundleLidarControlPoint object from a LidarControlPoint. Only the

   * non-ignored measures are added to the BundleLidarControlPoint.

   *  

   * @param bundleSettings BundleSettings.

   *

   * @param controlPoint Pointer to a ControlPoint that will be used to 

   *                     construct this BundleLidarControlPoint.

   *

   * TODO: is the typecast expensive?

   */

  BundleLidarControlPoint::BundleLidarControlPoint(LidarControlPointQsp lidarControlPoint)

    : BundleControlPoint((ControlPoint*)  lidarControlPoint.data()) {

  BundleLidarControlPoint::BundleLidarControlPoint(const BundleSettingsQsp bundleSettings,

                                                   LidarControlPointQsp lidarControlPoint)

    : BundleControlPoint(bundleSettings, (ControlPoint*)  lidarControlPoint.data()) {



    m_lidarControlPoint = lidarControlPoint;

  }

isis/src/control/objs/BundleUtilities/BundleLidarControlPoint.h

+3 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 


#include "BundleControlPoint.h"

#include "BundleMeasure.h"

#include "BundleSettings.h"

#include "LidarControlPoint.h"



namespace Isis {
@@ -53,8 +54,8 @@ namespace Isis { 
  class BundleLidarControlPoint : public BundleControlPoint {



    public:

      BundleLidarControlPoint(LidarControlPointQsp lidarControlPoint);

//    BundleLidarControlPoint(const BundleLidarControlPoint &src);

      BundleLidarControlPoint(BundleSettingsQsp bundleSettings,

                              LidarControlPointQsp lidarControlPoint);

      ~BundleLidarControlPoint();



      // copy