Changeset 16844

Timestamp:

06/14/13 14:20:21 (11 years ago)

Author:

lyard

Message:

fixed checksum calculation while reading... hopefully

Location:

trunk/Mars/mcore

Files:

• fits.h (modified) (1 diff)
• zfits.h (modified) (2 diffs)

trunk/Mars/mcore/fits.h

@@ -744 +744 @@
     virtual void WriteRowToCopyFile(size_t row)
     {
-        if (row==fRow+1 && !fTable.isCompressed)
+        if (row==fRow+1)
         {
             const uint8_t offset = (row*fTable.bytes_per_row)%4;

trunk/Mars/mcore/zfits.h

@@ -259 +259 @@
     //overrides fits.h method with empty one
     //work is done in ReadBinaryRow because it requires volatile data from ReadBinaryRow
-    virtual void WriteRowToCopyFile(size_t )
-    {
-
+    virtual void WriteRowToCopyFile(size_t row)
+    {
+        if (row == fRow+1)
+            fChkData.add(fBufferRow);
     }
 
@@ -288 +289 @@
             read(fCompressedBuffer.data(), sizeToRead);
 
-            if (fCurrentRow == previousRow+1 &&
+            if (requestedTile == currentTile+1 &&
                 fCopy.is_open() &&
                 fCopy.good())