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

removed some old surviving math:Max and changed to std::max

This commit is contained in:
Paolo Cignoni 2010-10-15 09:13:58 +00:00
parent ac9f0d1452
commit 2e9d5c0936
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vcg/space/deprecated_point3.h
View File

@ -95,6 +95,7 @@ Edited doxygen comments
#define __VCGLIB_POINT3 #define __VCGLIB_POINT3
#include <assert.h> #include <assert.h>
#include <algorithm>
#include <vcg/math/base.h> #include <vcg/math/base.h>
namespace vcg { namespace vcg {
@ -556,7 +557,7 @@ inline Point3<SCALARTYPE> Abs(const Point3<SCALARTYPE> & p) {
// probably a more uniform naming should be defined... // probably a more uniform naming should be defined...
template <class SCALARTYPE> template <class SCALARTYPE>
inline Point3<SCALARTYPE> LowClampToZero(const Point3<SCALARTYPE> & p) { inline Point3<SCALARTYPE> LowClampToZero(const Point3<SCALARTYPE> & p) {
return (Point3<SCALARTYPE>(math::Max(p[0], (SCALARTYPE)0), math::Max(p[1], (SCALARTYPE)0), math::Max(p[2], (SCALARTYPE)0))); return (Point3<SCALARTYPE>(std::max(p[0], (SCALARTYPE)0), std::max(p[1], (SCALARTYPE)0), std::max(p[2], (SCALARTYPE)0)));
} }
typedef Point3<short> Point3s; typedef Point3<short> Point3s;