From: rnv <rnv@opencascade.com>
Date: Mon, 17 Feb 2020 15:37:39 +0000 (+0300)
Subject: Porting to ParaView-5.8
X-Git-Tag: V9_5_0a2~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Frnv%2Fpv58_2;p=modules%2Fhexablock.git

Porting to ParaView-5.8
---

diff --git a/src/HEXABLOCK/CMakeLists.txt b/src/HEXABLOCK/CMakeLists.txt
index a424380..9194c08 100644
--- a/src/HEXABLOCK/CMakeLists.txt
+++ b/src/HEXABLOCK/CMakeLists.txt
@@ -23,7 +23,6 @@ INCLUDE_DIRECTORIES(
   ${KERNEL_INCLUDE_DIRS}
   ${PYTHON_INCLUDE_DIRS}
   ${OpenCASCADE_INCLUDE_DIR}
-  ${VTK_INCLUDE_DIRS}
   ${GEOM_INCLUDE_DIRS}
   ${Boost_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
diff --git a/src/HEXABLOCKGUI/CMakeLists.txt b/src/HEXABLOCKGUI/CMakeLists.txt
index 7db817d..8b007cf 100644
--- a/src/HEXABLOCKGUI/CMakeLists.txt
+++ b/src/HEXABLOCKGUI/CMakeLists.txt
@@ -30,7 +30,6 @@ INCLUDE_DIRECTORIES(
   ${LIBXML2_INCLUDE_DIR}
   ${Boost_INCLUDE_DIRS}
   ${OpenCASCADE_INCLUDE_DIR}
-  ${VTK_INCLUDE_DIRS}
   ${KERNEL_INCLUDE_DIRS}
   ${GUI_INCLUDE_DIRS}
   ${GEOM_INCLUDE_DIRS}
diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_VtkDocumentGraphicView.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_VtkDocumentGraphicView.cxx
index 4a034ca..2332799 100644
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_VtkDocumentGraphicView.cxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_VtkDocumentGraphicView.cxx
@@ -22,6 +22,7 @@
 // VTK includes
 #include <vtkRenderer.h>
 #include <vtkUnstructuredGrid.h>
+#include <vtkUnsignedCharArray.h>
 #include <vtkDataSetMapper.h>
 #include "vtkCellArray.h"
 #include "vtkPolyData.h"
@@ -223,7 +224,8 @@ vtkUnstructuredGrid* Document_Actor::getUnstructuredGrid()
     //   std::cout << "aNbCells =>" << aNbCells << std::endl;
 
     aConnectivity->InitTraversal();
-    for( vtkIdType idType = 0, *pts, npts; aConnectivity->GetNextCell( npts, pts ); idType++ ){
+	vtkIdType const *pts(nullptr);
+    for( vtkIdType idType = 0, npts; aConnectivity->GetNextCell( npts, pts ); idType++ ){
         aCellLocationsArray->SetValue( idType, aConnectivity->GetTraversalLocation( npts ) );
     }
     theGrid->SetCells( aCellTypesArray, aCellLocationsArray,aConnectivity );
@@ -413,7 +415,8 @@ vtkUnstructuredGrid* Associate_Actor::getUnstructuredGrid()
     //   std::cout << "aNbCells =>" << aNbCells << std::endl;
 
     aConnectivity->InitTraversal();
-    for( vtkIdType idType = 0, *pts, npts; aConnectivity->GetNextCell( npts, pts ); idType++ ){
+	vtkIdType const *pts(nullptr);
+    for( vtkIdType idType = 0, npts; aConnectivity->GetNextCell( npts, pts ); idType++ ){
         aCellLocationsArray->SetValue( idType, aConnectivity->GetTraversalLocation( npts ) );
     }
     theGrid->SetCells( aCellTypesArray, aCellLocationsArray,aConnectivity );
diff --git a/src/HEXABLOCK_SWIG/CMakeLists.txt b/src/HEXABLOCK_SWIG/CMakeLists.txt
index 622bc0d..f248d1b 100644
--- a/src/HEXABLOCK_SWIG/CMakeLists.txt
+++ b/src/HEXABLOCK_SWIG/CMakeLists.txt
@@ -25,7 +25,6 @@ INCLUDE_DIRECTORIES(
   ${KERNEL_INCLUDE_DIRS}
   ${PYTHON_INCLUDE_DIRS}
   ${OpenCASCADE_INCLUDE_DIR}
-  ${VTK_INCLUDE_DIRS}
   ${GEOM_INCLUDE_DIRS}
   ${Boost_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
@@ -42,7 +41,6 @@ ADD_DEFINITIONS(
 # libraries to link to
 SET(_link_LIBRARIES
   ${PYTHON_LIBRARIES}
-  ${GEOM_GEOMBase}
   ${OpenCASCADE_ModelingData_LIBRARIES}
   ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
   ${KERNEL_SALOMELocalTrace}