FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed std::min definition to osg::minimum to avoid STOOOPID MS conficts.

Browse Source
This commit is contained in:
Robert Osfield
2004-07-09 15:26:48 +00:00
parent c6ac4926bf
commit 87c954a4e1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/osgvolume/osgvolume.cpp
View File

@@ -338,9 +338,9 @@ osg::Image* createTexture3D(ImageList& imageList, ProcessRow& processRow, unsign
pixelFormat==GL_RGBA)
{
int num_r = std::min(image->r(), (image_3d->r() - curr_dest_r));
int num_t = std::min(image->t(), image_3d->t());
int num_s = std::min(image->s(), image_3d->s());
int num_r = osg::minimum(image->r(), (image_3d->r() - curr_dest_r));
int num_t = osg::minimum(image->t(), image_3d->t());
int num_s = osg::minimum(image->s(), image_3d->s());
for(int r=0;r<num_r;++r, ++curr_dest_r)
{