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

Compiles fixes for VS.6.0

Browse Source
This commit is contained in:
Robert Osfield
2004-07-09 15:42:07 +00:00
parent 7ef8b14bf0
commit a7490a2ea2
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
examples/osgvolume/osgvolume.cpp
View File

@@ -264,7 +264,7 @@ osg::Image* createTexture3D(ImageList& imageList, ProcessRow& processRow, unsign
unsigned int max_components = 0;
int total_r = 0;
ImageList::iterator itr;
for(ImageList::iterator itr=imageList.begin();
for(itr=imageList.begin();
itr!=imageList.end();
++itr)
{
@@ -276,9 +276,9 @@ osg::Image* createTexture3D(ImageList& imageList, ProcessRow& processRow, unsign
pixelFormat==GL_RGB ||
pixelFormat==GL_RGBA)
{
max_s = std::max(image->s(), max_s);
max_t = std::max(image->t(), max_t);
max_components = std::max(osg::Image::computeNumComponents(pixelFormat), max_components);
max_s = osg::maximum(image->s(), max_s);
max_t = osg::maximum(image->t(), max_t);
max_components = osg::maximum(osg::Image::computeNumComponents(pixelFormat), max_components);
total_r += image->r();
}
else
@@ -325,7 +325,7 @@ osg::Image* createTexture3D(ImageList& imageList, ProcessRow& processRow, unsign
int curr_dest_r = 0;
// copy across the values from the source imager into the image_3d.
for(ImageList::iterator itr=imageList.begin();
for(itr=imageList.begin();
itr!=imageList.end();
++itr)
{