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

Merge pull request #7447 from MaelRL/CGAL-Fix_warnings-GF 

Fix some warnings
This commit is contained in:
Laurent Rineau 2023-06-05 15:10:29 +02:00
parent 5b2d4aab03 0acb4e8fce
commit 0e76c32749
5 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/refine_impl.h
View File

@ -42,6 +42,8 @@ template<class PolygonMesh, class VertexPointMap>
class Refine_Polyhedron_3 { class Refine_Polyhedron_3 {
//// typedefs //// typedefs
typedef typename boost::property_traits<VertexPointMap>::value_type Point_3; typedef typename boost::property_traits<VertexPointMap>::value_type Point_3;
typedef typename boost::property_traits<VertexPointMap>::reference Point_3_ref;
typedef typename boost::graph_traits<PolygonMesh>::vertex_descriptor vertex_descriptor; typedef typename boost::graph_traits<PolygonMesh>::vertex_descriptor vertex_descriptor;
typedef typename boost::graph_traits<PolygonMesh>::halfedge_descriptor halfedge_descriptor; typedef typename boost::graph_traits<PolygonMesh>::halfedge_descriptor halfedge_descriptor;
typedef typename boost::graph_traits<PolygonMesh>::face_descriptor face_descriptor; typedef typename boost::graph_traits<PolygonMesh>::face_descriptor face_descriptor;
@ -88,7 +90,6 @@ private:
bool relax(halfedge_descriptor h) bool relax(halfedge_descriptor h)
{ {
#ifdef CGAL_PMP_REFINE_DEBUG_PP #ifdef CGAL_PMP_REFINE_DEBUG_PP
typedef typename boost::property_traits<VertexPointMap>::reference Point_3_ref;
Point_3_ref p = get(vpmap, source(h,pmesh)); Point_3_ref p = get(vpmap, source(h,pmesh));
Point_3_ref q = get(vpmap, target(h,pmesh)); Point_3_ref q = get(vpmap, target(h,pmesh));
Point_3_ref r = get(vpmap, target(next(h,pmesh),pmesh)); Point_3_ref r = get(vpmap, target(next(h,pmesh),pmesh));
@ -227,7 +228,7 @@ private:
const std::set<face_descriptor>& interior_map, const std::set<face_descriptor>& interior_map,
bool accept_internal_facets) bool accept_internal_facets)
{ {
const Point_3& vp = get(vpmap, vh); const Point_3_ref vp = get(vpmap, vh);
Halfedge_around_target_circulator<PolygonMesh> circ(halfedge(vh,pmesh),pmesh), done(circ); Halfedge_around_target_circulator<PolygonMesh> circ(halfedge(vh,pmesh),pmesh), done(circ);
int deg = 0; int deg = 0;
double sum = 0; double sum = 0;
@ -239,7 +240,7 @@ private:
{ continue; } // which means current edge is an interior edge and should not be included in scale attribute calculation { continue; } // which means current edge is an interior edge and should not be included in scale attribute calculation
} }
const Point_3& vq = get(vpmap, target(opposite(*circ,pmesh),pmesh)); const Point_3_ref vq = get(vpmap, target(opposite(*circ,pmesh),pmesh));
sum += to_double(CGAL::approximate_sqrt(CGAL::squared_distance(vp, vq))); sum += to_double(CGAL::approximate_sqrt(CGAL::squared_distance(vp, vq)));
++deg; ++deg;
} while(++circ != done); } while(++circ != done);

4
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/locate.h
View File

@ -1666,7 +1666,7 @@ locate_with_AABB_tree(const typename internal::Location_traits<TriangleMesh, Nam
typedef typename GetVertexPointMap<TriangleMesh, NamedParameters>::const_type VertexPointMap; typedef typename GetVertexPointMap<TriangleMesh, NamedParameters>::const_type VertexPointMap;
typedef internal::Point_to_Point_3_VPM<TriangleMesh, VertexPointMap> WrappedVPM; typedef internal::Point_to_Point_3_VPM<TriangleMesh, VertexPointMap> WrappedVPM;
const Point_3& p3 = P_to_P3()(p); const Point_3 p3 = P_to_P3()(p);
typename AABB_tree<AABB_traits>::Point_and_primitive_id result = tree.closest_point_and_primitive(p3); typename AABB_tree<AABB_traits>::Point_and_primitive_id result = tree.closest_point_and_primitive(p3);
typedef typename GetGeomTraits<TriangleMesh, NamedParameters>::type Geom_traits; typedef typename GetGeomTraits<TriangleMesh, NamedParameters>::type Geom_traits;
@ -1763,7 +1763,7 @@ locate(const typename internal::Location_traits<TriangleMesh, NamedParameters>::
AABB_tree<AABB_face_graph_traits> tree; AABB_tree<AABB_face_graph_traits> tree;
build_AABB_tree(tm, tree, parameters::vertex_point_map(wrapped_vpm)); build_AABB_tree(tm, tree, parameters::vertex_point_map(wrapped_vpm));
const Point_3& p3 = P_to_P3()(p); const Point_3 p3 = P_to_P3()(p);
return locate_with_AABB_tree(p3, tree, tm, parameters::vertex_point_map(wrapped_vpm)); return locate_with_AABB_tree(p3, tree, tm, parameters::vertex_point_map(wrapped_vpm));
} }

28
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/measure.h
View File

@ -857,34 +857,38 @@ centroid(const TriangleMesh& tmesh,
Vpm vpm = choose_parameter(get_parameter(np, internal_np::vertex_point), Vpm vpm = choose_parameter(get_parameter(np, internal_np::vertex_point),
get_const_property_map(CGAL::vertex_point, tmesh)); get_const_property_map(CGAL::vertex_point, tmesh));
typedef typename GetGeomTraits<TriangleMesh, CGAL_NP_CLASS>::type Kernel; typedef typename GetGeomTraits<TriangleMesh, CGAL_NP_CLASS>::type Kernel;
typedef typename Kernel::Point_3 Point_3; Kernel k = choose_parameter<Kernel>(get_parameter(np, internal_np::geom_traits));
typedef typename Kernel::FT FT;
typedef typename boost::property_traits<Vpm>::reference Point_3_ref;
typedef typename Kernel::Vector_3 Vector_3; typedef typename Kernel::Vector_3 Vector_3;
typedef typename Kernel::Construct_translated_point_3 Construct_translated_point_3; typedef typename Kernel::Construct_translated_point_3 Construct_translated_point_3;
typedef typename Kernel::Construct_vector_3 Construct_vector_3; typedef typename Kernel::Construct_vector_3 Construct_vector_3;
typedef typename Kernel::Construct_normal_3 Construct_normal_3; typedef typename Kernel::Construct_normal_3 Construct_normal_3;
typedef typename Kernel::Compute_scalar_product_3 Scalar_product; typedef typename Kernel::Compute_scalar_product_3 Scalar_product;
typedef typename Kernel::Construct_scaled_vector_3 Scale; typedef typename Kernel::Construct_scaled_vector_3 Scale;
typedef typename Kernel::Construct_sum_of_vectors_3 Sum; typedef typename Kernel::Construct_sum_of_vectors_3 Sum;
typedef typename boost::graph_traits<TriangleMesh>::face_descriptor face_descriptor; typedef typename boost::graph_traits<TriangleMesh>::face_descriptor face_descriptor;
typedef typename Kernel::FT FT;
FT volume = 0; FT volume = 0;
Vector_3 centroid(NULL_VECTOR); Vector_3 centroid(NULL_VECTOR);
Construct_translated_point_3 point; Construct_translated_point_3 point = k.construct_translated_point_3_object();
Construct_vector_3 vector; Construct_vector_3 vector = k.construct_vector_3_object();
Construct_normal_3 normal; Construct_normal_3 normal = k.construct_normal_3_object();
Scalar_product scalar_product; Scalar_product scalar_product = k.compute_scalar_product_3_object();
Scale scale; Scale scale = k.construct_scaled_vector_3_object();
Sum sum; Sum sum = k.construct_sum_of_vectors_3_object();
for(face_descriptor fd : faces(tmesh)) for(face_descriptor fd : faces(tmesh))
{ {
const Point_3& p = get(vpm, target(halfedge(fd, tmesh), tmesh)); const Point_3_ref p = get(vpm, target(halfedge(fd, tmesh), tmesh));
const Point_3& q = get(vpm, target(next(halfedge(fd, tmesh), tmesh), tmesh)); const Point_3_ref q = get(vpm, target(next(halfedge(fd, tmesh), tmesh), tmesh));
const Point_3& r = get(vpm, target(prev(halfedge(fd, tmesh), tmesh), tmesh)); const Point_3_ref r = get(vpm, target(prev(halfedge(fd, tmesh), tmesh), tmesh));
Vector_3 vp = vector(ORIGIN, p), Vector_3 vp = vector(ORIGIN, p),
vq = vector(ORIGIN, q), vq = vector(ORIGIN, q),
vr = vector(ORIGIN, r); vr = vector(ORIGIN, r);

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair_degeneracies.h
View File

@ -483,7 +483,7 @@ struct Filter_wrapper_for_cap_needle_removal<TriangleMesh, VPM, Traits, std::fun
{ {
std::vector<face_descriptor> link_faces; std::vector<face_descriptor> link_faces;
collect_link_faces(e, link_faces); collect_link_faces(e, link_faces);
Functor f = std::move(m_make_envelope(link_faces)); Functor f = m_make_envelope(link_faces);
Base base(m_tm, m_vpm, f); Base base(m_tm, m_vpm, f);
return base.collapse(e); return base.collapse(e);
} }

2
Surface_mesh_simplification/doc/Surface_mesh_simplification/Surface_mesh_simplification.txt
View File

@ -306,7 +306,7 @@ int r = edge_collapse(surface_mesh, stop_predicate,
.edge_is_border_map(ebmap) .edge_is_border_map(ebmap)
.get_cost(cf) .get_cost(cf)
.get_placement(pf) .get_placement(pf)
.filter(filter .filter(filter)
.visitor(vis)); .visitor(vis));
\endcode \endcode