From 23fbb4d6cad86c800097382e5a29acf30a012d18 Mon Sep 17 00:00:00 2001 From: lhofmann Date: Thu, 17 Sep 2020 13:41:28 +0200 Subject: [PATCH 1/2] Fix missing vtkVersion.h includes --- core/vtk/ttkCinemaQuery/ttkCinemaQuery.cpp | 1 + core/vtk/ttkContourAroundPoint/ttkContourAroundPoint.cpp | 2 +- core/vtk/ttkTriangulationAlgorithm/macro.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/vtk/ttkCinemaQuery/ttkCinemaQuery.cpp b/core/vtk/ttkCinemaQuery/ttkCinemaQuery.cpp index 1c871da766..6a517007e2 100644 --- a/core/vtk/ttkCinemaQuery/ttkCinemaQuery.cpp +++ b/core/vtk/ttkCinemaQuery/ttkCinemaQuery.cpp @@ -1,5 +1,6 @@ #include +#include #include #include diff --git a/core/vtk/ttkContourAroundPoint/ttkContourAroundPoint.cpp b/core/vtk/ttkContourAroundPoint/ttkContourAroundPoint.cpp index c2695d0f97..cec5715276 100644 --- a/core/vtk/ttkContourAroundPoint/ttkContourAroundPoint.cpp +++ b/core/vtk/ttkContourAroundPoint/ttkContourAroundPoint.cpp @@ -3,7 +3,7 @@ #include #include -// #include +#include #include #include diff --git a/core/vtk/ttkTriangulationAlgorithm/macro.h b/core/vtk/ttkTriangulationAlgorithm/macro.h index 263c3cad47..5f1c24bb87 100644 --- a/core/vtk/ttkTriangulationAlgorithm/macro.h +++ b/core/vtk/ttkTriangulationAlgorithm/macro.h @@ -1,5 +1,6 @@ #pragma once +#include #include #include #include From 1479b7a198f9b86fb5cf7731fb9139a3da93f3ef Mon Sep 17 00:00:00 2001 From: lhofmann Date: Thu, 17 Sep 2020 13:44:02 +0200 Subject: [PATCH 2/2] [ttkCinemaImaging] remove deprecated call to vtkValuePass::SetRenderingMode in VTK 9 --- core/vtk/ttkCinemaImaging/ttkCinemaImaging.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/vtk/ttkCinemaImaging/ttkCinemaImaging.cpp b/core/vtk/ttkCinemaImaging/ttkCinemaImaging.cpp index f1c142910a..dcb130edb8 100644 --- 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::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,