mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 04:02:15 +08:00
3e2409f47d
* [vtk-m] new port vtk-m * [VTK] Update to 9.0 * include local buildtree changes * [pcl] disable VTK due to API changes in VTK 9.0 * [vtk-m] add supports field to be only x64 * [vtk-dicom] add python executable. * fix vtkm dependency * [vtk-dicom] fix missing std:: namespace * [vtk-m] add uwp to unsupported triplets * [vtk] add pegtl include patch, reenable IOMotionFX * remove hdf5 changes for testing * use different pgetl patch which redirects to the installed config of pegtl * [pegtl-2] version file needs renaming too * [vtk] change dependency to pgetl-2 and fix the patch * [vtk] put in hdf5 fix again and correct manually installed include files * remove deprecated function to retrigger CI * [lz4] correctly lowercase the lz4 config * [vtk] remove unnecessary code * [pegtl-2] add homepage * [pegtl] modernize portfiles * [vtk-dicom] add homepage * [vtk-dicom] modernize portfile * [vtk-m] remove empty build depends * [vtk] try fixing the permission issue * bump control * Update FindHDF5.cmake * Update pegtl.patch * Update ports/vtk/pegtl.patch Co-authored-by: nicole mazzuca <mazzucan@outlook.com> * [vtk] refactor portfile, added a few deps on [core] and added feature cuda * [vtk] pegtl.patch: Add additional found message * [vtk-m] add more documentation comments * [vtk] fix string replacement Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
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.
|
|
/*!
|