Commit c212a42c authored Aug 12, 2015 by David Miller

Fixed bug that crashed map2map when the keyword Scale is missing from MAP. Fixes #2151

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

parent 5e84ff91

isis/src/base/apps/map2map/map2map.cpp

+1 −2

Original line number	Diff line number	Diff line
		@@ -118,8 +118,7 @@ void IsisMain() {
		outMappingGrp.deleteKeyword("PixelResolution");
		}

		if(fromMappingGrp.hasKeyword("Scale"));
		{
		if(fromMappingGrp.hasKeyword("Scale")) {
		fromMappingGrp.deleteKeyword("Scale");
		}

isis/src/base/apps/map2map/map2map.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -133,6 +133,9 @@
		<change name="Tracie Sucharski" date="2012-12-06">
		Changed to use TProjection instead of Projection. References #775
		</change>
		<change name="David L Miller" date="2015-08-10">
		Fixed bug where map2map fails when missing Scale keyword in the MAP file. Fixes #2151
		</change>
		</history>

		<oldName>

isis/src/base/apps/map2map/tsts/keywords/Makefile

0 → 100644

+16 −0

Original line number	Diff line number	Diff line
		APPNAME = map2map

		include $(ISISROOT)/make/isismake.tsts
		# testing for when the Scale keyword is missing from the input cube and the map.
		commands:
		# scale keyword missing
		$(APPNAME) FROM=$(INPUT)/dullesSmall.cub \
		MAP=$(INPUT)/noScaleSmall.pvl \
		TO=$(OUTPUT)/dullesNoScaleSmall.cub \
		MATCHMAP=yes > /dev/null;

		#scale keyword is defined
		$(APPNAME) FROM=$(INPUT)/dullesSmallYesScale.cub \
		MAP=$(INPUT)/yesScaleSmall.pvl \
		TO=$(OUTPUT)/dullesYesScaleSmall.cub \
		MATCHMAP=yes > /dev/null;
		No newline at end of file