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

Fixed bug in checking of return values. Fix merged in from svn/trunk using:

Browse Source 
svn merge -r 9800:9801  http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk/src/osgPlugins/hdr/hdrloader.cpp
This commit is contained in:
Robert Osfield
2009-02-19 17:40:55 +00:00
parent 8954964c32
commit 439c3a866b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgPlugins/hdr/hdrloader.cpp
View File

@@ -60,7 +60,7 @@ bool HDRLoader::isHDRFile(const char *_fileName)
fclose(file);
if (numRead<10) return false;
if (numRead<1) return false;
if (memcmp(str, "#?RADIANCE", 10) && memcmp(str, "#?RGBE", 6))
return false;
@@ -80,7 +80,7 @@ bool HDRLoader::load(const char *_fileName, const bool _rawRGBE, HDRLoaderResult
size_t numRead = fread(str, 10, 1, file);
if (numRead<10)
if (numRead<1)
{
fclose(file);
return false;
@@ -90,7 +90,7 @@ bool HDRLoader::load(const char *_fileName, const bool _rawRGBE, HDRLoaderResult
{
fseek(file, 0, SEEK_SET);
numRead = fread(str, 6, 1, file);
if (numRead<6 || memcmp(str, "#?RGBE", 6))
if (numRead<1 || memcmp(str, "#?RGBE", 6))
{
fclose(file);
return false;