From ebcdaf2f06d2d7b7afce5573cec42a6c6caaa7a2 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Thu, 16 Sep 2021 14:13:17 +0200 Subject: [PATCH] #3470 merge vtk8itk5wx3-mingw64 --- .../src/bbcreaVtkReadMHDPlane.cxx | 30 +++++++++++++++---- lib/creaVtk/vtkTensorsVisu.cpp | 4 ++- lib/creaVtk/vtkVectorsVisu.cpp | 4 ++- 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkReadMHDPlane.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkReadMHDPlane.cxx index e9634ee..cfa8d83 100644 --- a/bbtk_creaVtk_PKG/src/bbcreaVtkReadMHDPlane.cxx +++ b/bbtk_creaVtk_PKG/src/bbcreaVtkReadMHDPlane.cxx @@ -251,9 +251,14 @@ void ReadMHDPlane::Read64lseek(std::string fileNameIn, std::string plane) long long pos; long long lsize = dimX*dimY*width *dataSize; #if defined(_WIN32) - _sopen_s( &fd, filename.c_str(), _O_RDONLY, _SH_DENYNO, 0 ); + _sopen_s( &fd, filename.c_str(), _O_RDONLY, _SH_DENYNO, 0 ); #else - fd = open ( filename.c_str() , O_RDONLY|O_LARGEFILE ); + //EED2021-09-03 + #if defined(MACOSX) + fd = open ( filename.c_str() , O_RDONLY ); + #else + fd = open ( filename.c_str() , O_RDONLY|O_LARGEFILE ); + #endif #endif // defined(_WIN32) if (fd < 0) { @@ -285,7 +290,12 @@ void ReadMHDPlane::Read64lseek(std::string fileNameIn, std::string plane) #if defined(_WIN32) if (_lseeki64( fd, pos, SEEK_SET ) < 0) #else - if (lseek64(fd, pos, SEEK_SET) < 0) + //EED2021-09-03 + #if defined(MACOSX) + if (lseek(fd, pos, SEEK_SET) < 0) + #else + if (lseek64(fd, pos, SEEK_SET) < 0) + #endif #endif // defined(_WIN32) { printf("EED ReadMHDPlane::Read64lseek \n"); @@ -374,7 +384,12 @@ void ReadMHDPlane::copy_YZ_plane(int fd,vtkImageData *newImage,int slice,int iWi #if defined(_WIN32) if (_lseeki64( fd, pos , SEEK_SET ) < 0) #else - if (lseek64(fd, pos , SEEK_SET) < 0) + //EED2021-09-03 + #if defined(MACOSX) + if (lseek(fd, pos , SEEK_SET) < 0) + #else + if (lseek64(fd, pos , SEEK_SET) < 0) + #endif #endif // defined(_WIN32) { printf("EED ReadMHDPlane::Read64lseek \n"); @@ -406,7 +421,12 @@ void ReadMHDPlane::copy_ZX_plane(int fd,vtkImageData *newImage,int slice,int iWi #if defined(_WIN32) if (_lseeki64( fd, pos + j*sizeBytesPlane , SEEK_SET ) < 0) #else - if (lseek64(fd, pos + j*sizeBytesPlane , SEEK_SET) < 0) + //EED2021-09-03 + #if defined(MACOSX) + if (lseek(fd, pos + j*sizeBytesPlane , SEEK_SET) < 0) + #else + if (lseek64(fd, pos + j*sizeBytesPlane , SEEK_SET) < 0) + #endif #endif // defined(_WIN32) { printf("EED ReadMHDPlane::Read64lseek \n"); diff --git a/lib/creaVtk/vtkTensorsVisu.cpp b/lib/creaVtk/vtkTensorsVisu.cpp index 9a53519..f96e104 100644 --- a/lib/creaVtk/vtkTensorsVisu.cpp +++ b/lib/creaVtk/vtkTensorsVisu.cpp @@ -201,7 +201,9 @@ void vtkTensorsVisu::Process() //_pdm->SetColorModeToDefault(); // _pdm->SetColorModeToDirectScalars(); // NOT compile _pdm->SetScalarModeToUsePointFieldData(); - _pdm->ImmediateModeRenderingOn(); + +//EED2021-09-03 Deprecated. Removed in vtk 8.1 +// _pdm->ImmediateModeRenderingOn(); _LutEED->SetVectorModeToComponent(); //_LutEED->SetVectorModeToRGBColors(); diff --git a/lib/creaVtk/vtkVectorsVisu.cpp b/lib/creaVtk/vtkVectorsVisu.cpp index 376d403..7fe9861 100644 --- a/lib/creaVtk/vtkVectorsVisu.cpp +++ b/lib/creaVtk/vtkVectorsVisu.cpp @@ -112,7 +112,9 @@ for (i=0;iSetColorModeToDefault(); // _pdm->SetColorModeToDirectScalars(); // NOT compile _pdm->SetScalarModeToUsePointFieldData(); - _pdm->ImmediateModeRenderingOn(); + +//EED2021-09-03 Deprecated. Removed in vtk 8.1 +// _pdm->ImmediateModeRenderingOn(); _LutEED->SetVectorModeToComponent(); //_LutEED->SetVectorModeToRGBColors(); -- 2.45.1