Commit e236be86 authored by Curtis Rose's avatar Curtis Rose
Browse files

Changed return values of several functions in the Camera class from -1 to Isis::Null. Fixes #2065 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@6941 41f8697f-d340-4b68-9986-7bafba869bb8
parent caf28ea0

isis/src/base/objs/Camera/Camera.cpp

+4 −3
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
#include "ProjectionFactory.h"

#include "RingPlaneProjection.h"

#include "ShapeModel.h"

#include "SpecialPixel.h"

#include "SurfacePoint.h"

#include "Target.h"

#include "TProjection.h"
@@ -476,7 +477,7 @@ namespace Isis { 
      double dist = sqrt(a * a + b * b + c * c) * 1000.0;

      return dist / (p_focalLength / p_pixelPitch);

    }

    return -1.0;

    return Isis::Null;

  }



  /**
@@ -505,8 +506,8 @@ namespace Isis { 
  double Camera::PixelResolution() {

    double lineRes = LineResolution();

    double sampRes = SampleResolution();

    if (lineRes < 0.0) return -1.0;

    if (sampRes < 0.0) return -1.0;

    if (lineRes < 0.0) return Isis::Null;

    if (sampRes < 0.0) return Isis::Null;

    return (lineRes + sampRes) / 2.0;

  }

isis/src/base/objs/Camera/Camera.h

+2 −0
Original line number Diff line number Diff line
@@ -220,6 +220,8 @@ namespace Isis { 
   *                           References #2335.

   *   @history 2016-06-27 Kelvin Rodriguez - Added member function to compute celestial north

   *                           clock angle. References #2365

   *   @history 2016-08-01 Curtis Rose - Changed return values of resolutions from -1 to Isis::Null.

   *                           Fixes #2065.

   */



  class Camera : public Sensor {