From 878c545785e45b40bb2043e8a2df6898b484fbcd Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 3 Mar 2003 11:04:15 +0000 Subject: [PATCH] Fixes for the new osg::Image::setImage() parameter, from Ulrich Hertlein. --- src/osgPlugins/pfb/ConvertFromPerformer.cpp | 3 ++- src/osgPlugins/pfb/ReaderWriterPFB.cpp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/osgPlugins/pfb/ConvertFromPerformer.cpp b/src/osgPlugins/pfb/ConvertFromPerformer.cpp index 64d095f9c..c9e5b6db7 100644 --- a/src/osgPlugins/pfb/ConvertFromPerformer.cpp +++ b/src/osgPlugins/pfb/ConvertFromPerformer.cpp @@ -1254,7 +1254,8 @@ osg::Texture2D* ConvertFromPerformer::visitTexture(osg::StateSet* osgStateSet,pf image->setImage(s,t,r, internalFormat, pixelFormat, - dataType,data); + dataType,data, + osg::Image::USE_MALLOC_FREE); osgTexture->setImage(image); diff --git a/src/osgPlugins/pfb/ReaderWriterPFB.cpp b/src/osgPlugins/pfb/ReaderWriterPFB.cpp index f5717d8fc..7a6919b1f 100644 --- a/src/osgPlugins/pfb/ReaderWriterPFB.cpp +++ b/src/osgPlugins/pfb/ReaderWriterPFB.cpp @@ -132,8 +132,8 @@ class ReaderWriterPFB : public osgDB::ReaderWriter image->setImage(s,t,r, internalFormat, pixelFormat, - dataType, - data); + dataType,data, + osg::Image::USE_MALLOC_FREE); // free texture & image data tex->unrefDelete();