Unverified Commit 1f35bec3 authored by ihumphrey's avatar ihumphrey Committed by GitHub
Browse files

Merge pull request #493 from USGS-Astrogeology/release 

Merging hot fixes from the release into dev
parents 58710a43 9c23d0e9

isis/CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ set(thirdPartyCppFlags -Wall 
                       -Wno-unused-parameter

                       -Wno-overloaded-virtual

                       -Wno-strict-aliasing

		       -Wno-strict-overflow

                       -DGMM_USES_SUPERLU

                       -DENABLEJP2K=${JP2KFLAG}

                     )

isis/TestPreferences

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ Group=UserInterface 
  GuiWidth           = 460

  GuiHeight          = 600

  HistoryPath        = $HOME/.Isis/history

  HistoryRecording   = On

  HistoryRecording   = Off

  HistoryLength      = 10

EndGroup
@@ -165,7 +165,7 @@ EndGroup 
########################################################

Group = Performance

  CubeWriteThread = Optimized

  GlobalThreads = Optimized

  GlobalThreads = 2

EndGroup



########################################################

isis/make/isismake.tsts

+2 −2
Original line number Diff line number Diff line
@@ -773,7 +773,7 @@ checkout: FORCE 
	    if [ "$$inputdir" != "" ]; \

	    then \

	      $(MAKE) dirs; \

	      $(RSYNC) -rt --delete $(TESTDATA_PATH)/input/ input; \

	      $(RSYNC) -rt --copy-links --delete $(TESTDATA_PATH)/input/ input; \

	    fi; \

	  fi; \

	  $(MAKE) copyOutTruth DEST=$(TESTDATA_PATH); \
@@ -795,7 +795,7 @@ copyOutTruth: FORCE 
	  files=`$(LS) $(DEST)/$$i`; \

	  if [ "$$files" != "" ]; \

	  then \

	    $(RSYNC) -rt --delete $(DEST)/$$i/ $$i; \

	    $(RSYNC) -rt --copy-links --delete $(DEST)/$$i/ $$i; \

	  fi; \

	done;

isis/src/base/apps/csv2table/tsts/errors/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -7,14 +7,14 @@ commands: 


	if [ `$(APPNAME) csv=$(INPUT)/not_a_file.csv \

	     tablename="TestTable" \

	     to=$(OUTPUT)/isisTruth.cub &> $(OUTPUT)/errors.txt` ]; \

	     to=$(OUTPUT)/isisTruth.cub 2> $(OUTPUT)/errors.txt` ]; \

	then \

	  true; \

	fi;



	if [ `$(APPNAME) csv=$(INPUT)/empty.csv \

	      tablename="TestTable" \

	      to=$(OUTPUT)/isisTruth.cub &>> $(OUTPUT)/errors.txt` ]; \

	      to=$(OUTPUT)/isisTruth.cub 2>> $(OUTPUT)/errors.txt` ]; \

	then \

	  true; \

	fi;
@@ -22,12 +22,12 @@ commands: 
	if [ `$(APPNAME) csv=$(INPUT)/test.csv \

	      label=$(INPUT)/not_a_file.pvl \

	      tablename="TestTable" \

	      to=$(OUTPUT)/isisTruth.cub &>> $(OUTPUT)/errors.txt` ]; \

	      to=$(OUTPUT)/isisTruth.cub 2>> $(OUTPUT)/errors.txt` ]; \

	then \

	  true; \

	fi;



	cat $(OUTPUT)/errors.txt | sed 's/\/[^ ]*\/input\///g' \

	cat $(OUTPUT)/errors.txt | sed 's+\[.*input/+[+' \

	    > $(OUTPUT)/clean_errors.txt;



	rm $(OUTPUT)/isisTruth.cub $(OUTPUT)/errors.txt;

isis/src/base/apps/trackextract/trackextract.cpp

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ using namespace Isis; 


// Taken from ProcessMosaic

const int FLOAT_MIN = -16777215;

const int FLOAT_MAX = 16777216;



void findTrackBand(QString inputName, QVector<QString> &copyBands, int &trackBand);

void createMosaicCube(QString inputName, QString outputName, QVector<QString> bandsVector);