macports/macports-ports
0
0
Fork 0
mirror of https://github.com/macports/macports-ports.git synced 2026-07-12 18:20:25 -07:00
Code Issues Packages Projects Releases Wiki Activity

gdcm: update to 3.2.5

Browse Source
This commit is contained in:
Dave Allured
2026-04-06 19:01:02 -06:00
committed by Renee Otten
parent 6afd559d5c
commit a384616e0d
2 changed files with 11 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
science/gdcm/Portfile
+11 -7
View File
@@ -8,8 +8,8 @@ PortGroup legacysupport 1.1
# strnlen
legacysupport.newest_darwin_requires_legacy 10
github.setup malaterre GDCM 3.2.2 v
revision 2
github.setup malaterre GDCM 3.2.5 v
revision 0
name gdcm
categories science graphics
@@ -23,15 +23,19 @@ homepage https://sourceforge.net/projects/gdcm/
github.tarball_from archive
checksums rmd160 67b22151c5b1b46c249fb4d4d0caf957ab2dd5a0 \
sha256 133078bfff4fe850a1faaea44b0a907ba93579fd16f34c956f4d665b24b590e5 \
size 4091233
checksums rmd160 5b84f55a53af869cb29e6a7ae863f44f1140d038 \
sha256 1763d94228ef31babe68a2b5f3b0d4fc66bc0afae641d9a4c38ea5269e06ba5d \
size 4092525
compiler.cxx_standard 2014
# Fix 10.10, 10.11
# error: default initialization of an object of const type 'const vtkOStreamWrapper::EndlType' without a user-provided default constructor
compiler.blacklist-append \
{clang < 801}
# fix error with newer Poppler
patchfiles-append patch-poppler.diff \
patch-cstr.diff
patchfiles-append patch-poppler.diff
depends_build-append path:bin/pkg-config:pkgconfig
science/gdcm/files/patch-cstr.diff
-122
View File
@@ -1,122 +0,0 @@
Patch for compatibility with VTK 9.5.0
--- Utilities/VTK/vtkGDCMImageReader.cxx.orig 2024-05-03 14:14:31
+++ Utilities/VTK/vtkGDCMImageReader.cxx 2025-07-08 14:34:08
@@ -608,7 +608,7 @@
// FIXME a gdcm::Scanner would be much faster here:
for(int i = 0; i < filenames->GetNumberOfValues(); ++i )
{
- const char *filename = filenames->GetValue( i );
+ const char *filename = filenames->GetValue( i ).c_str();
gdcm::ImageReader reader;
reader.SetFileName( filename );
if( !reader.Read() )
@@ -703,7 +703,7 @@
}
else if ( this->FileNames && this->FileNames->GetNumberOfValues() > 0 )
{
- filename = this->FileNames->GetValue( 0 );
+ filename = this->FileNames->GetValue( 0 ).c_str();
}
else
{
@@ -1459,7 +1459,7 @@
for(int j = dext[4]; !this->AbortExecute && j <= dext[5]; ++j)
{
assert( j >= 0 && j <= this->FileNames->GetNumberOfValues() );
- const char *filename = this->FileNames->GetValue( j );
+ const char *filename = this->FileNames->GetValue( j ).c_str();
int load = this->LoadSingleFile( filename, pointer, len );
if( !load )
{
--- Utilities/VTK/vtkGDCMImageWriter.cxx.orig 2024-05-03 14:14:31
+++ Utilities/VTK/vtkGDCMImageWriter.cxx 2025-07-08 14:27:14
@@ -255,7 +255,7 @@
{
if( this->FileNames->GetNumberOfValues() )
{
- const char *filename = this->FileNames->GetValue(0);
+ const char *filename = this->FileNames->GetValue(0).c_str();
return const_cast<char*>(filename);
}
return this->Superclass::GetFileName();
@@ -1148,7 +1148,7 @@
if( this->FileNames->GetNumberOfValues() )
{
//int n = this->FileNames->GetNumberOfValues();
- filename = this->FileNames->GetValue(k);
+ filename = this->FileNames->GetValue(k).c_str();
}
else
{
--- Utilities/VTK/vtkGDCMImageReader2.cxx.orig 2024-05-03 14:14:31
+++ Utilities/VTK/vtkGDCMImageReader2.cxx 2025-07-08 14:33:42
@@ -388,7 +388,7 @@
// FIXME a gdcm::Scanner would be much faster here:
for(int i = 0; i < filenames->GetNumberOfValues(); ++i )
{
- const char *filename = filenames->GetValue( i );
+ const char *filename = filenames->GetValue( i ).c_str();
gdcm::ImageReader reader;
reader.SetFileName( filename );
if( !reader.Read() )
@@ -480,7 +480,7 @@
}
else if ( this->FileNames && this->FileNames->GetNumberOfValues() > 0 )
{
- filename = this->FileNames->GetValue( 0 );
+ filename = this->FileNames->GetValue( 0 ).c_str();
}
else
{
@@ -1177,7 +1177,7 @@
for(int j = outExt[4]; !this->AbortExecute && j <= outExt[5]; ++j)
{
assert( j >= 0 && j <= this->FileNames->GetNumberOfValues() );
- const char *filename = this->FileNames->GetValue( j );
+ const char *filename = this->FileNames->GetValue( j ).c_str();
int load = this->LoadSingleFile( filename, pointer, len );
vtkDebugMacro( "LoadSingleFile: " << filename );
if( !load )
--- Utilities/VTK/vtkGDCMThreadedImageReader2.cxx.orig 2024-05-03 14:14:31
+++ Utilities/VTK/vtkGDCMThreadedImageReader2.cxx 2025-07-08 14:36:58
@@ -71,7 +71,7 @@
//----------------------------------------------------------------------------
const char *vtkGDCMThreadedImageReader2::GetFileName(int i)
{
- return this->FileNames->GetValue( i );
+ return this->FileNames->GetValue( i ).c_str();
}
//----------------------------------------------------------------------------
@@ -106,7 +106,7 @@
for( int i = outExt[4]; i <= outExt[5] && i < maxfiles; ++i )
{
assert( i < maxfiles );
- const char *filename = self->GetFileNames()->GetValue( i );
+ const char *filename = self->GetFileNames()->GetValue( i ).c_str();
//ReadOneFile( filename );
//outData->GetPointData()->GetScalars()->SetName("GDCMImage");
--- Utilities/VTK/Applications/gdcm2vtk.cxx.orig 2025-07-09 12:13:48
+++ Utilities/VTK/Applications/gdcm2vtk.cxx 2025-07-09 12:14:16
@@ -498,7 +498,7 @@
{
imgreader->SetFileLowerLeft( lowerleft );
if( names->GetNumberOfValues() == 1 )
- imgreader->SetFileName( names->GetValue(0) );
+ imgreader->SetFileName( names->GetValue(0).c_str() );
else
imgreader->SetFileNames(names);
imgreader->Update();
--- Utilities/VTK/Applications/gdcmviewer.cxx.orig 2025-06-11 08:17:24
+++ Utilities/VTK/Applications/gdcmviewer.cxx 2025-07-09 12:12:12
@@ -321,7 +321,7 @@
vtkGDCMImageReader *reader = vtkGDCMImageReader::New();
if( filenames->GetSize() == 1 ) // Backward compatible...
{
- reader->SetFileName( filenames->GetValue(0) );
+ reader->SetFileName( filenames->GetValue(0).c_str() );
}
else
{