From 87c954a4e16962598c5c5b93b8f34baa1f9135dd Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 9 Jul 2004 15:26:48 +0000 Subject: [PATCH] Changed std::min definition to osg::minimum to avoid STOOOPID MS conficts. --- examples/osgvolume/osgvolume.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/osgvolume/osgvolume.cpp b/examples/osgvolume/osgvolume.cpp index f36be686f..12a97b0bc 100644 --- a/examples/osgvolume/osgvolume.cpp +++ b/examples/osgvolume/osgvolume.cpp @@ -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