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

Fixed osgDB::findFileInDirectory() handling of directory strings with trailing \ or / that was causing failure to find valid files in otherwise valid directories

Browse Source
This commit is contained in:
Robert Osfield 2018-03-28 11:34:52 +01:00
parent 0d386ff3f1
commit aae5f87d13
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/osgDB/FileUtils.cpp
View File

@ -422,7 +422,19 @@ std::string osgDB::findFileInDirectory(const std::string& fileName,const std::st
realFileName = getSimpleFileName(fileName);
}
OSG_DEBUG << "findFileInDirectory() : looking for " << realFileName << " in " << realDirName << "...\n";
if (realDirName.size()>2)
{
char lastCharacter = realDirName[realDirName.size()-1];
bool trimLastCharacter = lastCharacter=='/' || lastCharacter=='\\';
if (trimLastCharacter)
{
realDirName.erase(realDirName.size()-1, 1);
OSG_DEBUG << "findFileInDirectory() Trimming last character of filepath, now realDirName="<<realDirName<<std::endl;
}
}
OSG_DEBUG << "findFileInDirectory() : looking for " << realFileName << " in " << realDirName << std::endl;
if (realDirName.empty())
{