End of fast porting

diff --git a/src/SVTK/SALOME_Actor.cxx b/src/SVTK/SALOME_Actor.cxx
index de76c46055cc6a067fc9ffe451116c3926857a52..18d5406df03986e4e3b61dd45b73382faf6308e6 100644 (file)
--- a/src/SVTK/SALOME_Actor.cxx
+++ b/src/SVTK/SALOME_Actor.cxx
@@ -63,7 +63,7 @@
 
 #include <vtkInteractorStyle.h>
 #include <vtkRenderWindowInteractor.h>
-#include <vtkPassThroughFilter.h>
+#include <vtkPassThrough.h>
 
 #include <TColStd_MapOfInteger.hxx>
 #include <TColStd_IndexedMapOfInteger.hxx>

diff --git a/src/SVTK/SVTK_DeviceActor.cxx b/src/SVTK/SVTK_DeviceActor.cxx
index d7202cef9ff0849ee4396d66256a1646977b2b61..af2999e925166432497035375d64e8d0730633e6 100644 (file)
--- a/src/SVTK/SVTK_DeviceActor.cxx
+++ b/src/SVTK/SVTK_DeviceActor.cxx
@@ -150,7 +150,7 @@ vtkDataSet*
 SVTK_DeviceActor
 ::GetInput()
 {
-  return myPassFilter.front()->GetOutput();
+  return static_cast<vtkDataSet *>(myPassFilter.front()->GetOutput());
 }
 
 /*!
@@ -266,7 +266,7 @@ SVTK_DeviceActor
   if ( vtkAlgorithmOutput* anOutput = myPassFilter[ 0 ]->GetOutputPort() )
   {     
     myPassFilter[ 0 ]->Update();
-    if ( vtkDataSet* aDataSet = myPassFilter[ 0 ]->GetOutput() )
+    if ( vtkDataSet* aDataSet = static_cast<vtkDataSet *>( myPassFilter[ 0 ]->GetOutput() ) )
     {
       vtkIdType numCells=aDataSet->GetNumberOfCells();
       vtkIdType numPts = aDataSet->GetNumberOfPoints();

diff --git a/src/VTKViewer/VTKViewer_Actor.cxx b/src/VTKViewer/VTKViewer_Actor.cxx
index c0b18ed9c2a1b70ac4b9f4f5a7a5d00556f71abd..1c40f660153e35236032c7aa9ff3e180eff04532 100644 (file)
--- a/src/VTKViewer/VTKViewer_Actor.cxx
+++ b/src/VTKViewer/VTKViewer_Actor.cxx
@@ -339,7 +339,7 @@ vtkDataSet*
 VTKViewer_Actor
 ::GetInput()
 {
-  return static_cast<vtkDataSet *>(myPassFilter.front()->GetOutput());
+  return static_cast<vtkDataSet *>( myPassFilter.front()->GetOutput() );
 }
 
 /*!

diff --git a/src/VTKViewer/VTKViewer_GeometryFilter.cxx b/src/VTKViewer/VTKViewer_GeometryFilter.cxx
index ee72257ec3b849b6af0a31f72eab53deeb2fbbf9..db0b092edbf90869e1ed52bca02a87e9a4be2fab 100644 (file)
--- a/src/VTKViewer/VTKViewer_GeometryFilter.cxx
+++ b/src/VTKViewer/VTKViewer_GeometryFilter.cxx
@@ -219,9 +219,10 @@ VTKViewer_GeometryFilter
      vtkInformation* excInfo = inputVector[1]->GetInformationObject(0);
 
      vtkExcludedFaces exc; // Will delete exc->Links when goes out of scope
+     vtkPolyData* excFaces = nullptr;
      if (excInfo)
        {
-        vtkPolyData* excFaces = vtkPolyData::SafeDownCast(excInfo->Get(vtkDataObject::DATA_OBJECT()));
+        excFaces = vtkPolyData::SafeDownCast(excInfo->Get(vtkDataObject::DATA_OBJECT()));
         vtkCellArray* excPolys = excFaces->GetPolys();
         if (excPolys->GetNumberOfCells() > 0)
           {
@@ -233,7 +234,7 @@ VTKViewer_GeometryFilter
      switch (input->GetDataObjectType())
      {
        case VTK_POLY_DATA:
-          return this->vtkGeometryFilter::PolyDataExecute(input, output, &exc);
+          return this->vtkGeometryFilter::PolyDataExecute(input, output, excFaces);
        case VTK_UNSTRUCTURED_GRID:
          {
           vtkUnstructuredGrid* inputUnstructured = static_cast<vtkUnstructuredGrid*>(input);
@@ -282,20 +283,20 @@ VTKViewer_GeometryFilter
             if ( myStoreMapping ) {
               // pass through cell ids to get original cell ids
               this->PassThroughCellIds = true;
-              ret = this->vtkGeometryFilter::UnstructuredGridExecute(input, output, info, &exc);
+              ret = this->vtkGeometryFilter::UnstructuredGridExecute(input, output, info, excFaces);
               FillVTK2ObjIds(output);
             }
             else {
               // no need to get original cell ids
               this->PassThroughCellIds = false;
-              ret = this->vtkGeometryFilter::UnstructuredGridExecute(input, output, info, &exc);
+              ret = this->vtkGeometryFilter::UnstructuredGridExecute(input, output, info, excFaces);
             }
             return ret;
            }
          }
      }
 
-     return this->vtkGeometryFilter::DataSetExecute(input, output, &exc);
+     return this->vtkGeometryFilter::DataSetExecute(input, output, excFaces);
     }  
     else // !delegateToVtk
 #endif