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

Added std:: namespace for max() and min().

This commit is contained in:
Marco Di Benedetto 2005-11-30 16:01:25 +00:00
parent cc0e745c09
commit 9cb3bc6dbb
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vcg/space/index/grid_static_ptr.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.33 2005/11/30 10:32:44 m_di_benedetto
Added (int) cast to std::distance to prevent compiler warning message.
Revision 1.32 2005/11/10 15:44:17 cignoni Revision 1.32 2005/11/10 15:44:17 cignoni
Added casts to remove warnings Added casts to remove warnings
@ -145,6 +148,7 @@ Initial commit
#include <vcg/space/index/grid_util.h> #include <vcg/space/index/grid_util.h>
#include <vcg/space/index/grid_closest.h> #include <vcg/space/index/grid_closest.h>
#include <vcg/simplex/face/distance.h> #include <vcg/simplex/face/distance.h>
namespace vcg { namespace vcg {
/** Static Uniform Grid /** Static Uniform Grid
@ -263,8 +267,8 @@ namespace vcg {
int i,j,x,y; int i,j,x,y;
x = p[axis0]; x = p[axis0];
y = p[axis1]; y = p[axis1];
for(i = max(x-1,0); i <= min( x,siz[axis0]-1);++i) for(i = std::max(x-1,0); i <= std::min( x,siz[axis0]-1);++i)
for(j = max(y-1,0); j <= min( y,siz[axis1]-1);++j){ for(j = std::max(y-1,0); j <= std::min( y,siz[axis1]-1);++j){
p[axis0]=i; p[axis0]=i;
p[axis1]=j; p[axis1]=j;
cl.push_back(Grid(p[0]+siz[0]*(p[1]+siz[1]*p[2]))); cl.push_back(Grid(p[0]+siz[0]*(p[1]+siz[1]*p[2])));