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

Fix memory leaks

Browse Source
This commit is contained in:
capostrophic 2019-08-17 15:11:49 +03:00
parent cbac09902d
commit a3b507bb01
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgPlugins/dds/ReaderWriterDDS.cpp
View File

@ -991,12 +991,11 @@ osg::Image* ReadDDSFile(std::istream& _istream, bool flipDDSRead)
OSG_INFO<<"ReadDDS, dataType = 0x"<<std::hex<<dataType<<std::endl;
unsigned char* palette = new unsigned char [1024];
unsigned char palette [1024];
if (ddsd.ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED8)
{
if (!_istream.read((char*)palette, 1024))
{
delete [] palette;
OSG_WARN << "ReadDDSFile warning: couldn't read palette" << std::endl;
return NULL;
}
@ -1039,6 +1038,7 @@ osg::Image* ReadDDSFile(std::istream& _istream, bool flipDDSRead)
convertedData[i * 4 + 2] = palette[imageData[i] * 4 + 2];
convertedData[i * 4 + 3] = palette[imageData[i] * 4 + 3];
}
delete [] imageData;
for (unsigned int i = 0; i < mipmap_offsets.size(); i++)
mipmap_offsets[i] *= 4;
internalFormat = GL_RGBA;