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

Return ReadResult::FILE_NOT_HANDLED for unknown extensions.

Browse Source 
This fixes a problem with fonts no longer being correctly
loaded as a side effect of the spt meta object loader.
The readObject slot is obviously being called for several
unrelated file extensions. To make sure the search continues,
osgDB::ReaderWriter::ReadResult::FILE_NOT_HANDLED needs to
be returned in this case.
This commit is contained in:
Mathias Froehlich 2011-12-17 19:08:18 +01:00
parent 112eb04079
commit a0290954d6
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
simgear/scene/tgdb/ReaderWriterSPT.cxx
View File

@ -54,6 +54,10 @@ ReaderWriterSPT::className() const
osgDB::ReaderWriter::ReadResult osgDB::ReaderWriter::ReadResult
ReaderWriterSPT::readObject(const std::string& fileName, const osgDB::Options* options) const ReaderWriterSPT::readObject(const std::string& fileName, const osgDB::Options* options) const
{ {
// We get called with different extensions. To make sure search continues,
// we need to return FILE_NOT_HANDLED in this case.
if (osgDB::getLowerCaseFileExtension(fileName) != "spt")
return ReadResult(osgDB::ReaderWriter::ReadResult::FILE_NOT_HANDLED);
if (fileName != "state.spt") if (fileName != "state.spt")
return ReadResult(osgDB::ReaderWriter::ReadResult::FILE_NOT_FOUND); return ReadResult(osgDB::ReaderWriter::ReadResult::FILE_NOT_FOUND);