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

bugs after fixing merge conflicts

parent 75183e72

isis/src/control/objs/BundleAdjust/BundleAdjust.h

+2 −1
Original line number Diff line number Diff line
@@ -442,7 +442,8 @@ namespace Isis { 
                           LinearAlgebra::Matrix  &coeffImagePointing,

                           LinearAlgebra::Matrix  &coeffPoint3D,

                           LinearAlgebra::Vector  &coeffRHS,

                           BundleMeasureQsp       measure);

                           BundleMeasure          &measure,

                           BundleControlPoint     &point);

      bool formMeasureNormals(LinearAlgebra::MatrixUpperTriangular &N22, //!< multi-segment version

                              SparseBlockColumnMatrix              &N12,

                              LinearAlgebra::VectorCompressed      &n1,