projects
/
ctsim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
59d0884
)
r272: Added std:: naming to ios variables
author
Kevin M. Rosenberg
<kevin@rosenberg.net>
Sun, 17 Dec 2000 22:30:09 +0000
(22:30 +0000)
committer
Kevin M. Rosenberg
<kevin@rosenberg.net>
Sun, 17 Dec 2000 22:30:09 +0000
(22:30 +0000)
libctsim/projections.cpp
patch
|
blob
|
history
diff --git
a/libctsim/projections.cpp
b/libctsim/projections.cpp
index edbed03dc8ecbea37166d9ebde3589a16f036053..d2ab2b69e189409ce08fb007b8116c0e6da7c3c9 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
**
** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: projections.cpp,v 1.3
2 2000/12/16 06:12:47
kevin Exp $
+** $Id: projections.cpp,v 1.3
3 2000/12/17 22:30:09
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
**
** 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
@@
-307,10
+307,14
@@
Projections::read (const std::string& filename)
bool
Projections::read (const char* 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))
return false;
if (! headerRead (fileRead))