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

fix initializer list order warning

This commit is contained in:
Lingjie Zhu 2017-08-23 00:53:12 +08:00
parent b749a57a40
commit dd46cf820f
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Surface_mesh_approximation/include/CGAL/VSA_approximation.h
View File

@ -141,6 +141,12 @@ class VSA_approximation {
}; };
// member variables // member variables
// The triangle mesh.
const TriangleMesh *m_pmesh;
// The error metric.
const ErrorMetric *fit_error;
// The proxy fitting functor.
const ProxyFitting *proxy_fitting;
Construct_vector_3 vector_functor; Construct_vector_3 vector_functor;
Construct_scaled_vector_3 scale_functor; Construct_scaled_vector_3 scale_functor;
@ -155,13 +161,6 @@ class VSA_approximation {
std::map<vertex_descriptor, int> vertex_int_map; std::map<vertex_descriptor, int> vertex_int_map;
VertexAnchorMap vanchor_map; VertexAnchorMap vanchor_map;
// The triangle mesh.
const TriangleMesh *m_pmesh;
// The error metric.
const ErrorMetric *fit_error;
// The proxy fitting functor.
const ProxyFitting *proxy_fitting;
// Proxies. // Proxies.
std::vector<Proxy> proxies; std::vector<Proxy> proxies;
std::vector<Plane_3> px_planes; std::vector<Plane_3> px_planes;
@ -187,9 +186,9 @@ public:
* Default constructor. * Default constructor.
*/ */
VSA_approximation() : VSA_approximation() :
m_pmesh(NULL),
fit_error(NULL), fit_error(NULL),
proxy_fitting(NULL), proxy_fitting(NULL),
m_pmesh(NULL),
seg_pmap(internal_fidx_map), seg_pmap(internal_fidx_map),
vanchor_map(vertex_int_map) { vanchor_map(vertex_int_map) {
GeomTraits traits; GeomTraits traits;
@ -206,9 +205,9 @@ public:
*/ */
VSA_approximation(const ErrorMetric &_fit_error, VSA_approximation(const ErrorMetric &_fit_error,
const ProxyFitting &_proxy_fitting) : const ProxyFitting &_proxy_fitting) :
m_pmesh(NULL),
fit_error(&_fit_error), fit_error(&_fit_error),
proxy_fitting(&_proxy_fitting), proxy_fitting(&_proxy_fitting),
m_pmesh(NULL),
seg_pmap(internal_fidx_map), seg_pmap(internal_fidx_map),
vanchor_map(vertex_int_map) { vanchor_map(vertex_int_map) {
GeomTraits traits; GeomTraits traits;
@ -1211,7 +1210,6 @@ private:
typedef typename boost::property_map<SubGraph, boost::vertex_index2_t>::type VertexIndex2Map; typedef typename boost::property_map<SubGraph, boost::vertex_index2_t>::type VertexIndex2Map;
typedef typename boost::property_map<SubGraph, boost::edge_weight_t>::type EdgeWeightMap; typedef typename boost::property_map<SubGraph, boost::edge_weight_t>::type EdgeWeightMap;
typedef typename SubGraph::vertex_descriptor sg_vertex_descriptor; typedef typename SubGraph::vertex_descriptor sg_vertex_descriptor;
typedef typename SubGraph::edge_descriptor sg_edge_descriptor;
typedef std::vector<sg_vertex_descriptor> VertexVector; typedef std::vector<sg_vertex_descriptor> VertexVector;
typedef std::map<vertex_descriptor, sg_vertex_descriptor> VertexMap; typedef std::map<vertex_descriptor, sg_vertex_descriptor> VertexMap;

4
Surface_mesh_approximation/include/CGAL/vsa_mesh_approximation_metrics.h
View File

@ -392,10 +392,10 @@ public:
} }
private: private:
const TriangleMesh *mesh;
std::map<face_descriptor, FT> facet_areas; std::map<face_descriptor, FT> facet_areas;
const FacetAreaMap area_pmap; const FacetAreaMap area_pmap;
const VertexPointMap point_pmap; const VertexPointMap point_pmap;
const TriangleMesh *mesh;
}; };
// specialization // specialization
@ -451,10 +451,10 @@ public:
} }
private: private:
const TriangleMesh *mesh;
std::map<face_descriptor, FT> facet_areas; std::map<face_descriptor, FT> facet_areas;
const FacetAreaMap area_pmap; const FacetAreaMap area_pmap;
const VertexPointMap point_pmap; const VertexPointMap point_pmap;
const TriangleMesh *mesh;
}; };
/** /**