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

Merge pull request #969 from unelsson/daeremoveprotcheck

Browse Source 
Remove "file" protocol check
This commit is contained in:
Robert Osfield 2020-11-10 14:13:26 +00:00 committed by GitHub
commit b8982224c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/osgPlugins/dae/daeRMaterials.cpp
View File

@ -897,27 +897,20 @@ std::string daeReader::processImagePath(const domImage* pDomImage) const
if (pDomImage->getInit_from())
{
pDomImage->getInit_from()->getValue().validate();
if (strcmp(pDomImage->getInit_from()->getValue().getProtocol(), "file") == 0)
std::string path = pDomImage->getInit_from()->getValue().pathDir() +
pDomImage->getInit_from()->getValue().pathFile();
path = ReaderWriterDAE::ConvertColladaCompatibleURIToFilePath(path);
if (path.empty())
{
std::string path = pDomImage->getInit_from()->getValue().pathDir() +
pDomImage->getInit_from()->getValue().pathFile();
path = ReaderWriterDAE::ConvertColladaCompatibleURIToFilePath(path);
if (path.empty())
{
OSG_WARN << "Unable to get path from URI." << std::endl;
return std::string();
}
OSG_WARN << "Unable to get path from URI." << std::endl;
return std::string();
}
#ifdef WIN32
// If the path has a drive specifier or a UNC name then strip the leading /
if (path.size() > 2 && (path[2] == ':' || (path[1] == '/' && path[2] == '/')))
return path.substr(1, std::string::npos);
// If the path has a drive specifier or a UNC name then strip the leading /
if (path.size() > 2 && (path[2] == ':' || (path[1] == '/' && path[2] == '/')))
return path.substr(1, std::string::npos);
#endif
return path;
}
else
{
OSG_WARN << "Only images with a \"file\" scheme URI are supported in this version." << std::endl;
}
return path;
}
else
{