Changeset 15085 for trunk/Mars/mcore

Timestamp:

03/18/13 14:34:03 (12 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:

• trunk/Mars/mcore/fits.h (modified) (3 diffs)

trunk/Mars/mcore/fits.h

@@ -425 +425 @@
     Addresses fAddresses;
 
-#ifdef __CINT__
-    typedef char Pointers[48];
+#ifdef __MARS__
+    typedef map<string, void*> Pointers;
 #else
     typedef unordered_map<string, void*> Pointers;
@@ -574 +574 @@
                 }
 
-                fBufferRow.resize(fTable.bytes_per_row + 4-fTable.bytes_per_row%4);
+                fBufferRow.resize(fTable.bytes_per_row + 8-fTable.bytes_per_row%4);
                 fBufferDat.resize(fTable.bytes_per_row);
 
@@ -614 +614 @@
         *--ie = 0;
         *--ie = 0;
-
-        fBufferRow.assign(fBufferRow.size(), 0);
+        *--ie = 0;
+        *--ie = 0;
+        *--ie = 0;
+        *--ie = 0;
 
         read(fBufferRow.data()+offset, fTable.bytes_per_row);