X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/061e6469f58f3e3e892f1cd1f6fdd2aad9c644e8..8d11db1cf57b103fcec701d71c9d620b1c381b73:/datread.cpp?ds=sidebyside

diff --git a/datread.cpp b/datread.cpp
index 41d3724..f4bf393 100644
--- a/datread.cpp
+++ b/datread.cpp
@@ -16,17 +16,17 @@ int datread::openFile (const string& filename)
   if ( ! infile.is_open() ) return -1;
   
   if( filename.substr(filename.size()-4) == ".dat" ) {
-    format = Format::DAT;
+    format = DAT;
   }
   else if( filename.substr(filename.size()-4) == "edat" ) {
-    format = Format::EDAT;
+    format = EDAT;
   }
   else if( filename.substr(filename.size()-4) == "sdat" ) {
-    format = Format::SDAT;
+    format = SDAT;
     getline(infile, parastring);
   }
 
-  if (inbuffer != NULL)
+  if ( inbuffer != NULL )
     delete inbuffer;
   
   inbuffer = new boost::iostreams::filtering_istreambuf;
@@ -36,12 +36,6 @@ int datread::openFile (const string& filename)
   return 0;
 }
 
-datread::~datread ()
-{
-  if (inbuffer != NULL)
-    delete inbuffer;
-}
-
 int datread::readDataToMem (char *tmpData, long unsigned int dataSize)
 {
   int readturn = -1;
@@ -130,7 +124,7 @@ int datread::readFullBlock (char *tmpData)
     return -4;
     
   /* try to read header */
-  if ( format == Format::EDAT || format == Format::SDAT )
+  if ( format == EDAT || format == SDAT )
     if ( ! readAllHeaders() ) {
       infile.close();
       return -1;
@@ -182,3 +176,9 @@ void datread::closeFile ()
   if ( infile.is_open() )
     infile.close();
 }
+
+datread::~datread ()
+{
+  if ( inbuffer != NULL )
+    delete inbuffer;
+}