aboutsummaryrefslogtreecommitdiff
path: root/ports/vtk-dicom/std.patch
blob: 59160f089b7b7c379cae76b361c2b47d4c0780a5 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
diff --git a/Source/vtkScancoCTReader.cxx b/Source/vtkScancoCTReader.cxx
index a71f2e46e..afe202ffc 100644
--- a/Source/vtkScancoCTReader.cxx	
+++ b/Source/vtkScancoCTReader.cxx
@@ -176,7 +176,7 @@ int vtkScancoCTReader::CheckVersion(const char header[16])
 //----------------------------------------------------------------------------
 int vtkScancoCTReader::CanReadFile(const char *filename)
 {
-  ifstream infile(filename, ios::in | ios::binary);
+  std::ifstream infile(filename, ios::in | ios::binary);
 
   bool canRead = false;
   if (infile.good())
@@ -409,7 +409,7 @@ void vtkScancoCTReader::StripString(char *dest, const char *cp, size_t l)
 }
 
 //----------------------------------------------------------------------------
-int vtkScancoCTReader::ReadISQHeader(ifstream *file, unsigned long bytesRead)
+int vtkScancoCTReader::ReadISQHeader(std::ifstream *file, unsigned long bytesRead)
 {
   if (bytesRead < 512)
   {
@@ -620,7 +620,7 @@ int vtkScancoCTReader::ReadISQHeader(ifstream *file, unsigned long bytesRead)
 }
 
 //----------------------------------------------------------------------------
-int vtkScancoCTReader::ReadAIMHeader(ifstream *file, unsigned long bytesRead)
+int vtkScancoCTReader::ReadAIMHeader(std::ifstream *file, unsigned long bytesRead)
 {
   if (bytesRead < 160)
   {
@@ -987,7 +987,7 @@ int vtkScancoCTReader::RequestInformation(
   const char *ufilename = filename;
 #endif
 
-  ifstream infile(ufilename, ios::in | ios::binary);
+  std::ifstream infile(ufilename, ios::in | ios::binary);
   if (!infile.good())
   {
     vtkErrorMacro("Cannot open file " << filename);
@@ -1115,7 +1115,7 @@ int vtkScancoCTReader::RequestData(
     static_cast<unsigned char *>(data->GetScalarPointer());
 
   // open the file
-  ifstream infile(filename, ios::in | ios::binary);
+  std::ifstream infile(filename, ios::in | ios::binary);
   if (!infile.good())
   {
     vtkErrorMacro("Cannot open file " << filename);
diff --git a/Source/vtkScancoCTReader.h b/Source/vtkScancoCTReader.h
index ca31d7572..240d532f2 100644
--- a/Source/vtkScancoCTReader.h	
+++ b/Source/vtkScancoCTReader.h
@@ -34,6 +34,7 @@
 #ifndef vtkScancoCTReader_h
 #define vtkScancoCTReader_h
 
+#include <iosfwd>
 #include "vtkImageReader2.h"
 #include "vtkDICOMModule.h" // For export macro
 #include "vtkDICOMConfig.h" // For configuration details
@@ -185,10 +186,10 @@ protected:
   void InitializeHeader();
 
   //! Read an ISQ header.
-  int ReadISQHeader(ifstream *file, unsigned long bytesRead);
+  int ReadISQHeader(std::ifstream *file, unsigned long bytesRead);
 
   //! Read AIM header.
-  int ReadAIMHeader(ifstream *file, unsigned long bytesRead);
+  int ReadAIMHeader(std::ifstream *file, unsigned long bytesRead);
 
   //! Check the file header to see what type of file it is.
   /*!