Changeset 16418 for trunk/Mars/mcore

Timestamp:

05/29/13 01:16:50 (11 years ago)

Author:

lyard

Message:

Fixed bugs from improvements

Location:

trunk/Mars/mcore

Files:

• factfits.h (modified) (1 diff)
• zfits.h (modified) (3 diffs)

trunk/Mars/mcore/factfits.h

@@ -57 +57 @@
 
         int16_t *startCell = reinterpret_cast<int16_t*>(fBufferRow.data() + offset + fOffsetStartCellData);
-        int16_t *data      = reinterpret_cast<int16_t*>(fBufferRow.data() + offset + fOffsetData);
+
+        const Pointers::iterator dtaIt = fPointers.find("Data");
+        if (dtaIt == fPointers.end()) return true;
+        int16_t *data      = reinterpret_cast<int16_t*>(dtaIt->second);
 
         for (uint32_t i=0; i<1440*1024; i+=1024, startCell++)

trunk/Mars/mcore/zfits.h

@@ -146 +146 @@
                 //swap the bytes
                 int64_t tempValues[2] = {0,0};
-                revcpy<8>(reinterpret_cast<char*>(tempValues[0]), readBuf, 2);
+                revcpy<8>(reinterpret_cast<char*>(&tempValues[0]), readBuf, 2);
 
                 //add catalog entry
@@ -153 +153 @@
 
         //see if there is a gap before heap data
-        fHeapOff = fTable.GetHeapShift();
+        fHeapOff = tellg()+fTable.GetHeapShift();
     }
 
@@ -179 +179 @@
 
             //skip to the beginning of the tile
-            seekg(fCatalog[currentCatRow][0].second, ios_base::cur);
+            seekg(fHeapOff+fCatalog[currentCatRow][0].second);
             read(fCompressedBuffer.data(), sizeToRead);