Commit 1da99234 authored by Tyler Wilson's avatar Tyler Wilson
Browse files

Added 4-byte unsigned int special pixel values to SpecialPixel.h

parent 6e30623c

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

+13 −2
Original line number Diff line number Diff line
@@ -76,7 +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)

   *   @history 2018-07-18 Tyler Wilson - Added 4-byte unsigned int special pixel values.

   *

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

   *
@@ -144,8 +144,8 @@ namespace Isis { 
  const int  IVALID_MIN4 = 0xFF7FFFFA;

  const float VALID_MIN4 = (*((const float *) &IVALID_MIN4));



  //const int UINULL4 = 0xFF7FFFFB;

  const int  INULL4 = 0xFF7FFFFB;

  const unsigned int UINULL4 = (unsigned int)INULL4;

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



  const int  ILOW_REPR_SAT4 = 0xFF7FFFFC;
@@ -160,6 +160,7 @@ namespace Isis { 
  const int  IHIGH_REPR_SAT4 = 0xFF7FFFFF;

  const float HIGH_REPR_SAT4 = (*((const float *) &IHIGH_REPR_SAT4));





  const float VALID_MAX4 = FLT_MAX;

  const int IVALID_MAX4  = (*((const int *) &VALID_MAX4));
@@ -181,6 +182,16 @@ namespace Isis { 
  const unsigned short HIGH_REPR_SATU2  = ((unsigned short)   65535);

  const unsigned short VALID_MAXU2      = ((unsigned short)   65522);



  // 4-byte unsigned special pixel values

  const unsigned int VALID_MINUI4      = ((unsigned int)       3);

  const unsigned int NULLUI4           = ((unsigned int)       0);

  const unsigned int LOW_REPR_SATUI4   = ((unsigned int)       1);

  const unsigned int LOW_INSTR_SATUI4  = ((unsigned int)       2);

  const unsigned int HIGH_INSTR_SATUI4 = ((unsigned int)   4294967294);

  const unsigned int HIGH_REPR_SATUI4  = ((unsigned int)   4294967295);

  const unsigned int VALID_MAXUI4      = ((unsigned int)   4294967282);





  // 1-byte special pixel values

  const unsigned char VALID_MIN1      = ((unsigned char) 1);

  const unsigned char NULL1           = ((unsigned char) 0);

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

+0 −2
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 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

+4 −3
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ 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;
@@ -54,6 +52,8 @@ int main(int argc, char *argv[]) { 
  cout << "Valid maximum (8 byte):           " << Isis::VALID_MAX8 << endl;

  cout << endl;







  double d = 0.0;

  cout << "Testing 0.0 ... " << endl;

  cout << "IsSpecial:     " << Isis::IsSpecial(d) << endl;
@@ -290,5 +290,6 @@ int main(int argc, char *argv[]) { 








}