mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 10:01:38 +08:00
[vtk-dicom] update to 0.8.14 (#28736)
* [vtk-dicom] update to 0.8.14 * update version
This commit is contained in:
parent
4dd6b9c3ad
commit
a628065693
@ -1,10 +1,9 @@
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO dgobbi/vtk-dicom
|
||||
REF 5034c68450de857b70fbe4a4b9f8dddb62badef3 # v0.8.12
|
||||
SHA512 bad1ed6a4a412402a2cd69e5f85b2b73f1ee7ea46a6bbcac31c5f66d07ae006679ffbd9a3c70f9baa1b05b1af0a2d4ca0efc34ec0a85a92f5116b900e81635cd
|
||||
REF 6c781948c2df3e3a7f7163731d4f65a23e19288f # v0.8.14
|
||||
SHA512 9032194ab72b1aa3b4c6a05a7f4de0575dc73b3eb713e9b88b3e3ce332dd9bb906fd456bcb96672b3a4450faa890194afa9ea6bd4c5f9685c9c2610e861b13a6
|
||||
HEAD_REF master
|
||||
PATCHES std.patch # similar patch is already in master
|
||||
)
|
||||
|
||||
if ("gdcm" IN_LIST FEATURES)
|
||||
@ -21,9 +20,8 @@ if(USE_GDCM)
|
||||
)
|
||||
endif()
|
||||
vcpkg_find_acquire_program(PYTHON3)
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
-DBUILD_PROGRAMS=OFF
|
||||
-DBUILD_EXAMPLES=OFF
|
||||
@ -31,12 +29,12 @@ vcpkg_configure_cmake(
|
||||
${ADDITIONAL_OPTIONS}
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake)
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake)
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||
|
||||
# Handle copyright
|
||||
file(INSTALL ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/Copyright.txt")
|
||||
|
@ -1,74 +0,0 @@
|
||||
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.
|
||||
/*!
|
@ -1,10 +1,18 @@
|
||||
{
|
||||
"name": "vtk-dicom",
|
||||
"version-string": "0.8.12",
|
||||
"port-version": 2,
|
||||
"version": "0.8.14",
|
||||
"description": "DICOM for VTK",
|
||||
"homepage": "https://github.com/dgobbi/vtk-dicom",
|
||||
"license": "BSD-3-Clause",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vtk",
|
||||
"default-features": false
|
||||
|
@ -6060,6 +6060,10 @@
|
||||
"baseline": "2021-02-21",
|
||||
"port-version": 0
|
||||
},
|
||||
"ptc-print": {
|
||||
"baseline": "1.4.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"ptex": {
|
||||
"baseline": "2.3.2",
|
||||
"port-version": 4
|
||||
@ -7989,8 +7993,8 @@
|
||||
"port-version": 12
|
||||
},
|
||||
"vtk-dicom": {
|
||||
"baseline": "0.8.12",
|
||||
"port-version": 2
|
||||
"baseline": "0.8.14",
|
||||
"port-version": 0
|
||||
},
|
||||
"vtk-m": {
|
||||
"baseline": "1.6.0",
|
||||
@ -8435,10 +8439,6 @@
|
||||
"zziplib": {
|
||||
"baseline": "0.13.72",
|
||||
"port-version": 3
|
||||
},
|
||||
"ptc-print": {
|
||||
"baseline": "1.4.0",
|
||||
"port-version": 0
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "db43c05e6c9d53f9e16178ddde2964385ba8e3c5",
|
||||
"version": "0.8.14",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "1bb97d36a9f0ed9f7305bd51f904ba5c3f740565",
|
||||
"version-string": "0.8.12",
|
||||
|
Loading…
Reference in New Issue
Block a user