From cd438cf489f26b4840ed857fd109d7194166685a Mon Sep 17 00:00:00 2001 From: ganovelli Date: Fri, 27 Oct 2006 13:26:49 +0000 Subject: [PATCH] changed &*vert.end() to !vert.empty() -> &vert.back() to comply vs2005 compiler --- vcg/complex/trimesh/refine.h | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/vcg/complex/trimesh/refine.h b/vcg/complex/trimesh/refine.h index a69f7d78..9168a9be 100644 --- a/vcg/complex/trimesh/refine.h +++ b/vcg/complex/trimesh/refine.h @@ -24,6 +24,9 @@ History $Log: not supported by cvs2svn $ +Revision 1.12 2006/06/18 20:42:01 cignoni +removed wrong fn setting + Revision 1.11 2006/06/06 14:35:28 zifnab1974 Changes for compilation on linux AMD64. Some remarks: Linux filenames are case-sensitive. _fileno and _filelength do not exist on linux @@ -469,11 +472,13 @@ bool RefineE(MESH_TYPE &m, MIDPOINT mid, EDGEPRED ep,bool RefineSelected=false, // m.fn= m.face.size(); - assert(lastf==m.face.end()); for(fi=m.face.begin();fi!=m.face.end();++fi) if(!(*fi).IsD()){ - assert((*fi).V(0)>=&*m.vert.begin() && (*fi).V(0)<&*m.vert.end() ); - assert((*fi).V(1)>=&*m.vert.begin() && (*fi).V(1)<&*m.vert.end() ); - assert((*fi).V(2)>=&*m.vert.begin() && (*fi).V(2)<&*m.vert.end() ); - } + assert(lastf==m.face.end()); + assert(!m.vert.empty()); + for(fi=m.face.begin();fi!=m.face.end();++fi) if(!(*fi).IsD()){ + assert((*fi).V(0)>=&*m.vert.begin() && (*fi).V(0)<=&m.vert.back() ); + assert((*fi).V(1)>=&*m.vert.begin() && (*fi).V(1)<=&m.vert.back() ); + assert((*fi).V(2)>=&*m.vert.begin() && (*fi).V(2)<=&m.vert.back() ); + } vcg::tri::UpdateTopology::FaceFace(m); return true; }