Changeset 16882 for trunk/Mars/mcore/fits.h

Timestamp:

06/21/13 17:08:18 (11 years ago)

Author:

lyard

Message:

added correct checksum calculation for compressed fits reader (zfits)

File:

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

trunk/Mars/mcore/fits.h

@@ -758 +758 @@
                 clear(rdstate()|ios::badbit);
     }
-    uint8_t ReadRow(size_t row)
-    {
-        // For the checksum we need everything to be correctly aligned
-        const uint8_t offset = (row*fTable.bytes_per_row)%4;
-
-        auto ib = fBufferRow.begin();
-        auto ie = fBufferRow.end();
+
+    void ZeroBufferForChecksum(vector<char>& vec, const uint64_t extraZeros=0)
+    {
+        auto ib = vec.begin();
+        auto ie = vec.end();
+
         *ib++ = 0;
         *ib++ = 0;
@@ -770 +769 @@
         *ib   = 0;
 
-        *--ie = 0;
-        *--ie = 0;
-        *--ie = 0;
-        *--ie = 0;
-        *--ie = 0;
-        *--ie = 0;
-        *--ie = 0;
-        *--ie = 0;
+        for (uint64_t i=0;i<extraZeros+8;i++)
+            *--ie = 0;
+    }
+
+    uint8_t ReadRow(size_t row)
+    {
+        // For the checksum we need everything to be correctly aligned
+        const uint8_t offset = (row*fTable.bytes_per_row)%4;
+
+        ZeroBufferForChecksum(fBufferRow);
 
         StageRow(row, fBufferRow.data()+offset);