[pcl] More vtk 6 fixes

Orion Poplawski orion at fedoraproject.org
Sat Jul 13 03:07:05 UTC 2013


commit 644afc94851344ec17a322a4b18608bcd058b064
Author: Orion Poplawski <orion at nwra.com>
Date:   Fri Jul 12 21:06:55 2013 -0600

    More vtk 6 fixes

 pcl-vtk6.patch |  353 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 342 insertions(+), 11 deletions(-)
---
diff --git a/pcl-vtk6.patch b/pcl-vtk6.patch
index e2d3a68..8f9f9cf 100644
--- a/pcl-vtk6.patch
+++ b/pcl-vtk6.patch
@@ -1,15 +1,105 @@
+diff -up PCL-1.6.0-Source/apps/src/render_views_tesselated_sphere.cpp.vtk6 PCL-1.6.0-Source/apps/src/render_views_tesselated_sphere.cpp
+--- PCL-1.6.0-Source/apps/src/render_views_tesselated_sphere.cpp.vtk6	2013-07-12 21:05:01.802741920 -0600
++++ PCL-1.6.0-Source/apps/src/render_views_tesselated_sphere.cpp	2013-07-12 21:05:18.386674970 -0600
+@@ -58,7 +58,7 @@ void pcl::apps::RenderViewsTesselatedSph
+ 
+   vtkSmartPointer<vtkTransformFilter> trans_filter_center = vtkSmartPointer<vtkTransformFilter>::New ();
+   trans_filter_center->SetTransform (trans_center);
+-  trans_filter_center->SetInput (polydata_);
++  trans_filter_center->SetInputData (polydata_);
+   trans_filter_center->Update ();
+ 
+   vtkSmartPointer<vtkPolyDataMapper> mapper = vtkSmartPointer<vtkPolyDataMapper>::New ();
 diff -up PCL-1.6.0-Source/io/src/vtk_lib_io.cpp.vtk6 PCL-1.6.0-Source/io/src/vtk_lib_io.cpp
---- PCL-1.6.0-Source/io/src/vtk_lib_io.cpp.vtk6	2012-07-17 17:11:32.000000000 -0600
-+++ PCL-1.6.0-Source/io/src/vtk_lib_io.cpp	2013-07-12 16:23:51.634989994 -0600
-@@ -420,7 +420,7 @@ pcl::io::saveRangeImagePlanarFilePNG (
- 
-   vtkSmartPointer<vtkImageShiftScale> shiftScaleFilter = vtkSmartPointer<vtkImageShiftScale>::New();
-   shiftScaleFilter->SetOutputScalarTypeToUnsignedChar();
--  shiftScaleFilter->SetInputConnection(image->GetProducerPort());
-+  shiftScaleFilter->SetInputData(image);
-   shiftScaleFilter->SetShift(-1.0f * image->GetScalarRange()[0]); // brings the lower bound to 0
-   shiftScaleFilter->SetScale(newRange/oldRange);
-   shiftScaleFilter->Update();
+--- PCL-1.6.0-Source/io/src/vtk_lib_io.cpp.vtk6	2013-07-12 16:23:51.634989994 -0600
++++ PCL-1.6.0-Source/io/src/vtk_lib_io.cpp	2013-07-12 20:48:18.792653164 -0600
+@@ -168,7 +168,7 @@ pcl::io::savePolygonFileVTK (const std::
+   pcl::io::mesh2vtk (mesh, poly_data);
+ 
+   vtkSmartPointer<vtkPolyDataWriter> poly_writer = vtkSmartPointer<vtkPolyDataWriter>::New ();
+-  poly_writer->SetInput (poly_data);
++  poly_writer->SetInputData (poly_data);
+   poly_writer->SetFileName (file_name.c_str ());
+   poly_writer->Write ();
+ 
+@@ -184,7 +184,7 @@ pcl::io::savePolygonFilePLY (const std::
+   pcl::io::mesh2vtk (mesh, poly_data);
+ 
+   vtkSmartPointer<vtkPLYWriter> poly_writer = vtkSmartPointer<vtkPLYWriter>::New ();
+-  poly_writer->SetInput (poly_data);
++  poly_writer->SetInputData (poly_data);
+   poly_writer->SetFileName (file_name.c_str ());
+ 	poly_writer->SetArrayName ("Colors");
+   poly_writer->Write ();
+@@ -201,7 +201,7 @@ pcl::io::savePolygonFileSTL (const std::
+   pcl::io::mesh2vtk (mesh, poly_data);
+ 
+   vtkSmartPointer<vtkSTLWriter> poly_writer = vtkSmartPointer<vtkSTLWriter>::New ();
+-  poly_writer->SetInput (poly_data);
++  poly_writer->SetInputData (poly_data);
+   poly_writer->SetFileName (file_name.c_str ());
+   poly_writer->Write ();
+ 
+diff -up PCL-1.6.0-Source/surface/src/vtk_smoothing/vtk_mesh_smoothing_laplacian.cpp.vtk6 PCL-1.6.0-Source/surface/src/vtk_smoothing/vtk_mesh_smoothing_laplacian.cpp
+--- PCL-1.6.0-Source/surface/src/vtk_smoothing/vtk_mesh_smoothing_laplacian.cpp.vtk6	2012-07-17 17:11:32.000000000 -0600
++++ PCL-1.6.0-Source/surface/src/vtk_smoothing/vtk_mesh_smoothing_laplacian.cpp	2013-07-12 20:54:09.427824692 -0600
+@@ -51,7 +51,7 @@ pcl::MeshSmoothingLaplacianVTK::performP
+ 
+   // Apply the VTK algorithm
+   vtkSmartPointer<vtkSmoothPolyDataFilter> vtk_smoother = vtkSmoothPolyDataFilter::New ();
+-  vtk_smoother->SetInput (vtk_polygons_);
++  vtk_smoother->SetInputData (vtk_polygons_);
+   vtk_smoother->SetNumberOfIterations (num_iter_);
+   if (convergence_ != 0.0f)
+     vtk_smoother->SetConvergence (convergence_);
+diff -up PCL-1.6.0-Source/surface/src/vtk_smoothing/vtk_mesh_smoothing_windowed_sinc.cpp.vtk6 PCL-1.6.0-Source/surface/src/vtk_smoothing/vtk_mesh_smoothing_windowed_sinc.cpp
+--- PCL-1.6.0-Source/surface/src/vtk_smoothing/vtk_mesh_smoothing_windowed_sinc.cpp.vtk6	2013-07-12 20:54:37.650751148 -0600
++++ PCL-1.6.0-Source/surface/src/vtk_smoothing/vtk_mesh_smoothing_windowed_sinc.cpp	2013-07-12 20:54:49.174722113 -0600
+@@ -51,7 +51,7 @@ pcl::MeshSmoothingWindowedSincVTK::perfo
+ 
+   // Apply the VTK algorithm
+   vtkSmartPointer<vtkWindowedSincPolyDataFilter> vtk_smoother = vtkWindowedSincPolyDataFilter::New ();
+-  vtk_smoother->SetInput (vtk_polygons_);
++  vtk_smoother->SetInputData (vtk_polygons_);
+   vtk_smoother->SetNumberOfIterations (num_iter_);
+   vtk_smoother->SetPassBand (pass_band_);
+   vtk_smoother->SetNormalizeCoordinates (normalize_coordinates_);
+diff -up PCL-1.6.0-Source/surface/src/vtk_smoothing/vtk_mesh_subdivision.cpp.vtk6 PCL-1.6.0-Source/surface/src/vtk_smoothing/vtk_mesh_subdivision.cpp
+--- PCL-1.6.0-Source/surface/src/vtk_smoothing/vtk_mesh_subdivision.cpp.vtk6	2012-07-17 17:11:32.000000000 -0600
++++ PCL-1.6.0-Source/surface/src/vtk_smoothing/vtk_mesh_subdivision.cpp	2013-07-12 20:53:31.947918907 -0600
+@@ -78,7 +78,7 @@ pcl::MeshSubdivisionVTK::performProcessi
+       break;
+   }
+ 
+-  vtk_subdivision_filter->SetInput (vtk_polygons_);
++  vtk_subdivision_filter->SetInputData (vtk_polygons_);
+   vtk_subdivision_filter->Update ();
+ 
+   vtk_polygons_ = vtk_subdivision_filter->GetOutput ();
+diff -up PCL-1.6.0-Source/surface/src/vtk_smoothing/vtk_utils.cpp.vtk6 PCL-1.6.0-Source/surface/src/vtk_smoothing/vtk_utils.cpp
+--- PCL-1.6.0-Source/surface/src/vtk_smoothing/vtk_utils.cpp.vtk6	2012-07-17 17:11:32.000000000 -0600
++++ PCL-1.6.0-Source/surface/src/vtk_smoothing/vtk_utils.cpp	2013-07-12 20:51:59.133155236 -0600
+@@ -63,7 +63,7 @@ pcl::VTKUtils::convertToVTK (const pcl::
+   mesh2vtk (triangles, vtk_polygons);
+ 
+   vtkSmartPointer<vtkTriangleFilter> vtk_triangles = vtkTriangleFilter::New ();
+-  vtk_triangles->SetInput (vtk_polygons);
++  vtk_triangles->SetInputData (vtk_polygons);
+   vtk_triangles->Update();
+ 
+   triangles_out_vtk = vtk_triangles->GetOutput ();
+diff -up PCL-1.6.0-Source/tools/mesh_sampling.cpp.vtk6 PCL-1.6.0-Source/tools/mesh_sampling.cpp
+--- PCL-1.6.0-Source/tools/mesh_sampling.cpp.vtk6	2012-07-17 17:11:32.000000000 -0600
++++ PCL-1.6.0-Source/tools/mesh_sampling.cpp	2013-07-12 20:50:18.733388474 -0600
+@@ -202,7 +202,7 @@ main (int argc, char **argv)
+ 
+   //make sure that the polygons are triangles!
+   vtkSmartPointer<vtkTriangleFilter> triangleFilter = vtkSmartPointer<vtkTriangleFilter>::New ();
+-  triangleFilter->SetInput (polydata1);
++  triangleFilter->SetInputData (polydata1);
+   triangleFilter->Update ();
+ 
+   vtkSmartPointer<vtkPolyDataMapper> triangleMapper = vtkSmartPointer<vtkPolyDataMapper>::New ();
 diff -up PCL-1.6.0-Source/tools/octree_viewer.cpp.vtk6 PCL-1.6.0-Source/tools/octree_viewer.cpp
 --- PCL-1.6.0-Source/tools/octree_viewer.cpp.vtk6	2012-07-17 17:11:32.000000000 -0600
 +++ PCL-1.6.0-Source/tools/octree_viewer.cpp	2013-07-12 16:46:53.699342598 -0600
@@ -22,3 +112,244 @@ diff -up PCL-1.6.0-Source/tools/octree_viewer.cpp.vtk6 PCL-1.6.0-Source/tools/oc
      treeActor->SetMapper(mapper);
  
      treeActor->GetProperty()->SetColor(1.0, 1.0, 1.0);
+diff -up PCL-1.6.0-Source/visualization/src/common/io.cpp.vtk6 PCL-1.6.0-Source/visualization/src/common/io.cpp
+--- PCL-1.6.0-Source/visualization/src/common/io.cpp.vtk6	2012-07-17 17:11:32.000000000 -0600
++++ PCL-1.6.0-Source/visualization/src/common/io.cpp	2013-07-12 21:02:45.726515839 -0600
+@@ -83,7 +83,7 @@ pcl::visualization::savePointData (vtkPo
+   // Clean the data (no duplicates!)
+   vtkSmartPointer<vtkCleanPolyData> cleaner = vtkSmartPointer<vtkCleanPolyData>::New ();
+   cleaner->SetTolerance (0.0);
+-  cleaner->SetInput (data);
++  cleaner->SetInputData (data);
+   cleaner->ConvertLinesToPointsOff ();
+   cleaner->ConvertPolysToLinesOff ();
+   cleaner->ConvertStripsToPolysOff ();
+diff -up PCL-1.6.0-Source/visualization/src/common/shapes.cpp.vtk6 PCL-1.6.0-Source/visualization/src/common/shapes.cpp
+--- PCL-1.6.0-Source/visualization/src/common/shapes.cpp.vtk6	2012-07-17 17:11:32.000000000 -0600
++++ PCL-1.6.0-Source/visualization/src/common/shapes.cpp	2013-07-12 21:03:34.603354663 -0600
+@@ -185,7 +185,7 @@ pcl::visualization::create2DCircle (cons
+   circle->SetNumberOfSides (100);
+   
+   vtkSmartPointer<vtkTubeFilter> tube = vtkSmartPointer<vtkTubeFilter>::New();
+-  tube->SetInput (circle->GetOutput());
++  tube->SetInputConnection (circle->GetOutputPort());
+   tube->SetNumberOfSides (25);
+   tube->SetRadius (0.001);
+   */ 
+diff -up PCL-1.6.0-Source/visualization/src/image_viewer.cpp.vtk6 PCL-1.6.0-Source/visualization/src/image_viewer.cpp
+--- PCL-1.6.0-Source/visualization/src/image_viewer.cpp.vtk6	2012-07-17 17:11:32.000000000 -0600
++++ PCL-1.6.0-Source/visualization/src/image_viewer.cpp	2013-07-12 20:57:45.936275154 -0600
+@@ -130,7 +130,7 @@ pcl::visualization::ImageViewer::addRGBI
+   imageTransform->SetMatrix (transform);
+   // Now create filter and set previously created transformation
+   vtkSmartPointer<vtkImageReslice> algo = vtkSmartPointer<vtkImageReslice>::New ();
+-  algo->SetInput (importer->GetOutput ());
++  algo->SetInputConnection (importer->GetOutputPort ());
+   algo->SetInformationInput (importer->GetOutput ());
+   algo->SetResliceTransform (imageTransform);
+   algo->SetInterpolationModeToCubic ();
+@@ -151,7 +151,7 @@ pcl::visualization::ImageViewer::addRGBI
+ //  }
+ //  // If not, pass the data directly to the viewer
+ //  else
+-//    image_viewer_->SetInput (algo->GetOutput ());
++//    image_viewer_->SetInputConnection (algo->GetOutputPort ());
+ }
+ 
+ /////////////////////////////////////////////////////////////////////////////////////////////
+@@ -200,7 +200,7 @@ pcl::visualization::ImageViewer::addMono
+   imageTransform->SetMatrix (transform);
+   // Now create filter and set previously created transformation
+   vtkSmartPointer<vtkImageReslice> algo = vtkSmartPointer<vtkImageReslice>::New ();
+-  algo->SetInput (importer->GetOutput ());
++  algo->SetInputConnection (importer->GetOutputPort ());
+   algo->SetInformationInput (importer->GetOutput ());
+   algo->SetResliceTransform (imageTransform);
+   algo->SetInterpolationModeToCubic ();
+@@ -221,7 +221,7 @@ pcl::visualization::ImageViewer::addMono
+ //  }
+ //  // If not, pass the data directly to the viewer
+ //  else
+-//    image_viewer_->SetInput (algo->GetOutput ());
++//    image_viewer_->SetInputConnection (algo->GetOutputPort ());
+ }
+ 
+ /////////////////////////////////////////////////////////////////////////////////////////////
+diff -up PCL-1.6.0-Source/visualization/src/interactor_style.cpp.vtk6 PCL-1.6.0-Source/visualization/src/interactor_style.cpp
+--- PCL-1.6.0-Source/visualization/src/interactor_style.cpp.vtk6	2012-07-17 17:11:32.000000000 -0600
++++ PCL-1.6.0-Source/visualization/src/interactor_style.cpp	2013-07-12 21:04:53.302870144 -0600
+@@ -319,7 +319,7 @@ pcl::visualization::PCLVisualizerInterac
+         data->SetVerts (vertices);
+         // Modify the mapper
+         vtkPolyDataMapper* mapper = static_cast<vtkPolyDataMapper*>(act->actor->GetMapper ());
+-        mapper->SetInput (data);
++        mapper->SetInputData (data);
+         // Modify the actor
+         act->actor->SetMapper (mapper);
+         act->actor->Modified ();
+@@ -352,7 +352,7 @@ pcl::visualization::PCLVisualizerInterac
+         vtkPolyDataMapper* mapper = static_cast<vtkPolyDataMapper*>(act->actor->GetMapper ());
+         mapper->SetScalarRange (minmax);
+         mapper->SetScalarModeToUsePointData ();
+-        mapper->SetInput (data);
++        mapper->SetInputData (data);
+         // Modify the actor
+         act->actor->SetMapper (mapper);
+         act->actor->Modified ();
+diff -up PCL-1.6.0-Source/visualization/src/pcl_visualizer.cpp.vtk6 PCL-1.6.0-Source/visualization/src/pcl_visualizer.cpp
+--- PCL-1.6.0-Source/visualization/src/pcl_visualizer.cpp.vtk6	2012-07-17 17:11:32.000000000 -0600
++++ PCL-1.6.0-Source/visualization/src/pcl_visualizer.cpp	2013-07-12 21:02:17.783585379 -0600
+@@ -337,13 +337,13 @@ pcl::visualization::PCLVisualizer::addCo
+   axes_data->GetPointData ()->SetScalars (axes_colors);
+ 
+   vtkSmartPointer<vtkTubeFilter> axes_tubes = vtkSmartPointer<vtkTubeFilter>::New ();
+-  axes_tubes->SetInput (axes_data);
++  axes_tubes->SetInputData (axes_data);
+   axes_tubes->SetRadius (axes->GetScaleFactor () / 50.0);
+   axes_tubes->SetNumberOfSides (6);
+ 
+   vtkSmartPointer<vtkPolyDataMapper> axes_mapper = vtkSmartPointer<vtkPolyDataMapper>::New ();
+   axes_mapper->SetScalarModeToUsePointData ();
+-  axes_mapper->SetInput (axes_tubes->GetOutput ());
++  axes_mapper->SetInputConnection (axes_tubes->GetOutputPort ());
+ 
+   vtkSmartPointer<vtkLODActor> axes_actor = vtkSmartPointer<vtkLODActor>::New ();
+   axes_actor->SetMapper (axes_mapper);
+@@ -376,13 +376,13 @@ pcl::visualization::PCLVisualizer::addCo
+   axes_data->GetPointData ()->SetScalars (axes_colors);
+ 
+   vtkSmartPointer<vtkTubeFilter> axes_tubes = vtkSmartPointer<vtkTubeFilter>::New ();
+-  axes_tubes->SetInput (axes_data);
++  axes_tubes->SetInputData (axes_data);
+   axes_tubes->SetRadius (axes->GetScaleFactor () / 50.0);
+   axes_tubes->SetNumberOfSides (6);
+ 
+   vtkSmartPointer<vtkPolyDataMapper> axes_mapper = vtkSmartPointer<vtkPolyDataMapper>::New ();
+   axes_mapper->SetScalarModeToUsePointData ();
+-  axes_mapper->SetInput (axes_tubes->GetOutput ());
++  axes_mapper->SetInputConnection (axes_tubes->GetOutputPort ());
+ 
+   vtkSmartPointer<vtkLODActor> axes_actor = vtkSmartPointer<vtkLODActor>::New ();
+   axes_actor->SetMapper (axes_mapper);
+@@ -416,13 +416,13 @@ pcl::visualization::PCLVisualizer::addCo
+   axes_data->GetPointData ()->SetScalars (axes_colors);
+ 
+   vtkSmartPointer<vtkTubeFilter> axes_tubes = vtkSmartPointer<vtkTubeFilter>::New ();
+-  axes_tubes->SetInput (axes_data);
++  axes_tubes->SetInputData (axes_data);
+   axes_tubes->SetRadius (axes->GetScaleFactor () / 50.0);
+   axes_tubes->SetNumberOfSides (6);
+ 
+   vtkSmartPointer<vtkPolyDataMapper> axes_mapper = vtkSmartPointer<vtkPolyDataMapper>::New ();
+   axes_mapper->SetScalarModeToUsePointData ();
+-  axes_mapper->SetInput (axes_tubes->GetOutput ());
++  axes_mapper->SetInputConnection (axes_tubes->GetOutputPort ());
+ 
+   vtkSmartPointer<vtkLODActor> axes_actor = vtkSmartPointer<vtkLODActor>::New ();
+   axes_actor->SetMapper (axes_mapper);
+@@ -825,7 +825,7 @@ pcl::visualization::PCLVisualizer::creat
+     actor = vtkSmartPointer<vtkLODActor>::New ();
+ 
+   vtkSmartPointer<vtkDataSetMapper> mapper = vtkSmartPointer<vtkDataSetMapper>::New ();
+-  mapper->SetInput (data);
++  mapper->SetInputData (data);
+ 
+   if (use_scalars)
+   {
+@@ -1731,7 +1731,7 @@ pcl::visualization::PCLVisualizer::addMo
+ 
+   vtkSmartPointer <vtkTransformFilter> trans_filter = vtkSmartPointer<vtkTransformFilter>::New ();
+   trans_filter->SetTransform (transform);
+-  trans_filter->SetInput (polydata);
++  trans_filter->SetInputData (polydata);
+   trans_filter->Update();
+ 
+   // Create an Actor
+@@ -1958,7 +1958,7 @@ pcl::visualization::PCLVisualizer::addTe
+   // Create an Actor
+   vtkSmartPointer<vtkTextActor> actor = vtkSmartPointer<vtkTextActor>::New ();
+   actor->SetPosition (xpos, ypos);
+-  actor->SetInput (text.c_str ());
++  actor->SetInputData (text.c_str ());
+ 
+   vtkSmartPointer<vtkTextProperty> tprop = actor->GetTextProperty ();
+   tprop->SetFontSize (10);
+@@ -1994,7 +1994,7 @@ pcl::visualization::PCLVisualizer::addTe
+   // Create an Actor
+   vtkSmartPointer<vtkTextActor> actor = vtkSmartPointer<vtkTextActor>::New ();
+   actor->SetPosition (xpos, ypos);
+-  actor->SetInput (text.c_str ());
++  actor->SetInputData (text.c_str ());
+ 
+   vtkSmartPointer<vtkTextProperty> tprop = actor->GetTextProperty ();
+   tprop->SetFontSize (10);
+@@ -2030,7 +2030,7 @@ pcl::visualization::PCLVisualizer::addTe
+   // Create an Actor
+   vtkSmartPointer<vtkTextActor> actor = vtkSmartPointer<vtkTextActor>::New ();
+   actor->SetPosition (xpos, ypos);
+-  actor->SetInput (text.c_str ());
++  actor->SetInputData (text.c_str ());
+ 
+   vtkSmartPointer<vtkTextProperty> tprop = actor->GetTextProperty ();
+   tprop->SetFontSize (fontsize);
+@@ -2063,7 +2063,7 @@ pcl::visualization::PCLVisualizer::updat
+ 	// Retrieve the Actor
+ 	vtkTextActor* actor = vtkTextActor::SafeDownCast (am_it->second); 
+ 	actor->SetPosition (xpos, ypos);
+-	actor->SetInput (text.c_str ());
++	actor->SetInputData (text.c_str ());
+ 
+ 	actor->Modified ();
+ 
+@@ -2088,7 +2088,7 @@ pcl::visualization::PCLVisualizer::updat
+ 	// Create the Actor
+ 	vtkTextActor* actor = vtkTextActor::SafeDownCast (am_it->second); 
+ 	actor->SetPosition (xpos, ypos);
+-	actor->SetInput (text.c_str ());
++	actor->SetInputData (text.c_str ());
+ 
+ 	vtkSmartPointer<vtkTextProperty> tprop = actor->GetTextProperty ();
+ 	tprop->SetColor (r, g, b);
+@@ -2116,7 +2116,7 @@ pcl::visualization::PCLVisualizer::updat
+ 	vtkTextActor *actor = vtkTextActor::SafeDownCast (am_it->second);
+ 	
+ 	actor->SetPosition (xpos, ypos);
+-	actor->SetInput (text.c_str ());
++	actor->SetInputData (text.c_str ());
+ 
+ 	vtkTextProperty* tprop = actor->GetTextProperty ();
+ 	tprop->SetFontSize (fontsize);
+@@ -2158,7 +2158,7 @@ pcl::visualization::PCLVisualizer::updat
+   vtkPolyDataMapper* mapper = static_cast<vtkPolyDataMapper*>(am_it->second.actor->GetMapper ());
+   mapper->SetScalarRange (minmax);
+   mapper->SetScalarModeToUsePointData ();
+-  mapper->SetInput (data);
++  mapper->SetInputData (data);
+   // Modify the actor
+   am_it->second.actor->SetMapper (mapper);
+   am_it->second.actor->Modified ();
+@@ -2331,7 +2331,7 @@ pcl::visualization::PCLVisualizer::addPo
+ 
+   // Setup actor and mapper
+   vtkSmartPointer < vtkPolyDataMapper > mapper = vtkSmartPointer<vtkPolyDataMapper>::New ();
+-  mapper->SetInput (polyData);
++  mapper->SetInput Data(polyData);
+ 
+   vtkSmartPointer < vtkActor > actor = vtkSmartPointer<vtkActor>::New ();
+   actor->SetMapper (mapper);
+@@ -2465,7 +2465,7 @@ pcl::visualization::PCLVisualizer::rende
+ 
+   vtkSmartPointer<vtkTransformFilter> trans_filter_center = vtkSmartPointer<vtkTransformFilter>::New ();
+   trans_filter_center->SetTransform (trans_center);
+-  trans_filter_center->SetInput (polydata);
++  trans_filter_center->SetInputData (polydata);
+   trans_filter_center->Update ();
+ 
+   vtkSmartPointer<vtkPolyDataMapper> mapper = vtkSmartPointer<vtkPolyDataMapper>::New ();
+@@ -3161,5 +3161,5 @@ pcl::visualization::FPSCallback::Execute
+   float fps = 1.0 / ren->GetLastRenderTimeInSeconds ();
+   char buf[128];
+   sprintf (buf, "%.1f FPS", fps);
+-  actor_->SetInput (buf);
++  actor_->SetInputData (buf);
+ }


More information about the scm-commits mailing list