Commit edd49744 authored Dec 08, 2015 by Jeannie Backer

Updating after merging to trunk

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@6465 41f8697f-d340-4b68-9986-7bafba869bb8

parent c23fc39d

isis/src/base/objs/CameraGroundMap/CameraGroundMap.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -160,7 +160,7 @@ namespace Isis {

		// Should a check be added to make sure SetImage has been called???

		// Get spacecraft vector in body-fixed coordinates
		// Get spacecraft vector in j2000 coordinates
		SpiceRotation *bodyRot = p_camera->bodyRotation();
		SpiceRotation *instRot = p_camera->instrumentRotation();
		std::vector<double> pJ = bodyRot->J2000Vector(pB);
		@@ -387,7 +387,7 @@ namespace Isis {
		/** Compute derivative of focal plane coordinate w/r to one of the ellipsoidal radii (a, b, or c)
		*
		* This method will compute the derivative of the undistorted focal plane coordinate for
		* a ground position with respect to the a (major axis), b (minor axis), or c (polar axis) radius,
		*a a ground position with respect to the a (major axis), b (minor axis), or c (polar axis) radius,
		* using the current Spice settings (time and kernels) without resetting the current point
		* values for lat/lon/radius/x/y.
		*

isis/src/base/objs/FileName/FileName.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -104,7 +104,8 @@ namespace Isis {
		* unpredictable (safe) names.
		* @history 2012-06-04 Steven Lambright and Stuart Sides - Added operator!= and improved unit
		* test to include tests of operator== and operator!=. Fixes #903.
		* @history 2014-07-23 Jeannie Backer - Removed include for std::string.
		* @history 2014-07-23 Jeannie Backer - Moved ifndef to top of file to bring class closer to
		* ISIS coding standards and removed include for std::string.
		*/
		class FileName {
		public: