Commit b6b6661c authored Sep 28, 2018 by Kaitlyn Lee

Fixed build warnings on MacOS 10.13.

parent f7c0c5d5

isis/src/base/objs/ProcessExport/ProcessExport.cpp

+70 −69

Original line number	Diff line number	Diff line
		@@ -1114,7 +1114,7 @@ namespace Isis {
		out8[samp] = 0;
		}
		else if (pixel >= 255.0) {
		out8[samp] = 255;
		out8[samp] = (char)255;
		}
		else {
		out8[samp] = (char)(in[samp] + 0.5); //Rounds
		@@ -1149,7 +1149,8 @@ namespace Isis {
		double pixel = in[samp];
		short tempShort;
		if (pixel <= -32768.0) {
		tempShort = -(short)32768;
		tempShort = (short)32768;
		tempShort = -1 * tempShort;
		}
		else if (pixel >= 32767.0) {
		tempShort = (short)32767;

isis/src/base/objs/ProcessExport/ProcessExport.h

+12 −10

Original line number	Diff line number	Diff line
		@@ -114,11 +114,13 @@ namespace Isis {
		* and checksum(). Added m_cryptographicHash and m_canGenerateChecksum.
		* This allows an MD5 checksum to be generated when exporting an image.
		* This checksum is generated based on the image data. Fixes #1013.
		*
		* @todo 2005-02-09 Stuart Sides - write documentation for CreateWorldFile
		* method
		* @todo 2005-02-09 Jeff Anderson - add coded example to class file and
		* implementation examples
		* @history 2018-09-28 Kaitlyn Lee - Added (char) cast to fix implicit conversion. Split up
		* "-(short)32768" into two lines. Fixes build warnings on MacOS 10.13.
		* Updated code up to standards. References #5520.
		*/
		class ProcessExport : public Isis::Process {

isis/src/base/objs/RadarSlantRangeMap/RadarSlantRangeMap.cpp

+16 −18

Original line number	Diff line number	Diff line
		@@ -144,12 +144,10 @@ namespace Isis {
		if (abs(funcMin) <= abs(funcMax)) {
		//min is closer
		xMin = xMax - 2*dist;
		xMax = xMax; //doesn't change
		}
		else {
		//max is closer
		xMax = xMin + 2*dist;
		xMin = xMin; //doesn't change
		}

		funcMin = slant -(p_a[0]+ xMin (p_a[1] + xMin (p_a[2] + xMin * p_a[3])));

isis/src/base/objs/RadarSlantRangeMap/RadarSlantRangeMap.h

+18 −15

Original line number	Diff line number	Diff line
		@@ -59,8 +59,11 @@ namespace Isis {
		* the sensor model for LRO and Chandrayaan's MiniRF to not be able to
		* calculate and report lat/lon in the LXB mode. References #2400.
		* @history 2016-08-01 Kristin Berry - Added the ability to extend the range of the initial root
		* bracket in SetUndistortedFocalPlan if the initial range was too narrow.
		* Also added RAs & DECs to the camera model.References #2400.
		* bracket in SetUndistortedFocalPlan if the initial range was too
		* narrow. Also added RAs & DECs to the camera model.References #2400.
		* @history 2018-09-28 Kaitlyn Lee - Removed unnecessary lines of code that were
		* causing build warnings on MacOS 10.13. Updated code up to standards.
		* References #5520.
		*
		*/
		class RadarSlantRangeMap : public CameraDistortionMap {

isis/src/base/objs/TProjection/TProjection.cpp

+4 −3

Original line number	Diff line number	Diff line
		@@ -1564,9 +1564,10 @@ namespace Isis {
		}
		if (!m_good) {
		minBorderX = Null;
		minBorderY = minBorderX;
		minBorderX = minBorderX;
		minBorderY = minBorderX;
		minBorderY = Null;
		// minBorderY = minBorderX;
		// minBorderX = minBorderX;
		// minBorderY = minBorderX;
		return;
		}
		}