Changeset 11553 for trunk/Mars

Timestamp:

07/24/11 11:01:36 (13 years ago)

Author:

tbretz

Message:

Replaced MZlib with izstream

Location:

trunk/Mars

Files:

• mastro/MAstroCatalog.cc (modified) (6 diffs)
• mfileio/MReadFiles.cc (modified) (2 diffs)
• mfileio/MReadFiles.h (modified) (2 diffs)
• mraw/MRawFileRead.cc (modified) (3 diffs)

trunk/Mars/mastro/MAstroCatalog.cc

@@ -149 +149 @@
 #include "MLogManip.h"
 
-#include "MZlib.h"      // MZlib <ifstream>
+#include "izstream.h"   // izstream <ifstream>
 
 #include "MTime.h"
@@ -291 +291 @@
     }
 
-    MZlib fin(catalog);
+    izstream fin(catalog);
     if (!fin)
     {
@@ -379 +379 @@
     }
 
-    MZlib fin(catalog);
+    izstream fin(catalog);
     if (!fin)
     {
@@ -450 +450 @@
     }
 
-    MZlib fin(catalog);
+    izstream fin(catalog);
     if (!fin)
     {
@@ -529 +529 @@
     }
 
-    MZlib fin(catalog);
+    izstream fin(catalog);
     if (!fin)
     {
@@ -640 +640 @@
     }
 
-    MZlib fin(catalog);
+    izstream fin(catalog);
     if (!fin)
     {

trunk/Mars/mfileio/MReadFiles.cc

@@ -37 +37 @@
 #include "MLogManip.h"
 
-#include "MZlib.h"
+#include "izstream.h"
 #include "MDirIter.h"
 
@@ -142 +142 @@
 
     // open a stream to a zipped or unzipped file
-    fIn = new MZlib(fFileName);
+    fIn = new izstream(fFileName);
     if (!*fIn)
     {

trunk/Mars/mfileio/MReadFiles.h

@@ -6 +6 @@
 #endif
 
-class MZlib;
+class izstream;
 
 class MReadFiles : public MRead
@@ -25 +25 @@
 
 protected:
-    MZlib    *fIn;         // the inputfile
+    izstream *fIn;         // the inputfile
 
     // MReadFiles

trunk/Mars/mraw/MRawFileRead.cc

@@ -50 +50 @@
 #include "MLogManip.h"
 
-#include "MZlib.h"
+#include "izstream.h"
 #include "MTime.h"
 #include "MParList.h"
@@ -127 +127 @@
 Byte_t MRawFileRead::IsFileValid(const char *name)
 {
-    MZlib fin(name);
+    izstream fin(name);
     if (!fin)
         return 0;
@@ -164 +164 @@
 istream *MRawFileRead::OpenFile(const char *filename)
 {
-    return new MZlib(filename);
+    return new izstream(filename);
 }