Merge pull request #56 from NIRALUser/vtk9

Fix build errors against VTK9
NIRALUser · Oct 8, 2021 · 0836416 · 0836416
2 parents d0058ba + b62c4a6
commit 0836416
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/ShapePopulationViewer.cmake b/ShapePopulationViewer.cmake
@@ -33,7 +33,7 @@ else()
     list(APPEND qt_components X11Extras)
   endif()
   find_package(Qt5 COMPONENTS ${qt_components} REQUIRED)
-  if (VTK_VERSION VERSION_GREATER "7" AND VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
+  if (VTK_VERSION VERSION_GREATER "7" AND (VTK_RENDERING_BACKEND STREQUAL "OpenGL2" OR VTK_RENDERING_BACKEND STREQUAL "OpenGL"))
     set(ShapePopulationViewer_VTK_USE_QVTKOPENGLWIDGET 1)
     set(ShapePopulationViewer_VTK_USE_QVTKOPENGLNATIVEWIDGET 0)
 

diff --git a/src/vtkPVPostFilter.h b/src/vtkPVPostFilter.h
@@ -34,22 +34,22 @@ class VTK_EXPORT vtkPVPostFilter : public vtkDataObjectAlgorithm
 public:
   static vtkPVPostFilter* New();
   vtkTypeMacro(vtkPVPostFilter,vtkDataObjectAlgorithm);
-  void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+  void PrintSelf(ostream& os, vtkIndent indent) override;
 
   // Description:
   // We need to override this method because the composite data pipeline
   // is not what we want. Instead we need the PVCompositeDataPipeline
   // so that we can figure out what we conversion(s) we need to do
-  vtkExecutive* CreateDefaultExecutive() VTK_OVERRIDE;
+  vtkExecutive* CreateDefaultExecutive() override;
 
   static std::string DefaultComponentName(int componentNumber, int componentCount);
 
   vtkPVPostFilter();
-  ~vtkPVPostFilter() VTK_OVERRIDE;
+  ~vtkPVPostFilter() override;
 
-  virtual int FillInputPortInformation( int port, vtkInformation* info) VTK_OVERRIDE;
-  virtual int RequestDataObject(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
-  virtual int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+  virtual int FillInputPortInformation( int port, vtkInformation* info) override;
+  virtual int RequestDataObject(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+  virtual int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
 
 
   int DoAnyNeededConversions(vtkDataObject* output);

diff --git a/src/vtkPVPostFilterExecutive.h b/src/vtkPVPostFilterExecutive.h
@@ -38,7 +38,7 @@ class VTK_EXPORT vtkPVPostFilterExecutive : public vtkCompositeDataPipeline
 public:
   static vtkPVPostFilterExecutive* New();
   vtkTypeMacro(vtkPVPostFilterExecutive,vtkCompositeDataPipeline);
-  void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+  void PrintSelf(ostream& os, vtkIndent indent) override;
 
   static vtkInformationInformationVectorKey* POST_ARRAYS_TO_PROCESS();
   static vtkInformationStringVectorKey* POST_ARRAY_COMPONENT_KEY();
@@ -54,12 +54,12 @@ class VTK_EXPORT vtkPVPostFilterExecutive : public vtkCompositeDataPipeline
 
 protected:
   vtkPVPostFilterExecutive();
-  ~vtkPVPostFilterExecutive() VTK_OVERRIDE;
+  ~vtkPVPostFilterExecutive() override;
 
   // Overriden to always return true
   virtual int NeedToExecuteData(int outputPort,
                                 vtkInformationVector** inInfoVec,
-                                vtkInformationVector* outInfoVec) VTK_OVERRIDE;
+                                vtkInformationVector* outInfoVec) override;
 
   bool MatchingPropertyInformation(vtkInformation* inputArrayInfo,vtkInformation* postArrayInfo);
 private: