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

Timestamp:

05/29/13 22:02:43 (11 years ago)

Author:

lyard

Message:

more tweaks to factfits

File:

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

trunk/Mars/mcore/fits.h

@@ -612 +612 @@
                 peek();
                 if (eof() && !bad() && !tableName.empty())
+                {
+                    cout << "END OF FILE !" << endl;
                     break;
-
+                }
                 // FIXME: Set limit on memory consumption
                 const int rc = ReadBlock(block);
@@ -741 +743 @@
     }
 
+    virtual void WriteRowToCopyFile(size_t row)
+    {
+        if (row==fRow+1 && !fTable.isCompressed)
+        {
+            const uint8_t offset = (row*fTable.bytes_per_row)%4;
+
+            fChkData.add(fBufferRow);
+            if (fCopy.is_open() && fCopy.good())
+                fCopy.write(fBufferRow.data()+offset, fTable.bytes_per_row);
+            if (!fCopy)
+                clear(rdstate()|ios::badbit);
+        }
+        else
+            if (fCopy.is_open())
+                clear(rdstate()|ios::badbit);
+    }
     uint8_t ReadRow(size_t row)
     {
@@ -764 +782 @@
         StageRow(row, fBufferRow.data()+offset);
 
-        if (row==fRow+1)
-        {
-            fChkData.add(fBufferRow);
-            if (fCopy.is_open() && fCopy.good())
-                fCopy.write(fBufferRow.data()+offset, fTable.bytes_per_row);
-            if (!fCopy)
-                clear(rdstate()|ios::badbit);
-        }
-        else
-            if (fCopy.is_open())
-                clear(rdstate()|ios::badbit);
+        WriteRowToCopyFile(row);
 
         fRow = row;