Commit e8bd0ce4 authored by Jeannie Backer's avatar Jeannie Backer
Browse files

Fixed bugs from v006LibrariesV2 merge. 

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

isis/src/base/objs/Cube/CubeIoHandler.h

+1 −1
Original line number Diff line number Diff line
@@ -110,8 +110,8 @@ namespace Isis { 
   *                           when cube dimensions and buffer shape are same size. Fixes #1689.

   *   @history 2015-01-30 Ian Humphrey - Modified destructor to free m_writThreadMutex to

   *                           prevent memory leaks upon destruction. Fixes #2082.

   *   @history 2016-06-21 Kris Becker - Properly forward declare QPair as struct not class

   *   @history 2016-04-21 Makayla Shepherd - Added UnsignedWord pixel type handling.

   *   @history 2016-06-21 Kris Becker - Properly forward declare QPair as struct not class

   *   @history 2016-08-28 Kelvin Rodriguez - updateLabels now a pure virtual, it had no

   *                           implementation causing warnings in clang. Part of OS X 10.11 porting.

   *                           QPair forward declaration now properly claims it as a struct.

isis/src/base/objs/SerialNumberList/SerialNumberList.cpp

+2 −5
Original line number Diff line number Diff line
@@ -75,9 +75,9 @@ namespace Isis { 
  /**

   * Remove the specified serial number from the list

   *

   * @author 2010-09-09 Sharmila Prasad

   *

   * @param sn Name of serial number to remove

   *

   * @author 2010-09-09 Sharmila Prasad

   */

  void SerialNumberList::Delete(const QString &sn) {

    int index = serialNumberIndex(sn);
@@ -219,9 +219,6 @@ namespace Isis { 
   * @param serialNumber the serial number to be added

   * @param filename the filename to be added

   *

   * @author 2012-07-12 Tracie Sucharski

   *

   *

   * @throws IException::User "Unable to find Instrument or Mapping group for comparing target."

   * @throws IException::User "Target name from file does not match."

   * @throws IException::User "Invalid serial number [Unknown] from file."

isis/src/base/objs/ShapeModel/unitTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ using namespace Isis; 
 * @internal

 *   @history 2015-05-04 Jeannie Backer - Added test for isDEM() and improved

 *                           overall test coverage.

 *   @history 2015-05-04 Jeannie Backer - Changed print statements to properly flush

 *   @history 2016-08-28 Kelvin Rodriguez - Changed print statements to properly flush

 *                           std out before exceptions to better suit differences in OSX 10.11

 *                           part of porting to 10.11.

 *

isis/src/control/apps/cnetextract/tsts/latlon/Makefile

+5 −5
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ commands: 
	  minlat=15.0 \

	  maxlat=28.0 \

	  minlon=20.0 \

	  maxlon=28.0 \

	  > /dev/null;

	$(SED) 's+/.*/input/+input/+' $(OUTPUT)/newList.lis > $(OUTPUT)/newList.txt;

	$(RM) $(OUTPUT)/newList.lis;

	$(RM) $(OUTPUT)/list.lis;
 
	  maxlon=28.0;# \

#	  > /dev/null;

#	$(SED) 's+/.*/input/+input/+' $(OUTPUT)/newList.lis > $(OUTPUT)/newList.txt;

#	$(RM) $(OUTPUT)/newList.lis;

#	$(RM) $(OUTPUT)/list.lis;

isis/src/control/apps/cnetstats/tsts/gFit/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -9,5 +9,6 @@ commands: 
	  filter=yes \

	  deffile=$(INPUT)/deffile.def \

	  flatfile=$(OUTPUT)/out.txt > /dev/null;

	#$(SED) 's/, \(.*\)input\//, \1/' $(OUTPUT)/out.txt > $(OUTPUT)/out1.txt;

	$(SED) 's/, \/.*\/input\//, /' $(OUTPUT)/out.txt > $(OUTPUT)/truth.txt;

	$(RM) $(OUTPUT)/cube.lis $(OUTPUT)/out.txt;
 
	$(RM) $(OUTPUT)/cube.lis $(OUTPUT)/out.txt $(OUTPUT)/out1.txt;