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

PROG: Fixed bug in Statistics HDF code that prevented MACs from compiling the API. 

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

isis/src/base/objs/Statistics/Statistics.cpp

+30 −15
Original line number Diff line number Diff line
@@ -874,49 +874,64 @@ namespace Isis { 
    size_t offset = 0;

    compoundDataType.insertMember("Sum", offset, H5::PredType::NATIVE_DOUBLE);



    offset += sizeof(m_sum);

    // offset += sizeof(m_sum);

    offset += sizeof(double);

    compoundDataType.insertMember("SumSquared", offset, H5::PredType::NATIVE_DOUBLE);



    offset += sizeof(m_sumsum);

    // offset += sizeof(m_sumsum);

    offset += sizeof(double);

    compoundDataType.insertMember("Minimum", offset, H5::PredType::NATIVE_DOUBLE);



    offset += sizeof(m_minimum);

    // offset += sizeof(m_minimum);

    offset += sizeof(double);

    compoundDataType.insertMember("Maximum", offset, H5::PredType::NATIVE_DOUBLE);



    offset += sizeof(m_maximum);

    // offset += sizeof(m_maximum);

    offset += sizeof(double);

    compoundDataType.insertMember("ValidMinimum", offset, H5::PredType::NATIVE_DOUBLE);



    offset += sizeof(m_validMinimum);

    // offset += sizeof(m_validMinimum);

    offset += sizeof(double);

    compoundDataType.insertMember("ValidMaximum", offset, H5::PredType::NATIVE_DOUBLE);



    offset += sizeof(m_validMaximum);

    // offset += sizeof(m_validMaximum);

    offset += sizeof(double);

    compoundDataType.insertMember("TotalPixels", offset, H5::PredType::NATIVE_INT64);



    offset += sizeof(m_totalPixels);

    // offset += sizeof(m_totalPixels);

    offset += sizeof(BigInt);

    compoundDataType.insertMember("ValidPixels", offset, H5::PredType::NATIVE_INT64);



    offset += sizeof(m_validPixels);

    // offset += sizeof(m_validPixels);

    offset += sizeof(BigInt);

    compoundDataType.insertMember("NullPixels", offset, H5::PredType::NATIVE_INT64);



    offset += sizeof(m_nullPixels);

    // offset += sizeof(m_nullPixels);

    offset += sizeof(BigInt);

    compoundDataType.insertMember("LRSPixels", offset, H5::PredType::NATIVE_INT64);



    offset += sizeof(m_lrsPixels);

    // offset += sizeof(m_lrsPixels);

    offset += sizeof(BigInt);

    compoundDataType.insertMember("LISPixels", offset, H5::PredType::NATIVE_INT64);



    offset += sizeof(m_lisPixels);

    // offset += sizeof(m_lisPixels);

    offset += sizeof(BigInt);

    compoundDataType.insertMember("HRSPixels", offset, H5::PredType::NATIVE_INT64);



    offset += sizeof(m_hrsPixels);

    // offset += sizeof(m_hrsPixels);

    offset += sizeof(BigInt);

    compoundDataType.insertMember("HISPixels", offset, H5::PredType::NATIVE_INT64);



    offset += sizeof(m_hisPixels);

    // offset += sizeof(m_hisPixels);

    offset += sizeof(BigInt);

    compoundDataType.insertMember("UnderRangePixels", offset, H5::PredType::NATIVE_INT64);



    offset += sizeof(m_underRangePixels);

    // offset += sizeof(m_underRangePixels);

    offset += sizeof(BigInt);

    compoundDataType.insertMember("OverRangePixels", offset, H5::PredType::NATIVE_INT64);



    offset += sizeof(m_overRangePixels);

    // offset += sizeof(m_overRangePixels);

    offset += sizeof(BigInt);

    compoundDataType.insertMember("RemovedData", offset, H5::PredType::NATIVE_HBOOL);



    return compoundDataType;

isis/src/base/objs/Statistics/Statistics.h

+4 −0
Original line number Diff line number Diff line
@@ -90,6 +90,10 @@ namespace Isis { 
   *                           code closer to standards.

   *   @history 2015-09-03 Jeannie Backer - Added hdf5 read/write capabilities by adding

   *                           compoundH5DataType() static method.

   *   @history 2015-12-21 Jeannie Backer - Changed compoundH5DataType() method to update offset by

   *                           using member variabl datatypes directly. This was done so that MAC

   *                           OSX will compile.

   *

   *

   *   @todo 2005-02-07 Deborah Lee Soltesz - add example using cube data to the class documentation

   *   @todo 2015-08-13 Jeannie Backer - Clean up header and implementation files once