75 lines
2.7 KiB
Diff
75 lines
2.7 KiB
Diff
|
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.
|
||
|
|
/*!
|