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

Merge branch 'Surface_modeling-new_package-GF' of ssh://scm.cgal.org/var/git/cgal into Surface_modeling-new_package-GF

This commit is contained in:
iyaz 2013-03-11 12:10:47 +02:00
parent ca54dfe303 571ea185b4
commit 71c652538f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -321,7 +321,7 @@ public:
void erase_roi(vertex_descriptor vd)
{
need_preprocess = true;
std::vector<vertex_descriptor>::iterator it = std::find(ros.begin(), ros.end(), vd);
typename std::vector<vertex_descriptor>::iterator it = std::find(ros.begin(), ros.end(), vd);
if(vd != ros.end())
{
ros.erase(it);
@ -463,7 +463,7 @@ public:
*/
void deform(unsigned int iterations, double tolerance)
{
CGAL_precondition(!need_preprocess, "preprocess() need to be called before deforming!");
CGAL_precondition(!need_preprocess || !"preprocess() need to be called before deforming!");
// Note: no energy based termination occurs at first iteration
// because comparing energy of original model (before deformation) and deformed model (deformed_1_iteration)

2
Surface_modeling/include/CGAL/internal/Surface_modeling/Spokes_and_rims_iterator.h
View File

@ -25,7 +25,7 @@ public:
typedef typename boost::graph_traits<Polyhedron>::edge_descriptor edge_descriptor;
Spokes_and_rims_iterator(out_edge_iterator edge_iterator, Polyhedron& polyhedron)
: iterator(edge_iterator), descriptor(*edge_iterator), polyhedron(polyhedron), is_current_rim(false)
: is_current_rim(false), iterator(edge_iterator), descriptor(*edge_iterator), polyhedron(polyhedron)
{ }
/// descriptor will be assigned to next valid edge, note that iterator might not change