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

fix conversion warnings

This commit is contained in:
Sébastien Loriot 2019-04-10 14:28:35 +02:00
parent 9c39f2260f
commit bd955e57d3
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BGL/doc/BGL/Concepts/MutableFaceGraph.h
View File

@ -47,4 +47,4 @@ Indicates the expected size of vertices (`nv`), edges (`ed`) and faces (`nf`).
*/ */
template <typename MutableFaceGraph> template <typename MutableFaceGraph>
void void
reserve(MutableFaceGraph& g, boost::graph_traits<MutableFaceGraph>::vertices_size_type nv, boost::graph_traits<MutableFaceGraph>::vertices_size_type ne, boost::graph_traits<MutableFaceGraph>::vertices_size_type nf); reserve(MutableFaceGraph& g, boost::graph_traits<MutableFaceGraph>::vertices_size_type nv, boost::graph_traits<MutableFaceGraph>::edges_size_type ne, boost::graph_traits<MutableFaceGraph>::faces_size_type nf);

5
BGL/include/CGAL/boost/graph/copy_face_graph.h
View File

@ -71,6 +71,10 @@ void copy_face_graph_impl(const SourceMesh& sm, TargetMesh& tm,
tm_face_descriptor tm_null_face = boost::graph_traits<TargetMesh>::null_face(); tm_face_descriptor tm_null_face = boost::graph_traits<TargetMesh>::null_face();
reserve(tm, static_cast<typename boost::graph_traits<TargetMesh>::vertices_size_type>(vertices(sm).size()),
static_cast<typename boost::graph_traits<TargetMesh>::edges_size_type>(edges(sm).size()),
static_cast<typename boost::graph_traits<TargetMesh>::faces_size_type>(faces(sm).size()) );
//insert halfedges and create each vertex when encountering its halfedge //insert halfedges and create each vertex when encountering its halfedge
BOOST_FOREACH(sm_edge_descriptor sm_e, edges(sm)) BOOST_FOREACH(sm_edge_descriptor sm_e, edges(sm))
{ {
@ -373,7 +377,6 @@ void copy_face_graph(const SourceMesh& sm, TargetMesh& tm,
V2V v2v, H2H h2h, F2F f2f, V2V v2v, H2H h2h, F2F f2f,
Src_vpm sm_vpm, Tgt_vpm tm_vpm ) Src_vpm sm_vpm, Tgt_vpm tm_vpm )
{ {
reserve(tm, vertices(sm).size(), edges(sm).size(), faces(sm).size());
internal::copy_face_graph(sm, tm, internal::copy_face_graph(sm, tm,
CGAL::graph_has_property<SourceMesh,boost::halfedge_index_t>(), CGAL::graph_has_property<SourceMesh,boost::halfedge_index_t>(),
v2v, h2h, f2f, v2v, h2h, f2f,

5
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/polygon_soup_to_polygon_mesh.h
View File

@ -72,7 +72,10 @@ public:
void operator()(PM& pmesh, const bool insert_isolated_vertices = true) void operator()(PM& pmesh, const bool insert_isolated_vertices = true)
{ {
reserve(pmesh, _points.size(), 2*_polygons.size(), _polygons.size()); reserve(pmesh, static_cast<typename boost::graph_traits<PM>::vertices_size_type>(_points.size()),
static_cast<typename boost::graph_traits<PM>::edges_size_type>(2*_polygons.size()),
static_cast<typename boost::graph_traits<PM>::faces_size_type>(_polygons.size()) );
Vpmap vpmap = get(CGAL::vertex_point, pmesh); Vpmap vpmap = get(CGAL::vertex_point, pmesh);
boost::dynamic_bitset<> not_isolated; boost::dynamic_bitset<> not_isolated;