Commit 6e30623c authored by Tyler Wilson's avatar Tyler Wilson
Browse files

Added 4-byte unsigned NULL (UINULL4) to SpecialPixel.h

parent ea8b672c

isis/src/base/objs/SpecialPixel/SpecialPixel.h

+2 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ namespace Isis { 
   *   @history 2016-04-20 Jeannie Backer - Added Janet Barret's changes

   *                           IVALID_MAX4 definition to handle SignedInteger

   *                           imports.

   *   @history 2018-07-18 Tyler Wilson - Added 4-byte unsigned NULL value. (UINULL4)

   *

   *  @todo 2005-02-15 Kris Becker - finish class documentation

   *
@@ -144,6 +145,7 @@ namespace Isis { 
  const float VALID_MIN4 = (*((const float *) &IVALID_MIN4));



  const int  INULL4 = 0xFF7FFFFB;

  const unsigned int UINULL4 = (unsigned int)INULL4;

  const float NULL4 = (*((const float *) &INULL4));



  const int  ILOW_REPR_SAT4 = 0xFF7FFFFC;

isis/src/base/objs/SpecialPixel/SpecialPixel.truth

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ Valid maximum (2 byte): 32767 


Valid minimum (4 byte):           -3.40282e+38

Null (4 byte):                    -3.40282e+38

INull (4 byte signed int):        ff7ffffb

UINULL (4 byte unsigned int):     ff7ffffb

Low Representation (4 byte):      -3.40282e+38

Low Instrument (4 byte):          -3.40282e+38

High Representation (4 byte):     -3.40282e+38

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

+13 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 
#include "SpecialPixel.h"

#include "Preference.h"



#include <climits>



using namespace Isis;

using namespace std;
@@ -33,6 +35,8 @@ int main(int argc, char *argv[]) { 


  cout << "Valid minimum (4 byte):           " << Isis::VALID_MIN4 << endl;

  cout << "Null (4 byte):                    " << Isis::NULL4 << endl;

  cout << "INull (4 byte signed int):        " << hex << Isis::INULL4 << endl;

  cout << "UINULL (4 byte unsigned int):     " << hex << Isis::UINULL4 << endl;

  cout << "Low Representation (4 byte):      " << Isis::LOW_REPR_SAT4 << endl;

  cout << "Low Instrument (4 byte):          " << Isis::LOW_INSTR_SAT4 << endl;

  cout << "High Representation (4 byte):     " << Isis::HIGH_REPR_SAT4 << endl;
@@ -277,5 +281,14 @@ int main(int argc, char *argv[]) { 
    e.print();

  }

  cout << endl;



















}