r329: *** empty log message ***

[ctsim.git] / libctsim / projections.cpp

diff --git a/libctsim/projections.cpp b/libctsim/projections.cpp
index edbed03dc8ecbea37166d9ebde3589a16f036053..4c31b3808748681a62e7ae33ad1c25a69ad17307 100644 (file)
--- a/libctsim/projections.cpp
+++ b/libctsim/projections.cpp
@@ -8,7 +8,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: projections.cpp,v 1.32 2000/12/16 06:12:47 kevin Exp $
+**  $Id: projections.cpp,v 1.34 2001/01/02 06:29:23 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -71,6 +71,15 @@ Projections::init (const int nView, const int nDet)
   m_nView = nView;
   m_nDet = nDet;
   newProjData ();
+\r
+  time_t t = time (NULL);\r
+  tm* lt = localtime (&t);\r
+  m_year = lt->tm_year;\r
+  m_month = lt->tm_mon;\r
+  m_day = lt->tm_mday;\r
+  m_hour = lt->tm_hour;\r
+  m_minute = lt->tm_min;\r
+  m_second = lt->tm_sec;\r
 }
 
 void
@@ -307,10 +316,14 @@ Projections::read (const std::string& filename)
 bool
 Projections::read (const char* filename)
 {
-  frnetorderstream fileRead (filename, ios::in | ios::binary);
-  m_filename = filename;
-
-  if (! fileRead)
+  m_filename = filename;\r
+#ifdef MSVC\r
+  frnetorderstream fileRead (m_filename.c_str(), std::ios::in | std::ios::binary);\r
+#else\r
+  frnetorderstream fileRead (m_filename.c_str(), std::ios::in | std::ios::binary | std::ios::nocreate);\r
+#endif\r
+
+  if (fileRead.fail())
     return false;
 
   if (! headerRead (fileRead))
@@ -438,17 +451,6 @@ Projections::write (const char* filename)
     return false;
   }
 
-#ifdef HAVE_TIME
-  time_t t = time(NULL);
-  tm* lt = localtime(&t);
-  m_year = lt->tm_year;
-  m_month = lt->tm_mon;
-  m_day = lt->tm_mday;
-  m_hour = lt->tm_hour;
-  m_minute = lt->tm_min;
-  m_second = lt->tm_sec;
-#endif
-
   if (! headerWrite (fs))
       return false;