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

From Rune, Added catch for erroneous size specification in .dds file.

Browse Source
This commit is contained in:
Robert Osfield
2003-12-02 21:38:01 +00:00
parent bd4a1cd601
commit a66d6becfa
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
/**********************************************************************
*
* FILE: ReaderWriterdds.cpp
* FILE: ReaderWriterdds.cpp
*
* DESCRIPTION: Class for reading a DDS file into an osg::Image.
*
@@ -9,11 +9,11 @@
* ARB_texture_compression.pdf
* Author: S<>bastien Domin<69>, NVIDIA Corporation
*
* CREATED BY: Rune Schmidt Jensen, rsj@uni-dk
* CREATED BY: Rune Schmidt Jensen, rune@schmidt-jensen.com
*
* HISTORY: Created 31.03.2003
*
**********************************************************************/
**********************************************************************/
#include <osg/Texture>
#include <osg/Notify>
@@ -159,6 +159,10 @@ osg::Image* ReadDDSFile(const char *filename)
unsigned int size = ddsd.dwMipMapCount > 1 ? ddsd.dwLinearSize * (ddsd.ddpfPixelFormat.dwFourCC==FOURCC_DXT1 ? 2: 4) : ddsd.dwLinearSize;
//###################unsigned int size = ddsd.dwMipMapCount > 1 ? ddsd.dwLinearSize * 2 : ddsd.dwLinearSize;
if(size <= 0){
osg::notify(osg::WARN)<<"Warning:: dwLinearSize is not defined in dds file, image not loaded."<<std::endl;
return NULL;
}
unsigned char* imageData = new unsigned char [size];
fread(imageData, 1, size, fp);