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

use memcpy instead of union

Browse Source
This commit is contained in:
Julien Valentin 2019-08-18 17:56:51 +02:00
parent a9546da368
commit 5516f86f9e
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -990,16 +990,12 @@ osg::Image* ReadDDSFile(std::istream& _istream, bool flipDDSRead)
} }
OSG_INFO<<"ReadDDS, dataType = 0x"<<std::hex<<dataType<<std::endl; OSG_INFO<<"ReadDDS, dataType = 0x"<<std::hex<<dataType<<std::endl;
typedef union {
float f32;
unsigned char c8[4];
} PaletteWord;
PaletteWord palette [256]; unsigned char palette [1024];
if (ddsd.ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED8) if (ddsd.ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED8)
{ {
if (!_istream.read((char*)&palette->c8, 1024)) if (!_istream.read((char*)palette, 1024))
{ {
OSG_WARN << "ReadDDSFile warning: couldn't read palette" << std::endl; OSG_WARN << "ReadDDSFile warning: couldn't read palette" << std::endl;
return NULL; return NULL;
@ -1035,16 +1031,19 @@ osg::Image* ReadDDSFile(std::istream& _istream, bool flipDDSRead)
if (ddsd.ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED8) if (ddsd.ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED8)
{ {
// Now we need to substitute the indexed image data with full RGBA image data. // Now we need to substitute the indexed image data with full RGBA image data.
PaletteWord* convertedData = new PaletteWord [sizeWithMipmaps]; unsigned char * convertedData = new unsigned char [sizeWithMipmaps * 4];
PaletteWord* pconvertedData = convertedData; unsigned char * pconvertedData = convertedData;
for (unsigned int i = 0; i < sizeWithMipmaps; i++) for (unsigned int i = 0; i < sizeWithMipmaps; i++)
pconvertedData++->f32 = palette[imageData[i]].f32; {
memcpy(pconvertedData, &palette[ imageData[i] * 4], sizeof(unsigned char) * 4 );
pconvertedData += 4;
}
delete [] imageData; delete [] imageData;
for (unsigned int i = 0; i < mipmap_offsets.size(); i++) for (unsigned int i = 0; i < mipmap_offsets.size(); i++)
mipmap_offsets[i] *= 4; mipmap_offsets[i] *= 4;
internalFormat = GL_RGBA; internalFormat = GL_RGBA;
pixelFormat = GL_RGBA; pixelFormat = GL_RGBA;
osgImage->setImage(s,t,r, internalFormat, pixelFormat, dataType, convertedData->c8, osg::Image::USE_NEW_DELETE, packing); osgImage->setImage(s,t,r, internalFormat, pixelFormat, dataType, convertedData, osg::Image::USE_NEW_DELETE, packing);
} }
else else
{ {