Commit 8f1a6f74 authored by Jesse Mapel's avatar Jesse Mapel Committed by Makayla Shepherd
Browse files

Removed null initialization from ControlpointV0001

parent 3608554d

isis/src/control/objs/ControlNetVersioner/ControlPointV0001.cpp

+5 −15
Original line number Diff line number Diff line
@@ -437,20 +437,6 @@ namespace Isis { 
        group.deleteKeyword("ErrorLine");

      }



      double sampleResidualValue = Isis::Null;

      if (group.hasKeyword("SampleResidual")) {

        sampleResidualValue = toDouble(group["SampleResidual"][0]);

        group.deleteKeyword("SampleResidual");

      }

      measure.mutable_measurement()->set_sampleresidual(sampleResidualValue);



      double lineResidualValue = Isis::Null;

      if (group.hasKeyword("LineResidual")) {

        lineResidualValue = toDouble(group["LineResidual"][0]);

        group.deleteKeyword("LineResidual");

      }

      measure.mutable_measurement()->set_lineresidual(lineResidualValue);



      if (group.hasKeyword("Reference")) {

        if (group["Reference"][0].toLower() == "true") {

          m_pointData->set_referenceindex(groupIndex);
@@ -721,6 +707,10 @@ namespace Isis { 
                               ControlNetFileProtoV0001_PBControlPoint_PBControlMeasure &measure,

                               void (ControlNetFileProtoV0001_PBControlPoint_PBControlMeasure::*setter)(double)) {



    if (!container.hasKeyword(keyName)) {

      return;

    }



    double value = Isis::Null;

    if ( container.hasKeyword(keyName) ) {

      value = toDouble(container[keyName][0]);