Changeset 11560 for trunk/Mars/mbase

Timestamp:

07/24/11 12:14:26 (13 years ago)

Author:

tbretz

Message:

Fixed check for SIMPLE; added HAVE_ZLIB support.

File:

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

trunk/Mars/mbase/fits.h

@@ -27 +27 @@
 #endif
 
+#ifdef HAVE_ZLIB
 #include "izstream.h"
+#else
+#include <fstream>
+#define izstream ifstream
+#warning Support for zipped FITS files disabled.
+#endif
 
 namespace std
@@ -385 +391 @@
     fits(const string &fname) : izstream(fname.c_str())
     {
-        char simple[6];
-        read(simple, 6);
+        char simple[10];
+        read(simple, 10);
         if (!good())
             return;
 
-        if (memcmp(simple, "SIMPLE", 6))
+        if (memcmp(simple, "SIMPLE  = ", 10))
         {
             clear(rdstate()|ios::badbit);