manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Substituted std::max with vcg::math::Max

This commit is contained in:
Paolo Cignoni 2007-03-16 10:51:46 +00:00
parent e1f61a9f6f
commit 8f6e26f281
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vcg/complex/local_optimization/tri_edge_flip.h
View File

@ -142,8 +142,8 @@ namespace vcg
bool IsUpToDate() bool IsUpToDate()
{ {
int MostRecentVertexMark = _pos.V(0)->IMark(); int MostRecentVertexMark = _pos.V(0)->IMark();
MostRecentVertexMark = std::max(MostRecentVertexMark, _pos.V(1)->IMark()); MostRecentVertexMark = vcg::math::Max<ScalarType>(MostRecentVertexMark, _pos.V(1)->IMark());
MostRecentVertexMark = std::max(MostRecentVertexMark, _pos.V(2)->IMark()); MostRecentVertexMark = vcg::math::Max<ScalarType>(MostRecentVertexMark, _pos.V(2)->IMark());
return ( _localMark >= MostRecentVertexMark ); return ( _localMark >= MostRecentVertexMark );
}; };
@ -195,7 +195,7 @@ namespace vcg
// higher the quality better the triangle. // higher the quality better the triangle.
// swaps that improve the worst quality more are performed before // swaps that improve the worst quality more are performed before
// (e.g. they have an higher priority) // (e.g. they have an higher priority)
_priority = std::min(QaAfter,QbAfter) - std::min(Qa,Qb) ; _priority = vcg::math::Max<ScalarType>(QaAfter,QbAfter) - vcg::math::Min<ScalarType>(Qa,Qb) ;
_priority *=-1; _priority *=-1;
return _priority; return _priority;
}; };