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

From Sukender, "a small fix about using non 3-charcacters long file extensions (such as "jpeg", to be converted to "jpg")."

Browse Source
This commit is contained in:
Robert Osfield
2010-01-11 14:04:55 +00:00
parent 6faa6985cf
commit 22a63fa5b7
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/osgPlugins/3ds/WriterNodeVisitor.cpp
View File

@@ -425,6 +425,16 @@ getPathRelative(const std::string & srcBad,
return result;
}
/// Converts an extension to a 3-letters long one equivalent.
std::string convertExt(const std::string & path)
{
std::string ext = osgDB::getFileExtensionIncludingDot(path);
if (ext == ".tiff") ext = ".tif";
else if (ext == ".jpeg") ext = ".jpg";
else if (ext == ".jpeg2000" || ext == ".jpg2000") ext = ".jpc";
return osgDB::getNameLessExtension(path) + ext;
}
void WriterNodeVisitor::writeMaterials()
{
unsigned int nbMat = _materialMap.size();
@@ -460,6 +470,8 @@ void WriterNodeVisitor::writeMaterials()
else {
path = getPathRelative(_srcDirectory, mat.image->getFileName());
}
path = convertExt(path);
if(!is3DSpath(path)) {
path = getUniqueName(path, "", true);
//path = osgDB::getSimpleFileName(path);