diff options
author | Jan Rękorajski | 2014-11-10 21:26:59 (GMT) |
---|---|---|
committer | Jan Rękorajski | 2014-11-10 21:26:59 (GMT) |
commit | da02bdd67f3e6439ee0937baee7af73bfbf1ccb3 (patch) | |
tree | 6eb6d258fa0526ac98e648864f1daa80db0ae170 | |
parent | 35e3860049db791c58be194b5ffb3b9afa9922f9 (diff) | |
download | pcl-da02bdd67f3e6439ee0937baee7af73bfbf1ccb3.zip pcl-da02bdd67f3e6439ee0937baee7af73bfbf1ccb3.tar.gz |
- updated to 1.7.2
-rw-r--r-- | pcl-fz_api.patch | 2 | ||||
-rw-r--r-- | pcl-tawara.patch | 6 | ||||
-rw-r--r-- | pcl-vtk6.patch | 1186 | ||||
-rw-r--r-- | pcl.spec | 12 |
4 files changed, 9 insertions, 1197 deletions
diff --git a/pcl-fz_api.patch b/pcl-fz_api.patch index 1780fdc..fff59c3 100644 --- a/pcl-fz_api.patch +++ b/pcl-fz_api.patch @@ -1,9 +1,9 @@ --- pcl-pcl-1.7.0/cmake/Modules/FindFZAPI.cmake.orig 2013-07-23 19:21:02.000000000 +0200 +++ pcl-pcl-1.7.0/cmake/Modules/FindFZAPI.cmake 2013-09-19 21:29:44.661957271 +0200 @@ -17,7 +17,7 @@ + DOC "Fotonic include directories") # Find libraries - #MESSAGE("Searching Fotonic libs: ${FZ_API_DIR}/Release") - find_library(FZAPI_LIBS fotonic_fz_api + find_library(FZAPI_LIBS fz_api HINTS "${FZ_API_DIR}/Release" NO_DEFAULT_PATH diff --git a/pcl-tawara.patch b/pcl-tawara.patch index c77bec9..207b964 100644 --- a/pcl-tawara.patch +++ b/pcl-tawara.patch @@ -1,7 +1,7 @@ --- pcl-pcl-1.7.0/tools/CMakeLists.txt.orig 2013-09-15 20:30:42.553276043 +0200 +++ pcl-pcl-1.7.0/tools/CMakeLists.txt 2013-09-19 21:27:13.421963621 +0200 @@ -230,14 +230,14 @@ - PCL_ADD_EXECUTABLE (pcl_transform_from_viewpoint ${SUBSYS_NAME} transform_from_viewpoint.cpp) + PCL_ADD_EXECUTABLE (pcl_transform_from_viewpoint "${SUBSYS_NAME}" transform_from_viewpoint.cpp) target_link_libraries (pcl_transform_from_viewpoint pcl_common pcl_io pcl_registration) - find_package(tide QUIET) @@ -12,7 +12,7 @@ + if(Tawara_FOUND) + include_directories(${Tawara_INCLUDE_DIRS}) + add_definitions(${Tawara_DEFINITIONS}) - PCL_ADD_EXECUTABLE(pcl_video ${SUBSYS_NAME} pcl_video.cpp) + PCL_ADD_EXECUTABLE(pcl_video "${SUBSYS_NAME}" pcl_video.cpp) target_link_libraries(pcl_video pcl_common pcl_io pcl_visualization - ${Tide_LIBRARIES}) - endif(Tide_FOUND) @@ -20,7 +20,7 @@ + endif(Tawara_FOUND) - endif () + endif (BUILD_tools) --- pcl-pcl-1.7.0/tools/pcl_video.cpp.orig 2013-07-23 19:21:02.000000000 +0200 +++ pcl-pcl-1.7.0/tools/pcl_video.cpp 2013-09-19 21:29:01.191959097 +0200 @@ -36,13 +36,13 @@ diff --git a/pcl-vtk6.patch b/pcl-vtk6.patch deleted file mode 100644 index 60e2a95..0000000 --- a/pcl-vtk6.patch +++ /dev/null @@ -1,1186 +0,0 @@ -diff -up ./apps/src/render_views_tesselated_sphere.cpp.vtk6 ./apps/src/render_views_tesselated_sphere.cpp ---- ./apps/src/render_views_tesselated_sphere.cpp.vtk6 2013-07-23 17:21:02.000000000 +0000 -+++ ./apps/src/render_views_tesselated_sphere.cpp 2013-08-21 00:45:59.009844777 +0000 -@@ -61,7 +61,7 @@ pcl::apps::RenderViewsTesselatedSphere:: - - 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 ./common/CMakeLists.txt.vtk6 ./common/CMakeLists.txt -diff -up ./io/CMakeLists.txt.vtk6 ./io/CMakeLists.txt ---- ./io/CMakeLists.txt.vtk6 2013-08-21 01:00:05.542130262 +0000 -+++ ./io/CMakeLists.txt 2013-08-21 01:08:03.636174342 +0000 -@@ -94,7 +94,8 @@ if(build) - src/vtk_lib_io.cpp - src/png_io.cpp - ) -- set(VTK_IO_TARGET_LINK_LIBRARIES vtkCommon vtkWidgets vtkIO vtkImaging vtkHybrid vtkGraphics vtkRendering vtkFiltering vtkVolumeRendering) -+ set(VTK_IO_TARGET_LINK_LIBRARIES vtkCommonCore vtkIOCore vtkIOImage vtkIOLegacy vtkIOPLY vtkImagingCore) -+ #set(VTK_IO_TARGET_LINK_LIBRARIES vtkCommonCore vtkInteractionWidgets vtkIOCore vtkImaging vtkHybrid vtkGraphics vtkRendering vtkFiltering vtkVolumeRendering) - # Indicates that we can rely on VTK to be present - set(VTK_DEFINES -DPCL_BUILT_WITH_VTK) - endif () -diff -up ./io/src/vtk_lib_io.cpp.vtk6 ./io/src/vtk_lib_io.cpp ---- ./io/src/vtk_lib_io.cpp.vtk6 2013-07-23 17:21:02.000000000 +0000 -+++ ./io/src/vtk_lib_io.cpp 2013-08-21 00:56:28.418488030 +0000 -@@ -178,7 +178,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 (); - -@@ -194,7 +194,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 (); -@@ -209,9 +209,9 @@ pcl::io::savePolygonFileSTL (const std:: - vtkSmartPointer<vtkPolyData> poly_data = vtkSmartPointer<vtkPolyData>::New (); - - pcl::io::mesh2vtk (mesh, poly_data); -- poly_data->Update (); -+ - 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 (); - -@@ -483,9 +483,7 @@ pcl::io::saveRangeImagePlanarFilePNG ( - { - vtkSmartPointer<vtkImageData> image = vtkSmartPointer<vtkImageData>::New(); - image->SetDimensions(range_image.width, range_image.height, 1); -- image->SetNumberOfScalarComponents(1); -- image->SetScalarTypeToFloat(); -- image->AllocateScalars(); -+ image->AllocateScalars(VTK_FLOAT, 1); - - int* dims = image->GetDimensions(); - -@@ -504,7 +502,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(); -diff -up ./outofcore/include/pcl/outofcore/visualization/axes.h.vtk6 ./outofcore/include/pcl/outofcore/visualization/axes.h ---- ./outofcore/include/pcl/outofcore/visualization/axes.h.vtk6 2013-08-21 03:00:40.617165806 +0000 -+++ ./outofcore/include/pcl/outofcore/visualization/axes.h 2013-08-21 03:01:25.741106196 +0000 -@@ -42,17 +42,17 @@ public: - axes_colors->InsertNextValue (1.0); - - vtkSmartPointer<vtkPolyData> axes_data = axes_->GetOutput (); -- axes_data->Update (); -+ axes_->Update (); - 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 () / 100.0); - axes_tubes->SetNumberOfSides (6); - - vtkSmartPointer<vtkPolyDataMapper> axes_mapper = vtkSmartPointer<vtkPolyDataMapper>::New (); - axes_mapper->SetScalarModeToUsePointData (); -- axes_mapper->SetInput (axes_tubes->GetOutput ()); -+ axes_mapper->SetInputData (axes_tubes->GetOutput ()); - - axes_actor_ = vtkSmartPointer<vtkActor>::New (); - axes_actor_->GetProperty ()->SetLighting (false); -diff -up ./outofcore/src/visualization/outofcore_cloud.cpp.vtk6 ./outofcore/src/visualization/outofcore_cloud.cpp ---- ./outofcore/src/visualization/outofcore_cloud.cpp.vtk6 2013-08-21 03:02:35.847575422 +0000 -+++ ./outofcore/src/visualization/outofcore_cloud.cpp 2013-08-21 03:02:50.185875912 +0000 -@@ -159,10 +159,10 @@ OutofcoreCloud::updateVoxelData () - double y = voxel_centers[i].y; - double z = voxel_centers[i].z; - -- voxel_data->AddInput (getVtkCube (x - s, x + s, y - s, y + s, z - s, z + s)); -+ voxel_data->AddInputData (getVtkCube (x - s, x + s, y - s, y + s, z - s, z + s)); - } - -- voxel_mapper->SetInput (voxel_data->GetOutput ()); -+ voxel_mapper->SetInputData (voxel_data->GetOutput ()); - - voxel_actor_->SetMapper (voxel_mapper); - voxel_actor_->GetProperty ()->SetRepresentationToWireframe (); -diff -up ./surface/CMakeLists.txt.vtk6 ./surface/CMakeLists.txt ---- ./surface/CMakeLists.txt.vtk6 2013-08-21 11:46:59.239250137 +0000 -+++ ./surface/CMakeLists.txt 2013-08-21 11:58:58.245855578 +0000 -@@ -44,7 +44,7 @@ if(build) - src/vtk_smoothing/vtk_mesh_quadric_decimation.cpp - src/vtk_smoothing/vtk_mesh_smoothing_laplacian.cpp - src/vtk_smoothing/vtk_mesh_smoothing_windowed_sinc.cpp) -- set(VTK_SMOOTHING_TARGET_LINK_LIBRARIES vtkCommon vtkWidgets vtkGraphics) -+ set(VTK_SMOOTHING_TARGET_LINK_LIBRARIES vtkCommonCore vtkFiltersModeling) - endif() - - SET(BUILD_surface_on_nurbs 0 CACHE BOOL "Fitting NURBS to point-clouds using openNURBS" ) -diff -up ./surface/src/vtk_smoothing/vtk_mesh_quadric_decimation.cpp.vtk6 ./surface/src/vtk_smoothing/vtk_mesh_quadric_decimation.cpp ---- ./surface/src/vtk_smoothing/vtk_mesh_quadric_decimation.cpp.vtk6 2013-08-21 11:44:17.076092636 +0000 -+++ ./surface/src/vtk_smoothing/vtk_mesh_quadric_decimation.cpp 2013-08-21 11:44:31.965381729 +0000 -@@ -59,7 +59,7 @@ pcl::MeshQuadricDecimationVTK::performPr - // Apply the VTK algorithm - vtkSmartPointer<vtkQuadricDecimation> vtk_quadric_decimation_filter = vtkSmartPointer<vtkQuadricDecimation>::New(); - vtk_quadric_decimation_filter->SetTargetReduction (target_reduction_factor_); -- vtk_quadric_decimation_filter->SetInput (vtk_polygons_); -+ vtk_quadric_decimation_filter->SetInputData (vtk_polygons_); - vtk_quadric_decimation_filter->Update (); - - vtk_polygons_ = vtk_quadric_decimation_filter->GetOutput (); -diff -up ./surface/src/vtk_smoothing/vtk_mesh_smoothing_laplacian.cpp.vtk6 ./surface/src/vtk_smoothing/vtk_mesh_smoothing_laplacian.cpp ---- ./surface/src/vtk_smoothing/vtk_mesh_smoothing_laplacian.cpp.vtk6 2013-07-23 17:21:02.000000000 +0000 -+++ ./surface/src/vtk_smoothing/vtk_mesh_smoothing_laplacian.cpp 2013-08-21 00:45:59.009844777 +0000 -@@ -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 ./surface/src/vtk_smoothing/vtk_mesh_smoothing_windowed_sinc.cpp.vtk6 ./surface/src/vtk_smoothing/vtk_mesh_smoothing_windowed_sinc.cpp ---- ./surface/src/vtk_smoothing/vtk_mesh_smoothing_windowed_sinc.cpp.vtk6 2013-07-23 17:21:02.000000000 +0000 -+++ ./surface/src/vtk_smoothing/vtk_mesh_smoothing_windowed_sinc.cpp 2013-08-21 00:45:59.009844777 +0000 -@@ -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 ./surface/src/vtk_smoothing/vtk_mesh_subdivision.cpp.vtk6 ./surface/src/vtk_smoothing/vtk_mesh_subdivision.cpp ---- ./surface/src/vtk_smoothing/vtk_mesh_subdivision.cpp.vtk6 2013-07-23 17:21:02.000000000 +0000 -+++ ./surface/src/vtk_smoothing/vtk_mesh_subdivision.cpp 2013-08-21 00:45:59.009844777 +0000 -@@ -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 ./surface/src/vtk_smoothing/vtk_utils.cpp.vtk6 ./surface/src/vtk_smoothing/vtk_utils.cpp ---- ./surface/src/vtk_smoothing/vtk_utils.cpp.vtk6 2013-07-23 17:21:02.000000000 +0000 -+++ ./surface/src/vtk_smoothing/vtk_utils.cpp 2013-08-21 00:45:59.009844777 +0000 -@@ -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 ./tools/CMakeLists.txt.vtk6 ./tools/CMakeLists.txt ---- ./tools/CMakeLists.txt.vtk6 2013-08-21 12:03:18.889571490 +0000 -+++ ./tools/CMakeLists.txt 2013-08-21 21:52:31.977816445 +0000 -@@ -157,7 +157,7 @@ if (build) - target_link_libraries (pcl_organized_pcd_to_png pcl_common pcl_io) - - PCL_ADD_EXECUTABLE(pcl_tiff2pcd ${SUBSYS_NAME} tiff2pcd.cpp) -- target_link_libraries(pcl_tiff2pcd pcl_common pcl_io) -+ target_link_libraries(pcl_tiff2pcd pcl_common pcl_io vtkRenderingCore vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkRenderingFreeTypeFontConfig vtkRenderingMatplotlib vtkRenderingVolume vtkRenderingVolumeOpenGL vtkFiltersStatistics vtkFiltersStatisticsGnuR vtkInteractionStyle vtkFiltersStatistics) - - PCL_ADD_EXECUTABLE(pcl_ply2vtk ${SUBSYS_NAME} ply2vtk.cpp) - target_link_libraries(pcl_ply2vtk pcl_common pcl_io) -@@ -172,7 +172,7 @@ if (build) - target_link_libraries(pcl_obj2vtk pcl_common pcl_io) - - PCL_ADD_EXECUTABLE(pcl_vtk2pcd ${SUBSYS_NAME} vtk2pcd.cpp) -- target_link_libraries(pcl_vtk2pcd pcl_common pcl_io) -+ target_link_libraries(pcl_vtk2pcd pcl_common pcl_io vtkFiltersCore) - - if(BUILD_visualization) - -@@ -206,13 +206,13 @@ if (build) - target_link_libraries(pcl_octree_viewer pcl_common pcl_io pcl_octree pcl_visualization pcl_kdtree pcl_filters) - - PCL_ADD_EXECUTABLE(pcl_mesh2pcd ${SUBSYS_NAME} mesh2pcd.cpp) -- target_link_libraries(pcl_mesh2pcd pcl_common pcl_io pcl_visualization pcl_filters vtkCommon) -+ target_link_libraries(pcl_mesh2pcd pcl_common pcl_io pcl_visualization pcl_filters vtkCommonCore) - - PCL_ADD_EXECUTABLE(pcl_mesh_sampling ${SUBSYS_NAME} mesh_sampling.cpp) -- target_link_libraries(pcl_mesh_sampling pcl_common pcl_io pcl_visualization pcl_filters vtkCommon) -+ target_link_libraries(pcl_mesh_sampling pcl_common pcl_io pcl_visualization pcl_filters vtkCommonCore) - - PCL_ADD_EXECUTABLE(pcl_virtual_scanner ${SUBSYS_NAME} virtual_scanner.cpp) -- target_link_libraries(pcl_virtual_scanner pcl_common pcl_io pcl_filters pcl_visualization vtkCommon vtkGraphics) -+ target_link_libraries(pcl_virtual_scanner pcl_common pcl_io pcl_filters pcl_visualization vtkCommonCore vtkRenderingCore) - - PCL_ADD_EXECUTABLE (pcl_voxel_grid_occlusion_estimation ${SUBSYS_NAME} voxel_grid_occlusion_estimation.cpp) - target_link_libraries (pcl_voxel_grid_occlusion_estimation pcl_common pcl_io pcl_filters pcl_visualization) -diff -up ./tools/mesh2pcd.cpp.vtk6 ./tools/mesh2pcd.cpp ---- ./tools/mesh2pcd.cpp.vtk6 2013-08-21 12:02:28.533640909 +0000 -+++ ./tools/mesh2pcd.cpp 2013-08-21 12:02:57.648177984 +0000 -@@ -112,14 +112,14 @@ main (int argc, char **argv) - vtkSmartPointer<vtkPLYReader> readerQuery = vtkSmartPointer<vtkPLYReader>::New (); - readerQuery->SetFileName (argv[ply_file_indices[0]]); - polydata1 = readerQuery->GetOutput (); -- polydata1->Update (); -+ readerQuery->Update (); - } - else if (obj_file_indices.size () == 1) - { - vtkSmartPointer<vtkOBJReader> readerQuery = vtkSmartPointer<vtkOBJReader>::New (); - readerQuery->SetFileName (argv[obj_file_indices[0]]); - polydata1 = readerQuery->GetOutput (); -- polydata1->Update (); -+ readerQuery->Update (); - } - - bool INTER_VIS = false; -diff -up ./tools/mesh_sampling.cpp.vtk6 ./tools/mesh_sampling.cpp ---- ./tools/mesh_sampling.cpp.vtk6 2013-07-23 17:21:02.000000000 +0000 -+++ ./tools/mesh_sampling.cpp 2013-08-21 12:04:48.924253782 +0000 -@@ -197,19 +197,19 @@ main (int argc, char **argv) - vtkSmartPointer<vtkOBJReader> readerQuery = vtkSmartPointer<vtkOBJReader>::New (); - readerQuery->SetFileName (argv[obj_file_indices[0]]); - polydata1 = readerQuery->GetOutput (); -- polydata1->Update (); -+ readerQuery->Update (); - } - - //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 (); - triangleMapper->SetInputConnection (triangleFilter->GetOutputPort ()); - triangleMapper->Update(); - polydata1 = triangleMapper->GetInput(); -- polydata1->Update (); -+ triangleMapper->Update (); - - bool INTER_VIS = false; - bool VIS = true; -diff -up ./tools/obj2vtk.cpp.vtk6 ./tools/obj2vtk.cpp ---- ./tools/obj2vtk.cpp.vtk6 2013-08-21 12:19:09.415203938 +0000 -+++ ./tools/obj2vtk.cpp 2013-08-21 12:20:53.422308400 +0000 -@@ -77,11 +77,11 @@ main (int argc, char** argv) - vtkSmartPointer<vtkOBJReader> reader = vtkSmartPointer<vtkOBJReader>::New (); - reader->SetFileName (argv[obj_file_indices[0]]); - polydata = reader->GetOutput (); -- polydata->Update (); -+ reader->Update (); - - // Convert to VTK and save - vtkSmartPointer<vtkPolyDataWriter> writer = vtkSmartPointer<vtkPolyDataWriter>::New (); -- writer->SetInput (polydata); -+ writer->SetInputData (polydata); - writer->SetFileName (argv[vtk_file_indices[0]]); - writer->Write (); - } -diff -up ./tools/obj_rec_ransac_accepted_hypotheses.cpp.vtk6 ./tools/obj_rec_ransac_accepted_hypotheses.cpp ---- ./tools/obj_rec_ransac_accepted_hypotheses.cpp.vtk6 2013-08-21 12:21:36.920187867 +0000 -+++ ./tools/obj_rec_ransac_accepted_hypotheses.cpp 2013-08-21 12:21:55.581565073 +0000 -@@ -323,13 +323,13 @@ update (CallbackParameters* params) - // Setup the transformator - vtkSmartPointer<vtkTransformPolyDataFilter> vtk_transformator = vtkSmartPointer<vtkTransformPolyDataFilter>::New (); - vtk_transformator->SetTransform (vtk_transform); -- vtk_transformator->SetInput (vtk_model); -+ vtk_transformator->SetInputData (vtk_model); - vtk_transformator->Update (); - - // Visualize - vtkSmartPointer<vtkActor> vtk_actor = vtkSmartPointer<vtkActor>::New(); - vtkSmartPointer<vtkPolyDataMapper> vtk_mapper = vtkSmartPointer<vtkPolyDataMapper>::New (); -- vtk_mapper->SetInput(vtk_transformator->GetOutput ()); -+ vtk_mapper->SetInputData(vtk_transformator->GetOutput ()); - vtk_actor->SetMapper(vtk_mapper); - // Set the appearance & add to the renderer - vtk_actor->GetProperty ()->SetColor (0.6, 0.7, 0.9); -diff -up ./tools/obj_rec_ransac_model_opps.cpp.vtk6 ./tools/obj_rec_ransac_model_opps.cpp ---- ./tools/obj_rec_ransac_model_opps.cpp.vtk6 2013-08-21 12:22:50.385672453 +0000 -+++ ./tools/obj_rec_ransac_model_opps.cpp 2013-08-21 12:23:04.255952621 +0000 -@@ -215,7 +215,7 @@ void showModelOpps (PCLVisualizer& viz, - // Save the normals - vtk_opps->GetPointData ()->SetNormals (vtk_normals); - // Setup the hedge hog object -- vtk_hedge_hog->SetInput (vtk_opps); -+ vtk_hedge_hog->SetInputData (vtk_opps); - vtk_hedge_hog->SetVectorModeToUseNormal (); - vtk_hedge_hog->SetScaleFactor (0.5f*pair_width); - vtk_hedge_hog->Update (); -diff -up ./tools/obj_rec_ransac_orr_octree.cpp.vtk6 ./tools/obj_rec_ransac_orr_octree.cpp ---- ./tools/obj_rec_ransac_orr_octree.cpp.vtk6 2013-08-21 12:23:59.602070262 +0000 -+++ ./tools/obj_rec_ransac_orr_octree.cpp 2013-08-21 12:24:21.623514810 +0000 -@@ -304,7 +304,7 @@ void node_to_cube (ORROctree::Node* node - cube->SetBounds (b[0], b[1], b[2], b[3], b[4], b[5]); - cube->Update (); - -- additive_octree->AddInput (cube->GetOutput ()); -+ additive_octree->AddInputData (cube->GetOutput ()); - } - - //=============================================================================================================================== -@@ -363,7 +363,7 @@ void show_octree (ORROctree* octree, PCL - vtkRenderer *renderer = viz.getRenderWindow ()->GetRenderers ()->GetFirstRenderer (); - vtkSmartPointer<vtkActor> octree_actor = vtkSmartPointer<vtkActor>::New(); - vtkSmartPointer<vtkDataSetMapper> mapper = vtkSmartPointer<vtkDataSetMapper>::New (); -- mapper->SetInput(vtk_octree); -+ mapper->SetInputData(vtk_octree); - octree_actor->SetMapper(mapper); - - // Set the appearance & add to the renderer -diff -up ./tools/obj_rec_ransac_orr_octree_zprojection.cpp.vtk6 ./tools/obj_rec_ransac_orr_octree_zprojection.cpp ---- ./tools/obj_rec_ransac_orr_octree_zprojection.cpp.vtk6 2013-08-21 21:26:26.090325485 +0000 -+++ ./tools/obj_rec_ransac_orr_octree_zprojection.cpp 2013-08-21 21:27:15.501360394 +0000 -@@ -206,7 +206,7 @@ void show_octree (ORROctree* octree, PCL - vtkRenderer *renderer = viz.getRenderWindow ()->GetRenderers ()->GetFirstRenderer (); - vtkSmartPointer<vtkActor> octree_actor = vtkSmartPointer<vtkActor>::New(); - vtkSmartPointer<vtkDataSetMapper> mapper = vtkSmartPointer<vtkDataSetMapper>::New (); -- mapper->SetInput(vtk_octree); -+ mapper->SetInputData(vtk_octree); - octree_actor->SetMapper(mapper); - - // Set the appearance & add to the renderer -@@ -250,9 +250,9 @@ void show_octree_zproj (ORROctreeZProjec - vtkRenderer *renderer = viz.getRenderWindow ()->GetRenderers ()->GetFirstRenderer (); - vtkSmartPointer<vtkActor> upper_actor = vtkSmartPointer<vtkActor>::New(), lower_actor = vtkSmartPointer<vtkActor>::New(); - vtkSmartPointer<vtkDataSetMapper> upper_mapper = vtkSmartPointer<vtkDataSetMapper>::New (), lower_mapper = vtkSmartPointer<vtkDataSetMapper>::New (); -- upper_mapper->SetInput(upper_bound->GetOutput ()); -+ upper_mapper->SetInputData(upper_bound->GetOutput ()); - upper_actor->SetMapper(upper_mapper); -- lower_mapper->SetInput(lower_bound->GetOutput ()); -+ lower_mapper->SetInputData(lower_bound->GetOutput ()); - lower_actor->SetMapper(lower_mapper); - - // Set the appearance & add to the renderer -@@ -272,7 +272,7 @@ void node_to_cube (ORROctree::Node* node - cube->SetBounds (b[0], b[1], b[2], b[3], b[4], b[5]); - cube->Update (); - -- additive_octree->AddInput (cube->GetOutput ()); -+ additive_octree->AddInputData (cube->GetOutput ()); - } - - //=============================================================================================================================== -@@ -284,7 +284,7 @@ void rectangle_to_vtk (float x1, float x - cube->SetBounds (x1, x2, y1, y2, z, z); - cube->Update (); - -- additive_rectangle->AddInput (cube->GetOutput ()); -+ additive_rectangle->AddInputData (cube->GetOutput ()); - } - - //=============================================================================================================================== -diff -up ./tools/obj_rec_ransac_result.cpp.vtk6 ./tools/obj_rec_ransac_result.cpp ---- ./tools/obj_rec_ransac_result.cpp.vtk6 2013-08-21 21:27:49.210066401 +0000 -+++ ./tools/obj_rec_ransac_result.cpp 2013-08-21 21:28:04.681390430 +0000 -@@ -281,13 +281,13 @@ update (CallbackParameters* params) - // Setup the transformator - vtkSmartPointer<vtkTransformPolyDataFilter> vtk_transformator = vtkSmartPointer<vtkTransformPolyDataFilter>::New (); - vtk_transformator->SetTransform (vtk_transform); -- vtk_transformator->SetInput (vtk_model); -+ vtk_transformator->SetInputData (vtk_model); - vtk_transformator->Update (); - - // Visualize - vtkSmartPointer<vtkActor> vtk_actor = vtkSmartPointer<vtkActor>::New(); - vtkSmartPointer<vtkPolyDataMapper> vtk_mapper = vtkSmartPointer<vtkPolyDataMapper>::New (); -- vtk_mapper->SetInput(vtk_transformator->GetOutput ()); -+ vtk_mapper->SetInputData(vtk_transformator->GetOutput ()); - vtk_actor->SetMapper(vtk_mapper); - // Set the appearance & add to the renderer - vtk_actor->GetProperty ()->SetColor (0.6, 0.7, 0.9); -diff -up ./tools/obj_rec_ransac_scene_opps.cpp.vtk6 ./tools/obj_rec_ransac_scene_opps.cpp ---- ./tools/obj_rec_ransac_scene_opps.cpp.vtk6 2013-08-21 21:29:21.909007870 +0000 -+++ ./tools/obj_rec_ransac_scene_opps.cpp 2013-08-21 21:29:32.698233839 +0000 -@@ -173,7 +173,7 @@ void update (CallbackParameters* params) - vtkSmartPointer<vtkHedgeHog> vtk_hh = vtkSmartPointer<vtkHedgeHog>::New (); - vtk_hh->SetVectorModeToUseNormal (); - vtk_hh->SetScaleFactor (0.5f*params->objrec_.getPairWidth ()); -- vtk_hh->SetInput (vtk_opps); -+ vtk_hh->SetInputData (vtk_opps); - vtk_hh->Update (); - - // The lines -diff -up ./tools/octree_viewer.cpp.vtk6 ./tools/octree_viewer.cpp ---- ./tools/octree_viewer.cpp.vtk6 2013-07-23 17:21:02.000000000 +0000 -+++ ./tools/octree_viewer.cpp 2013-08-21 21:30:09.428003080 +0000 -@@ -294,13 +294,13 @@ private: - double y = displayCloud->points[i].y; - double z = displayCloud->points[i].z; - -- treeWireframe->AddInput(GetCuboid(x - s, x + s, y - s, y + s, z - s, z + s)); -+ treeWireframe->AddInputData(GetCuboid(x - s, x + s, y - s, y + s, z - s, z + s)); - } - - vtkSmartPointer<vtkActor> treeActor = vtkSmartPointer<vtkActor>::New(); - - vtkSmartPointer<vtkDataSetMapper> mapper = vtkSmartPointer<vtkDataSetMapper>::New(); -- mapper->SetInput(treeWireframe->GetOutput()); -+ mapper->SetInputConnection(treeWireframe->GetOutputPort()); - treeActor->SetMapper(mapper); - - treeActor->GetProperty()->SetColor(1.0, 1.0, 1.0); -diff -up ./tools/ply2vtk.cpp.vtk6 ./tools/ply2vtk.cpp ---- ./tools/ply2vtk.cpp.vtk6 2013-08-21 21:33:03.894656841 +0000 -+++ ./tools/ply2vtk.cpp 2013-08-21 21:33:52.922683565 +0000 -@@ -77,12 +77,12 @@ main (int argc, char** argv) - vtkSmartPointer<vtkPLYReader> reader = vtkSmartPointer<vtkPLYReader>::New (); - reader->SetFileName (argv[ply_file_indices[0]]); - polydata = reader->GetOutput (); -- polydata->Update (); -+ reader->Update (); - print_info ("Loaded %s with %zu points/vertices.\n", argv[ply_file_indices[0]], polydata->GetNumberOfPoints ()); - - // Convert to VTK and save - vtkSmartPointer<vtkPolyDataWriter> writer = vtkSmartPointer<vtkPolyDataWriter>::New (); -- writer->SetInput (polydata); -+ writer->SetInputData (polydata); - writer->SetFileName (argv[vtk_file_indices[0]]); - writer->SetFileTypeToBinary (); - writer->Write (); -diff -up ./tools/png2pcd.cpp.vtk6 ./tools/png2pcd.cpp ---- ./tools/png2pcd.cpp.vtk6 2013-08-21 21:38:51.232930286 +0000 -+++ ./tools/png2pcd.cpp 2013-08-21 21:39:07.930279915 +0000 -@@ -135,7 +135,7 @@ main (int argc, char** argv) - vtkSmartPointer<vtkPNGReader> reader = vtkSmartPointer<vtkPNGReader>::New (); - reader->SetFileName (argv[png_file_indices[0]]); - image_data = reader->GetOutput (); -- image_data->Update (); -+ reader->Update (); - - // Retrieve the entries from the image data and copy them into the output RGB cloud - int components = image_data->GetNumberOfScalarComponents(); -diff -up ./tools/tiff2pcd.cpp.vtk6 ./tools/tiff2pcd.cpp ---- ./tools/tiff2pcd.cpp.vtk6 2013-08-21 21:40:40.661221583 +0000 -+++ ./tools/tiff2pcd.cpp 2013-08-21 21:41:04.837727812 +0000 -@@ -343,7 +343,7 @@ int main(int argc, char ** argv) - { - reader->SetFileName (tiff_rgb_files[i].c_str()); - rgb_data = reader->GetOutput (); -- rgb_data->Update (); -+ reader->Update (); - - std::string rgb_filename = tiff_rgb_paths[i].filename().string(); - std::string rgb_time = rgb_filename.substr(6,22); -@@ -381,7 +381,7 @@ int main(int argc, char ** argv) - { - depth_reader->SetFileName (tiff_depth_files[j].c_str()); - depth_data = depth_reader->GetOutput (); -- depth_data->Update (); -+ depth_reader->Update (); - - processAndSave(depth_data, rgb_data, depth_time, focal_length, format, color, depth, use_output_path, output_path_); - } -diff -up ./tools/virtual_scanner.cpp.vtk6 ./tools/virtual_scanner.cpp ---- ./tools/virtual_scanner.cpp.vtk6 2013-08-21 21:46:18.703160995 +0000 -+++ ./tools/virtual_scanner.cpp 2013-08-21 21:46:36.537526230 +0000 -@@ -221,7 +221,7 @@ main (int argc, char** argv) - - // Get camera positions - vtkPolyData *sphere = subdivide->GetOutput (); -- sphere->Update (); -+ subdivide->Update (); - if (!single_view) - PCL_INFO ("Created %ld camera position points.\n", sphere->GetNumberOfPoints ()); - -diff -up ./tools/voxel_grid_occlusion_estimation.cpp.vtk6 ./tools/voxel_grid_occlusion_estimation.cpp ---- ./tools/voxel_grid_occlusion_estimation.cpp.vtk6 2013-08-21 21:48:52.163305550 +0000 -+++ ./tools/voxel_grid_occlusion_estimation.cpp 2013-08-21 21:50:58.043887848 +0000 -@@ -99,13 +99,13 @@ getVoxelActors (pcl::PointCloud<pcl::Poi - double y = voxelCenters.points[i].y; - double z = voxelCenters.points[i].z; - -- treeWireframe->AddInput (getCuboid (x - s, x + s, y - s, y + s, z - s, z + s)); -+ treeWireframe->AddInputData (getCuboid (x - s, x + s, y - s, y + s, z - s, z + s)); - } - - vtkSmartPointer < vtkLODActor > treeActor = vtkSmartPointer<vtkLODActor>::New (); - - vtkSmartPointer < vtkDataSetMapper > mapper = vtkSmartPointer<vtkDataSetMapper>::New (); -- mapper->SetInput (treeWireframe->GetOutput ()); -+ mapper->SetInputData (treeWireframe->GetOutput ()); - treeActor->SetMapper (mapper); - - treeActor->GetProperty ()->SetRepresentationToWireframe (); -@@ -119,12 +119,12 @@ displayBoundingBox (Eigen::Vector3f& min - vtkSmartPointer<vtkActorCollection> coll) - { - vtkSmartPointer < vtkAppendPolyData > treeWireframe = vtkSmartPointer<vtkAppendPolyData>::New (); -- treeWireframe->AddInput (getCuboid (min_b[0], max_b[0], min_b[1], max_b[1], min_b[2], max_b[2])); -+ treeWireframe->AddInputData (getCuboid (min_b[0], max_b[0], min_b[1], max_b[1], min_b[2], max_b[2])); - - vtkSmartPointer < vtkActor > treeActor = vtkSmartPointer<vtkActor>::New (); - - vtkSmartPointer < vtkDataSetMapper > mapper = vtkSmartPointer<vtkDataSetMapper>::New (); -- mapper->SetInput (treeWireframe->GetOutput ()); -+ mapper->SetInputData (treeWireframe->GetOutput ()); - treeActor->SetMapper (mapper); - - treeActor->GetProperty ()->SetRepresentationToWireframe (); -diff -up ./tools/vtk2pcd.cpp.vtk6 ./tools/vtk2pcd.cpp ---- ./tools/vtk2pcd.cpp.vtk6 2013-08-21 21:51:08.163095564 +0000 -+++ ./tools/vtk2pcd.cpp 2013-08-21 21:51:18.089299305 +0000 -@@ -107,7 +107,7 @@ main (int argc, char** argv) - if (copy_normals) - { - vtkSmartPointer<vtkPolyDataNormals> ng = vtkSmartPointer<vtkPolyDataNormals>::New (); -- ng->SetInput (polydata); -+ ng->SetInputData (polydata); - ng->ComputePointNormalsOn (); - ng->ComputeCellNormalsOff (); - ng->Update (); -diff -up ./tools/vtk2ply.cpp.vtk6 ./tools/vtk2ply.cpp ---- ./tools/vtk2ply.cpp.vtk6 2013-08-21 21:52:57.293336401 +0000 -+++ ./tools/vtk2ply.cpp 2013-08-21 21:53:16.847738110 +0000 -@@ -77,12 +77,12 @@ main (int argc, char** argv) - vtkSmartPointer<vtkPolyDataReader> reader = vtkSmartPointer<vtkPolyDataReader>::New (); - reader->SetFileName (argv[vtk_file_indices[0]]); - polydata = reader->GetOutput (); -- polydata->Update (); -+ reader->Update (); - print_info ("Loaded %s with %zu points/vertices.\n", argv[vtk_file_indices[0]], polydata->GetNumberOfPoints ()); - - // Convert to PLY and save - vtkSmartPointer<vtkPLYWriter> writer = vtkSmartPointer<vtkPLYWriter>::New (); -- writer->SetInput (polydata); -+ writer->SetInputData (polydata); - writer->SetArrayName ("Colors"); - writer->SetFileTypeToASCII (); - writer->SetFileName (argv[ply_file_indices[0]]); -diff -up ./visualization/CMakeLists.txt.vtk6 ./visualization/CMakeLists.txt ---- ./visualization/CMakeLists.txt.vtk6 2013-08-21 02:43:15.375525780 +0000 -+++ ./visualization/CMakeLists.txt 2013-08-21 02:57:55.536733573 +0000 -@@ -152,8 +152,12 @@ if(build) - - if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" VERSION_LESS "5.6") - target_link_libraries(${LIB_NAME} pcl_common pcl_io pcl_kdtree vtkCommon vtkWidgets vtkHybrid vtkFiltering vtkRendering ${OPENGL_LIBRARIES}) -- else() -+ elseif(${VTK_MAJOR_VERSION} LESS 6) - target_link_libraries(${LIB_NAME} pcl_common pcl_io pcl_kdtree vtkCommon vtkWidgets vtkHybrid vtkCharts vtkFiltering vtkRendering ${OPENGL_LIBRARIES}) -+ elseif("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" VERSION_LESS "6.1") -+ target_link_libraries(${LIB_NAME} pcl_common pcl_io pcl_kdtree vtkCommonCore vtkChartsCore vtkInteractionStyle vtkImagingSources vtkRenderingCore vtkRenderingContext2D vtkRenderingAnnotation vtkRenderingLOD vtkRenderingVolume vtkRenderingOpenGL vtkRenderingVolumeOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionWidgets vtkFiltersStatistics vtkFiltersStatisticsGnuR vtkViewsContext2D ${OPENGL_LIBRARIES}) -+ else() -+ target_link_libraries(${LIB_NAME} pcl_common pcl_io pcl_kdtree vtkCommonCore vtkChartsCore vtkInteractionStyle vtkImagingSources vtkRenderingCore vtkRenderingContext2D vtkRenderingAnnotation vtkRenderingLOD vtkRenderingVolume vtkRenderingOpenGL vtkRenderingVolumeOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkRenderingFreeTypeFontConfig vtkRenderingMatplotlib vtkInteractionWidgets vtkFiltersStatistics vtkFiltersStatisticsGnuR vtkFiltersExtraction vtkViewsContext2D ${OPENGL_LIBRARIES}) - endif() - - set(EXT_DEPS "") -diff -up ./visualization/include/pcl/visualization/common/impl/shapes.hpp.vtk6 ./visualization/include/pcl/visualization/common/impl/shapes.hpp ---- ./visualization/include/pcl/visualization/common/impl/shapes.hpp.vtk6 2013-08-21 01:44:28.135763915 +0000 -+++ ./visualization/include/pcl/visualization/common/impl/shapes.hpp 2013-08-21 01:52:43.507042740 +0000 -@@ -67,7 +67,7 @@ pcl::visualization::createPolygon (const - poly_grid->Allocate (1, 1); - poly_grid->InsertNextCell (polygon->GetCellType (), polygon->GetPointIds ()); - poly_grid->SetPoints (poly_points); -- poly_grid->Update (); -+ //poly_grid->Update (); - - return (poly_grid); - } -@@ -104,7 +104,7 @@ pcl::visualization::createPolygon (const - poly_grid->Allocate (1, 1); - poly_grid->InsertNextCell (polygon->GetCellType (), polygon->GetPointIds ()); - poly_grid->SetPoints (poly_points); -- poly_grid->Update (); -+ //poly_grid->Update (); - - return (poly_grid); - } -diff -up ./visualization/include/pcl/visualization/image_viewer.h.vtk6 ./visualization/include/pcl/visualization/image_viewer.h ---- ./visualization/include/pcl/visualization/image_viewer.h.vtk6 2013-08-21 23:11:02.627949762 +0000 -+++ ./visualization/include/pcl/visualization/image_viewer.h 2013-08-21 02:29:21.229120143 +0000 -@@ -952,7 +952,7 @@ namespace pcl - /** \brief The renderer. */ - vtkSmartPointer<vtkRenderer> ren_; - --#if ((VTK_MAJOR_VERSION == 5) && (VTK_MINOR_VERSION >= 10)) -+#if (((VTK_MAJOR_VERSION == 5) && (VTK_MINOR_VERSION >= 10)) || (VTK_MAJOR_VERSION > 5)) - /** \brief Global prop. This is the actual "actor". */ - vtkSmartPointer<vtkImageSlice> slice_; - #endif -diff -up ./visualization/include/pcl/visualization/impl/image_viewer.hpp.vtk6 ./visualization/include/pcl/visualization/impl/image_viewer.hpp ---- ./visualization/include/pcl/visualization/impl/image_viewer.hpp.vtk6 2013-08-21 02:22:42.987745331 +0000 -+++ ./visualization/include/pcl/visualization/impl/image_viewer.hpp 2013-08-21 02:23:08.182278421 +0000 -@@ -435,9 +435,7 @@ pcl::visualization::ImageViewer::showCor - - vtkSmartPointer<vtkImageData> image = vtkSmartPointer<vtkImageData>::New (); - image->SetDimensions (source_img.width + target_img.width, std::max (source_img.height, target_img.height), 1); -- image->SetScalarTypeToUnsignedChar (); -- image->SetNumberOfScalarComponents (3); -- image->AllocateScalars (); -+ image->AllocateScalars (VTK_UNSIGNED_CHAR, 3); - image->GetPointData ()->GetScalars ()->SetVoidArray (data, data_size_, 1); - vtkSmartPointer<PCLContextImageItem> image_item = vtkSmartPointer<PCLContextImageItem>::New (); - #if ((VTK_MAJOR_VERSION == 5) && (VTK_MINOR_VERSION <= 10)) -diff -up ./visualization/include/pcl/visualization/impl/pcl_visualizer.hpp.vtk6 ./visualization/include/pcl/visualization/impl/pcl_visualizer.hpp ---- ./visualization/include/pcl/visualization/impl/pcl_visualizer.hpp.vtk6 2013-08-21 01:53:19.555789272 +0000 -+++ ./visualization/include/pcl/visualization/impl/pcl_visualizer.hpp 2013-08-21 02:15:15.723273700 +0000 -@@ -322,13 +322,13 @@ pcl::visualization::PCLVisualizer::addPo - vtkSmartPointer<vtkAppendPolyData> all_data = vtkSmartPointer<vtkAppendPolyData>::New (); - - // Add old data -- all_data->AddInput (reinterpret_cast<vtkPolyDataMapper*> ((vtkActor::SafeDownCast (am_it->second))->GetMapper ())->GetInput ()); -+ all_data->AddInputData (reinterpret_cast<vtkPolyDataMapper*> ((vtkActor::SafeDownCast (am_it->second))->GetMapper ())->GetInput ()); - - // Add new data - vtkSmartPointer<vtkDataSetSurfaceFilter> surface_filter = vtkSmartPointer<vtkDataSetSurfaceFilter>::New (); -- surface_filter->SetInput (vtkUnstructuredGrid::SafeDownCast (data)); -+ surface_filter->SetInputData (vtkUnstructuredGrid::SafeDownCast (data)); - vtkSmartPointer<vtkPolyData> poly_data = surface_filter->GetOutput (); -- all_data->AddInput (poly_data); -+ all_data->AddInputData (poly_data); - - // Create an Actor - vtkSmartPointer<vtkActor> actor; -@@ -376,13 +376,13 @@ pcl::visualization::PCLVisualizer::addPo - vtkSmartPointer<vtkAppendPolyData> all_data = vtkSmartPointer<vtkAppendPolyData>::New (); - - // Add old data -- all_data->AddInput (reinterpret_cast<vtkPolyDataMapper*> ((vtkActor::SafeDownCast (am_it->second))->GetMapper ())->GetInput ()); -+ all_data->AddInputData (reinterpret_cast<vtkPolyDataMapper*> ((vtkActor::SafeDownCast (am_it->second))->GetMapper ())->GetInput ()); - - // Add new data - vtkSmartPointer<vtkDataSetSurfaceFilter> surface_filter = vtkSmartPointer<vtkDataSetSurfaceFilter>::New (); -- surface_filter->SetInput (vtkUnstructuredGrid::SafeDownCast (data)); -+ surface_filter->SetInputData (vtkUnstructuredGrid::SafeDownCast (data)); - vtkSmartPointer<vtkPolyData> poly_data = surface_filter->GetOutput (); -- all_data->AddInput (poly_data); -+ all_data->AddInputData (poly_data); - - // Create an Actor - vtkSmartPointer<vtkActor> actor; -@@ -613,7 +613,7 @@ pcl::visualization::PCLVisualizer::updat - ////////////////////////////////////////////////////////////////////////// - // Get the actor pointer - vtkLODActor* actor = vtkLODActor::SafeDownCast (am_it->second); -- vtkAlgorithm *algo = actor->GetMapper ()->GetInput ()->GetProducerPort ()->GetProducer (); -+ vtkAlgorithm *algo = actor->GetMapper ()->GetInput (); - vtkSphereSource *src = vtkSphereSource::SafeDownCast (algo); - - src->SetCenter (double (center.x), double (center.y), double (center.z)); -@@ -796,7 +796,7 @@ pcl::visualization::PCLVisualizer::addPo - polyData->SetLines (lines); - - vtkSmartPointer<vtkDataSetMapper> mapper = vtkSmartPointer<vtkDataSetMapper>::New (); -- mapper->SetInput (polyData); -+ mapper->SetInputData (polyData); - mapper->SetColorModeToMapScalars(); - mapper->SetScalarModeTo |