Changeset 15085


Ignore:
Timestamp:
03/18/13 14:34:03 (9 years ago)
Author:
tbretz
Message:
To 'solve' the problem with the unordered_map MARS will now use a std::map. Fixed a problem which caused the ReadRow to write below the buffer - weird that this never resulted in any problem.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Mars/mcore/fits.h

    r14965 r15085  
    425425    Addresses fAddresses;
    426426
    427 #ifdef __CINT__
    428     typedef char Pointers[48];
     427#ifdef __MARS__
     428    typedef map<string, void*> Pointers;
    429429#else
    430430    typedef unordered_map<string, void*> Pointers;
     
    574574                }
    575575
    576                 fBufferRow.resize(fTable.bytes_per_row + 4-fTable.bytes_per_row%4);
     576                fBufferRow.resize(fTable.bytes_per_row + 8-fTable.bytes_per_row%4);
    577577                fBufferDat.resize(fTable.bytes_per_row);
    578578
     
    614614        *--ie = 0;
    615615        *--ie = 0;
    616 
    617         fBufferRow.assign(fBufferRow.size(), 0);
     616        *--ie = 0;
     617        *--ie = 0;
     618        *--ie = 0;
     619        *--ie = 0;
    618620
    619621        read(fBufferRow.data()+offset, fTable.bytes_per_row);
Note: See TracChangeset for help on using the changeset viewer.