From a30ad4be3cc853e9b85836bf03e814129990d0bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Thu, 16 Jul 2015 16:40:54 +0200 Subject: [PATCH] use PMP internal function --- .../Polyhedron_subset_extraction.h | 41 ------------------- ...mo_mean_curvature_flow_skeleton_plugin.cpp | 4 +- .../solver_benchmark.cpp | 4 +- .../MCF_Skeleton_test.cpp | 4 +- .../skeleton_connectivity_test.cpp | 4 +- 5 files changed, 8 insertions(+), 49 deletions(-) delete mode 100644 Polygon_mesh_processing/include/CGAL/internal/corefinement/Polyhedron_subset_extraction.h diff --git a/Polygon_mesh_processing/include/CGAL/internal/corefinement/Polyhedron_subset_extraction.h b/Polygon_mesh_processing/include/CGAL/internal/corefinement/Polyhedron_subset_extraction.h deleted file mode 100644 index b99df97ba1e..00000000000 --- a/Polygon_mesh_processing/include/CGAL/internal/corefinement/Polyhedron_subset_extraction.h +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) 2011, 2015 GeometryFactory (France). -// All rights reserved. -// -// This file is part of CGAL (www.cgal.org). -// You can redistribute it and/or modify it under the terms of the GNU -// General Public License as published by the Free Software Foundation, -// either version 3 of the License, or (at your option) any later version. -// -// Licensees holding a valid commercial license may use this file in -// accordance with the commercial license agreement provided with the software. -// -// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -// -// $URL$ -// $Id$ -// -// -// Author(s) : Sebastien Loriot and Andreas Fabri - -// temporarily needed so that Mean_curvature_skeleton test works with/without PMP - -#ifndef CGAL_PMP_POLYHEDRON_SUBSET_EXTRACTION_H -#define CGAL_PMP_POLYHEDRON_SUBSET_EXTRACTION_H - -#include - -namespace CGAL { - - namespace internal { - - template - void extract_connected_components(const Polyhedron& P,Output_iterator out) - { - corefinement::extract_connected_components(P,out); - } - } -} - - -#endif // CGAL_PMP_POLYHEDRON_SUBSET_EXTRACTION_H diff --git a/Polyhedron/demo/Polyhedron/Polyhedron_demo_mean_curvature_flow_skeleton_plugin.cpp b/Polyhedron/demo/Polyhedron/Polyhedron_demo_mean_curvature_flow_skeleton_plugin.cpp index ce95162c889..e52a7740c4a 100644 --- a/Polyhedron/demo/Polyhedron/Polyhedron_demo_mean_curvature_flow_skeleton_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Polyhedron_demo_mean_curvature_flow_skeleton_plugin.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -192,7 +192,7 @@ public: // that has only one connected component std::size_t num_component; CGAL::Counting_output_iterator output_it(&num_component); - CGAL::internal::extract_connected_components(*pMesh, output_it); + CGAL::internal::corefinement::extract_connected_components(*pMesh, output_it); ++output_it; if (num_component != 1) { diff --git a/Surface_mesh_skeletonization/benchmark/Surface_mesh_skeletonization/solver_benchmark.cpp b/Surface_mesh_skeletonization/benchmark/Surface_mesh_skeletonization/solver_benchmark.cpp index bba2daf1533..a5fda169ac8 100644 --- a/Surface_mesh_skeletonization/benchmark/Surface_mesh_skeletonization/solver_benchmark.cpp +++ b/Surface_mesh_skeletonization/benchmark/Surface_mesh_skeletonization/solver_benchmark.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include @@ -57,7 +57,7 @@ bool is_mesh_valid(Polyhedron& pMesh) // that has only one connected component std::size_t num_component; CGAL::Counting_output_iterator output_it(&num_component); - CGAL::internal::extract_connected_components(pMesh, output_it); + CGAL::internal::corefinement::extract_connected_components(pMesh, output_it); ++output_it; if (num_component != 1) { diff --git a/Surface_mesh_skeletonization/test/Surface_mesh_skeletonization/MCF_Skeleton_test.cpp b/Surface_mesh_skeletonization/test/Surface_mesh_skeletonization/MCF_Skeleton_test.cpp index 20ed42d7a43..66b899ef896 100644 --- a/Surface_mesh_skeletonization/test/Surface_mesh_skeletonization/MCF_Skeleton_test.cpp +++ b/Surface_mesh_skeletonization/test/Surface_mesh_skeletonization/MCF_Skeleton_test.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include @@ -39,7 +39,7 @@ bool is_mesh_valid(Polyhedron& pMesh) // that has only one connected component std::size_t num_component; CGAL::Counting_output_iterator output_it(&num_component); - CGAL::internal::extract_connected_components(pMesh, output_it); + CGAL::internal::corefinement::extract_connected_components(pMesh, output_it); ++output_it; if (num_component != 1) { diff --git a/Surface_mesh_skeletonization/test/Surface_mesh_skeletonization/skeleton_connectivity_test.cpp b/Surface_mesh_skeletonization/test/Surface_mesh_skeletonization/skeleton_connectivity_test.cpp index cc9abb321ec..5ace7b92ad5 100644 --- a/Surface_mesh_skeletonization/test/Surface_mesh_skeletonization/skeleton_connectivity_test.cpp +++ b/Surface_mesh_skeletonization/test/Surface_mesh_skeletonization/skeleton_connectivity_test.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include @@ -41,7 +41,7 @@ bool is_mesh_valid(Polyhedron& pMesh) // that has only one connected component std::size_t num_component; CGAL::Counting_output_iterator output_it(&num_component); - CGAL::internal::extract_connected_components(pMesh, output_it); + CGAL::internal::corefinement::extract_connected_components(pMesh, output_it); ++output_it; if (num_component != 1) {