Merge pull request #3 from jspricke/master

last commits from SVN repo
PointCloudLibrary · Mar 12, 2013 · edc4c13 · edc4c13
2 parents d968ac9 + 2daf68d
commit edc4c13
Show file tree

Hide file tree

Showing 20 changed files with 1,594 additions and 520 deletions.
diff --git a/recognition/CMakeLists.txt b/recognition/CMakeLists.txt
@@ -41,10 +41,12 @@ if(build)
         include/pcl/${SUBSYS_NAME}/ransac_based/obj_rec_ransac.h
         include/pcl/${SUBSYS_NAME}/ransac_based/orr_graph.h
         include/pcl/${SUBSYS_NAME}/ransac_based/orr_octree_zprojection.h
+        include/pcl/${SUBSYS_NAME}/ransac_based/trimmed_icp.h
         include/pcl/${SUBSYS_NAME}/ransac_based/orr_octree.h
+        include/pcl/${SUBSYS_NAME}/ransac_based/simple_octree.h
         include/pcl/${SUBSYS_NAME}/ransac_based/voxel_structure.h
         include/pcl/${SUBSYS_NAME}/ransac_based/bvh.h
-		include/pcl/${SUBSYS_NAME}/implicit_shape_model.h
+	     	include/pcl/${SUBSYS_NAME}/implicit_shape_model.h
         )
 
     set(hv_incs
@@ -71,8 +73,9 @@ if(build)
 
     set(impl_incs 
         include/pcl/${SUBSYS_NAME}/impl/linemod/line_rgbd.hpp
+        include/pcl/${SUBSYS_NAME}/impl/ransac_based/simple_octree.hpp
         include/pcl/${SUBSYS_NAME}/impl/ransac_based/voxel_structure.hpp
-		include/pcl/${SUBSYS_NAME}/impl/implicit_shape_model.hpp
+		    include/pcl/${SUBSYS_NAME}/impl/implicit_shape_model.hpp
         )
 
     set(hv_impl_incs
@@ -105,7 +108,7 @@ if(build)
         src/ransac_based/orr_octree_zprojection.cpp
         src/face_detection/face_detector_data_provider.cpp
         src/face_detection/rf_face_detector_trainer.cpp
-		src/implicit_shape_model.cpp
+		    src/implicit_shape_model.cpp
         )
 
     set(metslib_incs