Thanks Urlich, I've merged and checked in your changes. I chose not to merge the change of bool to const bool as this change doesn't seem relevant or particularly justified. Cheeers, Robert.
On Thu, Aug 26, 2010 at 4:28 AM, Ulrich Hertlein <[email protected]> wrote: > Hi Robert, > > not sure how severe this is but I believe there's a bug in > Texture.cpp:applyTexImage2D_subload: > > <code> > unsigned char* data = = (unsigned char*)image->data(); > if (needImageRescale) { > // allocates rescale buffer > data = new unsigned char[newTotalSize]; > > // calls gluScaleImage into the data buffer > } > > const unsigned char* dataPtr = image->data(); > // subloads 'dataPtr' > > // deletes 'data' > </code> > > In effect, the scaled data would never be used. > > I've also replaced bits of duplicate code in > Texture1D/2D/2DArray/3D/Cubemap/Rectangle > that checks if the texture image can/should be unref'd with common > functionality in > Texture.cpp. > > Attached is a diff and the modified files. > > Cheers, > /ulrich > > _______________________________________________ > osg-submissions mailing list > [email protected] > http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org > > _______________________________________________ osg-submissions mailing list [email protected] http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
