Changeset 10938

Timestamp:

01/11/10 15:04:55 (3 years ago)

Author:

robert

Message:

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

Files:

• OpenSceneGraph/trunk/src/osgPlugins/3ds/WriterNodeVisitor.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/src/osgPlugins/3ds/WriterNodeVisitor.cpp

@@ -426 +426 @@
 }
 
+/// 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()
 {
@@ -461 +471 @@
                     path = getPathRelative(_srcDirectory, mat.image->getFileName());
                 }
+                path = convertExt(path);
+
                 if(!is3DSpath(path)) {
                     path = getUniqueName(path, "", true);