diff --git a/Convex_hull_3/include/CGAL/convex_hull_3.h b/Convex_hull_3/include/CGAL/convex_hull_3.h index 6f284d1600e..c8561e85aa6 100644 --- a/Convex_hull_3/include/CGAL/convex_hull_3.h +++ b/Convex_hull_3/include/CGAL/convex_hull_3.h @@ -1031,11 +1031,29 @@ extreme_vertices(const InputRange& range, OutputIterator out, const Traits& traits) { + Vertex_to_point_traits_adapter traits_adapter(map, traits); extreme_points_3(range, out,traits_adapter); return out; } +template +OutputIterator +extreme_vertices(const InputRange& range, + PointPropertyMap map, + OutputIterator out) +{ + typedef typename boost::property_traits::value_type Point_3; + typedef typename internal::Convex_hull_3::Default_traits_for_Chull_3::type Traits; + + Vertex_to_point_traits_adapter traits_adapter(map, Traits()); + extreme_points_3(range, out,traits_adapter); + return out; +} + + template void convex_hull_3(InputIterator first, InputIterator beyond, Polyhedron_3& polyhedron) diff --git a/Convex_hull_3/test/Convex_hull_3/test_extreme_points.cpp b/Convex_hull_3/test/Convex_hull_3/test_extreme_points.cpp index f8fd765f3e1..9fd608ad397 100644 --- a/Convex_hull_3/test/Convex_hull_3/test_extreme_points.cpp +++ b/Convex_hull_3/test/Convex_hull_3/test_extreme_points.cpp @@ -204,22 +204,6 @@ void test_equal_points() } - -template -OutputIterator -extreme_vertices(const InputRange& range, - OutputIterator out, - VertexPointMap vpm, - const Traits& traits) -{ - CGAL::Vertex_to_point_traits_adapter traits_adapter(vpm, traits); - CGAL::extreme_points_3(range, out,traits_adapter); - return out; -} - void test_extreme_vertices(const char* fname) { std::ifstream input(fname); @@ -229,21 +213,19 @@ void test_extreme_vertices(const char* fname) exit(1); } std::vector::vertex_descriptor> verts; - extreme_vertices(vertices(P), std::back_inserter(verts) , get(CGAL::vertex_point, P), + CGAL::extreme_vertices(vertices(P), get(CGAL::vertex_point, P), std::back_inserter(verts) , CGAL::Convex_hull_traits_3()); - std::cout<