Changeset 11169 for OpenSceneGraph/trunk/src/osgDB/FileNameUtils.cpp

Timestamp:

03/05/10 16:10:34 (3 years ago)

Author:

robert

Message:

From Sukender, "Here is a tiny fix for getNameLessExtension(). It does now check for the presence of slashes ('/' and '\') to avoid changing the string when having a dot in a directory.
Old behaviour: "abc.d/filename_no_ext" -> "abc"
New behaviour: "abc.d/filename_no_ext" -> "abc.d/filename_no_ext"

Attached file is against rev. 11158."

Files:

• OpenSceneGraph/trunk/src/osgDB/FileNameUtils.cpp (modified) (1 diff)

OpenSceneGraph/trunk/src/osgDB/FileNameUtils.cpp

@@ -139 +139 @@
 std::string osgDB::getNameLessExtension(const std::string& fileName)
 {
-    std::string::size_type dot = fileName.find_last_of('.');
-    if (dot==std::string::npos) return fileName;
+    std::string::size_type dot = fileName.find_last_of('.'); 
+    std::string::size_type back_slash = fileName.find_last_of('\\');
+    std::string::size_type slash = fileName.find_last_of('/'); 
+    if (dot==std::string::npos || (dot<back_slash && dot<slash)) return fileName;
     return std::string(fileName.begin(),fileName.begin()+dot);
 }