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

Added handling of return value

Browse Source
This commit is contained in:
Robert Osfield 2016-06-30 11:00:38 +01:00
parent 8f071e055f
commit 509c0380fa
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/osgPlugins/txp/ReaderWriterTXP.cpp
View File

@ -185,10 +185,16 @@ osgDB::ReaderWriter::ReadResult ReaderWriterTXP::local_readNode(const std::strin
{
int x,y,lod;
unsigned int id;
sscanf(name.c_str(),"subtiles%d_%dx%d_%u",&lod,&x,&y,&id);
if (sscanf(name.c_str(),"subtiles%d_%dx%d_%u",&lod,&x,&y,&id)!=4)
{
return ReadResult::ERROR_IN_READING_FILE;
}
osg::ref_ptr< TXPArchive > archive = getArchive(id,osgDB::getFilePath(file));
if (archive == NULL)
{
return ReadResult::ERROR_IN_READING_FILE;
}
int majorVersion, minorVersion;
archive->GetVersion(majorVersion, minorVersion);