songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix warnings

This commit is contained in:
Sébastien Loriot 2021-12-07 16:03:18 +01:00
parent 197c0a2471
commit cb4f5490e3
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Convex_hull_3/include/CGAL/Convex_hull_3/internal/Indexed_triangle_set.h
View File

@ -26,12 +26,15 @@ namespace CGAL {
namespace Convex_hull_3 { namespace Convex_hull_3 {
namespace internal { namespace internal {
template <typename V, typename F> template <typename V, typename F>
struct Indexed_triangle_set struct Indexed_triangle_set
{ {
V& vertices; V& vertices;
F& faces; F& faces;
typedef typename std::iterator_traits<typename F::iterator>::value_type Index_triple;
typedef typename std::iterator_traits<typename Index_triple::iterator>::value_type Index;
Indexed_triangle_set(V& vertices, Indexed_triangle_set(V& vertices,
F& faces) F& faces)
: vertices(vertices), faces(faces) : vertices(vertices), faces(faces)
@ -55,11 +58,13 @@ void copy_ch2_to_face_graph(const std::list<P>& CH_2,
its.vertices.push_back(p); its.vertices.push_back(p);
} }
typedef typename Indexed_triangle_set<V,F>::Index Index;
for(std::size_t i = 1; i < CH_2.size()-1; ++i){ for(std::size_t i = 1; i < CH_2.size()-1; ++i){
CGAL::internal::resize(its.faces[i-1], 3); CGAL::internal::resize(its.faces[i-1], 3);
its.faces[i-1][0] = i; its.faces[i-1][0] = static_cast<Index>(i);
its.faces[i-1][1] = i + 1; its.faces[i-1][1] = static_cast<Index>(i + 1);
its.faces[i-1][2] = i + 2; its.faces[i-1][2] = static_cast<Index>(i + 2);
} }
} }
@ -74,11 +79,12 @@ void copy_face_graph(const TDS& tds, Convex_hull_3::internal::Indexed_triangle_s
typedef typename TDS::Face_iterator Face_iterator; typedef typename TDS::Face_iterator Face_iterator;
CGAL::internal::resize(its.vertices, tds.number_of_vertices()); CGAL::internal::resize(its.vertices, tds.number_of_vertices());
CGAL::internal::resize(its.faces, tds.number_of_faces()); CGAL::internal::resize(its.faces, tds.number_of_faces());
std::size_t i = 0; typename Convex_hull_3::internal::Indexed_triangle_set<V,F>::Index i = 0;
for(Vertex_iterator vit = tds.vertices_begin(); vit != tds.vertices_end(); ++vit){ for(Vertex_iterator vit = tds.vertices_begin(); vit != tds.vertices_end(); ++vit){
its.vertices[i] = vit->point(); its.vertices[i] = vit->point();
vit->info() = i++; vit->info() = i++;
} }
i = 0; i = 0;
for (Face_iterator fit = tds.faces_begin(); fit != tds.faces_end(); ++fit) { for (Face_iterator fit = tds.faces_begin(); fit != tds.faces_end(); ++fit) {
CGAL::internal::resize(its.faces[i], 3); CGAL::internal::resize(its.faces[i], 3);

2
Convex_hull_3/include/CGAL/convex_hull_3.h
View File

@ -1111,8 +1111,6 @@ void convex_hull_3(InputIterator first, InputIterator beyond,
typename std::enable_if<boost::has_range_iterator<PointRange>::value>::type* = 0, typename std::enable_if<boost::has_range_iterator<PointRange>::value>::type* = 0,
typename std::enable_if<boost::has_range_iterator<TriangleRange>::value>::type* = 0) typename std::enable_if<boost::has_range_iterator<TriangleRange>::value>::type* = 0)
{ {
typedef typename std::iterator_traits<InputIterator>::value_type Point_3;
Convex_hull_3::internal::Indexed_triangle_set<PointRange, TriangleRange> its(vertices,faces); Convex_hull_3::internal::Indexed_triangle_set<PointRange, TriangleRange> its(vertices,faces);
convex_hull_3(first, beyond, its, traits); convex_hull_3(first, beyond, its, traits);
} }