diff --git a/Surface_mesh_skeletonization/include/CGAL/Mean_curvature_flow_skeletonization.h b/Surface_mesh_skeletonization/include/CGAL/Mean_curvature_flow_skeletonization.h index 0e74b7a641a..89383a540b6 100644 --- a/Surface_mesh_skeletonization/include/CGAL/Mean_curvature_flow_skeletonization.h +++ b/Surface_mesh_skeletonization/include/CGAL/Mean_curvature_flow_skeletonization.h @@ -58,7 +58,7 @@ #include // Some helper functions -#include +#include // For detect_degenarcy #include @@ -721,7 +721,8 @@ public: MCFSKEL_DEBUG(print_edges();) - MCFSKEL_INFO(double area = internal::get_surface_area(m_tmesh, m_tmesh_point_pmap);) + MCFSKEL_INFO(double area = CGAL::Polygon_mesh_processing::area(m_tmesh, + CGAL::Polygon_mesh_processing::parameters::vertex_point_map(m_tmesh_point_pmap));) MCFSKEL_INFO(std::cout << "area " << area << "\n";) } @@ -744,7 +745,9 @@ public: remesh(); detect_degeneracies(); - double area = internal::get_surface_area(m_tmesh, m_tmesh_point_pmap, m_traits); + double area = CGAL::Polygon_mesh_processing::area(m_tmesh, + CGAL::Polygon_mesh_processing::parameters::vertex_point_map(m_tmesh_point_pmap) + .geom_traits(m_traits)); double area_ratio = fabs(last_area - area) / m_original_area; MCFSKEL_INFO(std::cout << "area " << area << "\n";) @@ -852,7 +855,9 @@ private: //, m_hedge_id_pmap(get(boost::halfedge_index, m_tmesh)) m_are_poles_computed = false; - m_original_area = internal::get_surface_area(m_tmesh, m_tmesh_point_pmap, m_traits); + m_original_area = CGAL::Polygon_mesh_processing::area(m_tmesh, + CGAL::Polygon_mesh_processing::parameters::vertex_point_map(m_tmesh_point_pmap) + .geom_traits(m_traits)); m_vertex_id_count = static_cast(num_vertices(m_tmesh)); m_max_id = m_vertex_id_count; diff --git a/Surface_mesh_skeletonization/include/CGAL/internal/Surface_mesh_skeletonization/Utility.h b/Surface_mesh_skeletonization/include/CGAL/internal/Surface_mesh_skeletonization/Utility.h deleted file mode 100644 index 754dee3ffdd..00000000000 --- a/Surface_mesh_skeletonization/include/CGAL/internal/Surface_mesh_skeletonization/Utility.h +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright (c) 2013 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) : Xiang Gao -// - -#ifndef CGAL_MCFSKEL_UTILITY_H -#define CGAL_MCFSKEL_UTILITY_H - -/// @cond CGAL_DOCUMENT_INTERNAL - -/** - * @file Utility.h - * @brief This file contains some helper functions like splitting an edge at a - * given point. - */ - -#include - -#include -#include -#include - -namespace CGAL { -namespace internal { - -template -double get_surface_area(TriangleMesh& hg, - TriangleMeshPointPMap& hg_point_pmap, - const Traits& traits) -{ - namespace PMP = CGAL::Polygon_mesh_processing; - return PMP::area(hg - , PMP::parameters::vertex_point_map(hg_point_pmap) - .geom_traits(traits)); -} - -} //namespace internal -} //namespace CGAL - -/// @endcond - -#endif //CGAL_MCFSKEL_UTILITY_H