Commit 51e618cb authored by Jeannie Backer's avatar Jeannie Backer
Browse files

PROG: Fixed bug in CameraDistortionMap from merging code. 

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

isis/src/base/objs/CameraDistortionMap/CameraDistortionMap.cpp

+6 −6
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ namespace Isis { 
   *  

   * @returns The distorted focal plane x.

   */

  double FocalPlaneX() const {

  double CameraDistortionMap::FocalPlaneX() const {

    return p_focalPlaneX;

  }
@@ -239,7 +239,7 @@ namespace Isis { 
   *  

   * @returns The distorted focal plane y.

   */

  double FocalPlaneY() const {

  double CameraDistortionMap::FocalPlaneY() const {

    return p_focalPlaneY;

  }
@@ -250,7 +250,7 @@ namespace Isis { 
   * 

   *@returns The undistorted focal plane x

   */

  double UndistortedFocalPlaneX() const {

  double CameraDistortionMap::UndistortedFocalPlaneX() const {

    return p_undistortedFocalPlaneX;

  }
@@ -261,7 +261,7 @@ namespace Isis { 
   *  

   * @returns The undistorted focal plane y

   */

  double UndistortedFocalPlaneY() const {

  double CameraDistortionMap::UndistortedFocalPlaneY() const {

    return p_undistortedFocalPlaneY;

  }
@@ -273,7 +273,7 @@ namespace Isis { 
   *  

   * @returns The undistorted focal plane z

   */

  double UndistortedFocalPlaneZ() const {

  double CameraDistortionMap::UndistortedFocalPlaneZ() const {

    return p_zDirection *p_camera->FocalLength();

  }

isis/src/base/objs/CameraDistortionMap/CameraDistortionMap.h

+0 −1
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ namespace Isis { 
   *   @history 2017-09-04 Kristin Berry - Made SetDistortion virtual so that

   *                           individual camera model distortion maps can

   *                           set the values.

   *

   */

  class CameraDistortionMap {

    public: