Fixes for the new osg::Image::setImage() parameter, from Ulrich Hertlein.

This commit is contained in:
Robert Osfield
2003-03-03 11:04:15 +00:00
parent 5b7718ea45
commit 878c545785
2 changed files with 4 additions and 3 deletions

View File

@@ -1254,7 +1254,8 @@ osg::Texture2D* ConvertFromPerformer::visitTexture(osg::StateSet* osgStateSet,pf
image->setImage(s,t,r, image->setImage(s,t,r,
internalFormat, internalFormat,
pixelFormat, pixelFormat,
dataType,data); dataType,data,
osg::Image::USE_MALLOC_FREE);
osgTexture->setImage(image); osgTexture->setImage(image);

View File

@@ -132,8 +132,8 @@ class ReaderWriterPFB : public osgDB::ReaderWriter
image->setImage(s,t,r, image->setImage(s,t,r,
internalFormat, internalFormat,
pixelFormat, pixelFormat,
dataType, dataType,data,
data); osg::Image::USE_MALLOC_FREE);
// free texture & image data // free texture & image data
tex->unrefDelete(); tex->unrefDelete();