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

fix order initialization warnings

This commit is contained in:
Sébastien Loriot 2013-04-03 09:03:46 +02:00
parent 52de2d5d08
commit f0423d555f
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Polyhedron/demo/Polyhedron/Polyhedron_demo_edit_polyhedron_plugin.cpp
View File

@ -27,7 +27,7 @@ class Polyhedron_demo_edit_polyhedron_plugin :
public:
Polyhedron_demo_edit_polyhedron_plugin()
: Polyhedron_demo_plugin_helper(), dock_widget(NULL), ui_widget(NULL)
: Polyhedron_demo_plugin_helper(), ui_widget(NULL), dock_widget(NULL)
{ }
~Polyhedron_demo_edit_polyhedron_plugin()
{ }

4
Polyhedron/demo/Polyhedron/Scene_edit_polyhedron_item.cpp
View File

@ -24,8 +24,8 @@
#include "ui_Deform_mesh.h"
Scene_edit_polyhedron_item::Scene_edit_polyhedron_item(Scene_polyhedron_item* poly_item, Ui::DeformMesh* ui_widget)
: poly_item(poly_item), deform_mesh(*(poly_item->polyhedron()), Vertex_index_map(), Edge_index_map())
, ui_widget(ui_widget), frame(new qglviewer::ManipulatedFrame()), quadric(gluNewQuadric())
: ui_widget(ui_widget), poly_item(poly_item), frame(new qglviewer::ManipulatedFrame()),
deform_mesh(*(poly_item->polyhedron()), Vertex_index_map(), Edge_index_map()), quadric(gluNewQuadric())
{
// it is not good to rely on id() for reaching original positions
// if usage of vertex index map is changed in Deform_mesh, we need to change this part to use map instead of vector

7
Surface_modeling/include/CGAL/Deform_mesh.h
View File

@ -191,11 +191,12 @@ public:
double tolerance = 1e-4,
Weight_calculator weight_calculator = Weight_calculator())
: polyhedron(polyhedron), vertex_index_map(vertex_index_map), edge_index_map(edge_index_map),
iterations(iterations), tolerance(tolerance), weight_calculator(weight_calculator),
need_preprocess(true), last_preprocess_successful(false),
ros_id_map(std::vector<std::size_t>(boost::num_vertices(polyhedron), -1)),
is_roi_map(std::vector<bool>(boost::num_vertices(polyhedron), false)),
is_hdl_map(std::vector<bool>(boost::num_vertices(polyhedron), false)),
ros_id_map(std::vector<std::size_t>(boost::num_vertices(polyhedron), -1))
iterations(iterations), tolerance(tolerance),
need_preprocess(true), last_preprocess_successful(false),
weight_calculator(weight_calculator)
{
// assign id to each vertex and edge
vertex_iterator vb, ve;