Merge pull request #494 from lhofmann/vtk_version

Missing vtkVersion includes
topology-tool-kit · Sep 18, 2020 · 486484b · 486484b
2 parents 4648ca9 + 1479b7a
commit 486484b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/core/vtk/ttkCinemaImaging/ttkCinemaImaging.cpp b/core/vtk/ttkCinemaImaging/ttkCinemaImaging.cpp
@@ -104,7 +104,9 @@ void addValuePass(vtkDataSet *object,
     size_t nComponents = field->GetNumberOfComponents();
     for(size_t c = 0; c < nComponents; c++) {
       auto valuePass = vtkSmartPointer<vtkValuePass>::New();
+#if VTK_MAJOR_VERSION < 8 || (VTK_MAJOR_VERSION == 8 && VTK_MINOR_VERSION < 90)
       valuePass->SetRenderingMode(vtkValuePass::FLOATING_POINT);
+#endif
       valuePass->SetInputArrayToProcess(fieldType == 0
                                           ? VTK_SCALAR_MODE_USE_POINT_FIELD_DATA
                                           : VTK_SCALAR_MODE_USE_CELL_FIELD_DATA,

diff --git a/core/vtk/ttkCinemaQuery/ttkCinemaQuery.cpp b/core/vtk/ttkCinemaQuery/ttkCinemaQuery.cpp
@@ -1,5 +1,6 @@
 #include <ttkCinemaQuery.h>
 
+#include <vtkVersion.h>
 #include <vtkInformation.h>
 
 #include <vtkDelimitedTextReader.h>

diff --git a/core/vtk/ttkContourAroundPoint/ttkContourAroundPoint.cpp b/core/vtk/ttkContourAroundPoint/ttkContourAroundPoint.cpp
@@ -3,7 +3,7 @@
 #include <ttkMacros.h>
 #include <ttkUtils.h>
 
-// #include <vtkVersion.h>
+#include <vtkVersion.h>
 #include <vtkInformation.h>
 #include <vtkInformationVector.h>
 

diff --git a/core/vtk/ttkTriangulationAlgorithm/macro.h b/core/vtk/ttkTriangulationAlgorithm/macro.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <vtkVersion.h>
 #include <vtkIdTypeArray.h>
 #include <vtkImageData.h>
 #include <vtkInformationVector.h>