Merge pull request #2417 from SCIInstitute/fix_vtk_9.5_patch

Fix vtk patch for 9.5

Author: akenmorris

Support/vtk-9.1.patch Support/vtk-9.5.patchSupport/vtk-9.1.patch renamed to Support/vtk-9.5.patch

@@ -1,8 +1,8 @@
 diff --git a/Common/Core/vtkRandomPool.cxx b/Common/Core/vtkRandomPool.cxx
-index 46f9aff201..273ca74c50 100644
+index c2bcf67d18..69ca63654a 100644
 --- a/Common/Core/vtkRandomPool.cxx
 +++ b/Common/Core/vtkRandomPool.cxx
-@@ -338,6 +338,9 @@ const double* vtkRandomPool::GeneratePool()
+@@ -332,6 +332,9 @@ const double* vtkRandomPool::GeneratePool()
      if (actualThreads < numThreads) // readjust work load
      {
        numThreads = actualThreads;
@@ -13,48 +13,26 @@ index 46f9aff201..273ca74c50 100644
 
      // Now distribute work
 diff --git a/Filters/Modeling/vtkSelectEnclosedPoints.cxx b/Filters/Modeling/vtkSelectEnclosedPoints.cxx
-index 0dcae6df7a..2986c1e7fd 100644
+index 7d5122297e..998e3f888e 100644
 --- a/Filters/Modeling/vtkSelectEnclosedPoints.cxx
 +++ b/Filters/Modeling/vtkSelectEnclosedPoints.cxx
-@@ -88,7 +88,10 @@ struct SelectInOutCheck
- 
+@@ -80,6 +80,9 @@ struct SelectInOutCheck
      // Precompute a sufficiently large enough random sequence
      this->Sequence = vtkRandomPool::New();
--    this->Sequence->SetSize((numPts > 1500 ? numPts : 1500));
+     this->Sequence->SetSize((numPts > 1500 ? numPts : 1500));
 +    // Alan : I see no reason to ever generate more than 1000 random numbers
 +    // each vector will use 3 and only a few vectors for each point
 +    // this also works around the bug in vtkRandomPool
-+    this->Sequence->SetSize(1000);
      this->Sequence->GeneratePool();
    }
 
-@@ -325,7 +328,7 @@ int vtkSelectEnclosedPoints::IsInsideSurface(double x[3])
+@@ -325,7 +328,8 @@ int vtkSelectEnclosedPoints::IsInsideSurface(double x[3])
  // supporting the precomputation of a random sequence (see vtkRandomPool).
  //
  #define VTK_MAX_ITER 10      // Maximum iterations for ray-firing
 -#define VTK_VOTE_THRESHOLD 2 // Vote margin for test
++// Alan: I've changed the vote margin to 3
 +#define VTK_VOTE_THRESHOLD 3 // Vote margin for test
 
  int vtkSelectEnclosedPoints::IsInsideSurface(double x[3], vtkPolyData* surface, double bds[6],
    double length, double tolerance, vtkAbstractCellLocator* locator, vtkIdList* cellIds,
-diff --git a/Rendering/OpenGL2/vtkCocoaRenderWindow.mm b/Rendering/OpenGL2/vtkCocoaRenderWindow.mm
-index 0d63d49783..82e6b7c57f 100644
---- a/Rendering/OpenGL2/vtkCocoaRenderWindow.mm
-+++ b/Rendering/OpenGL2/vtkCocoaRenderWindow.mm
-@@ -228,6 +228,16 @@ vtkCocoaRenderWindow::vtkCocoaRenderWindow()
- //----------------------------------------------------------------------------
- vtkCocoaRenderWindow::~vtkCocoaRenderWindow()
- {
-+  // If we created a vtkCocoaGLView, clear its reference back to us.
-+  if (this->GetViewCreated())
-+  {
-+    NSView* glView = (NSView*)this->GetWindowId();
-+    if ([glView isKindOfClass:[vtkCocoaGLView class]])
-+    {
-+      [(vtkCocoaGLView*)glView setVTKRenderWindow:nullptr];
-+    }
-+  }
-+
-   if (this->CursorHidden)
-   {
-     this->ShowCursor();

build_dependencies.sh

@@ -134,8 +134,7 @@ build_vtk()
   cd vtk
   git checkout -f tags/${VTK_VER}
 
-  patch -p1 < ${SCRIPT_DIR}/Support/vtk-9.1.patch
-  cat Rendering/OpenGL2/vtkCocoaRenderWindow.mm
+  patch -p1 < ${SCRIPT_DIR}/Support/vtk-9.5.patch
 
   if [[ $BUILD_CLEAN = 1 ]]; then rm -rf build; fi
   mkdir -p build && cd build