Join modifications from BR_Dev_For_4_0 tag V4_1_1.

[modules/gui.git] / src / VTKViewer / VTKViewer_PassThroughFilter.cxx

diff --git a/src/VTKViewer/VTKViewer_PassThroughFilter.cxx b/src/VTKViewer/VTKViewer_PassThroughFilter.cxx
index 172976d7ea06d5b2f29ea951dc278e851a8188ff..f052b072c0be224b1971b0aeb5aafadfcce40067 100755 (executable)
--- a/src/VTKViewer/VTKViewer_PassThroughFilter.cxx
+++ b/src/VTKViewer/VTKViewer_PassThroughFilter.cxx
@@ -32,6 +32,8 @@
 #include <vtkDataSet.h>
 #include <vtkObjectFactory.h>
 #include <vtkPointData.h>
+#include <vtkInformation.h>
+#include <vtkInformationVector.h>
 
 vtkCxxRevisionMacro(VTKViewer_PassThroughFilter, "$Revision$");
 vtkStandardNewMacro(VTKViewer_PassThroughFilter);
@@ -43,10 +45,20 @@ vtkStandardNewMacro(VTKViewer_PassThroughFilter);
  */
 
 /*!Execute method.Output calculation.*/
-void VTKViewer_PassThroughFilter::Execute()
+int VTKViewer_PassThroughFilter::RequestData(
+  vtkInformation *,
+  vtkInformationVector **inputVector,
+  vtkInformationVector *outputVector)
 {
-  vtkDataSet *input = static_cast<vtkDataSet*>(this->GetInput());
-  vtkDataSet *output = static_cast<vtkDataSet*>(this->GetOutput());
+  // get the info objects
+  vtkInformation *inInfo = inputVector[0]->GetInformationObject(0);
+  vtkInformation *outInfo = outputVector->GetInformationObject(0);
+
+  // get the input and ouptut
+  vtkDataSet *input = vtkDataSet::SafeDownCast(
+    inInfo->Get(vtkDataObject::DATA_OBJECT()));
+  vtkDataSet *output = vtkDataSet::SafeDownCast(
+    outInfo->Get(vtkDataObject::DATA_OBJECT()));
 
   // This has to be here because it initialized all field datas.
   output->CopyStructure( input );
@@ -56,6 +68,7 @@ void VTKViewer_PassThroughFilter::Execute()
   output->GetPointData()->PassData( input->GetPointData() );
   output->GetCellData()->PassData( input->GetCellData() );
 
+  return 1;
 }
 
 /*!Methods invoked by print to print information about the object including superclasses.\n