From bdb2a6b9d710db62a338f9c692b0118f70d7b4dd Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 22 Aug 2007 19:31:58 +0000 Subject: [PATCH] From Jean-Sebastien Guay, "After a bit more testing, it was still not 100% robust, so this fix will bring the change in line with what is done on other OSes (Linux) and works in all tested cases. For reference, this was tested with: osgviewer .wrl (file in current directory) osgviewer \.wrl (file in child directory, relative) osgviewer .\\.wrl (file in child directory, specify current) osgviewer :\\.wrl (absolute path) " --- src/osgPlugins/vrml/ReaderWriterVRML2.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osgPlugins/vrml/ReaderWriterVRML2.cpp b/src/osgPlugins/vrml/ReaderWriterVRML2.cpp index 0af7c63b1..31879b05e 100644 --- a/src/osgPlugins/vrml/ReaderWriterVRML2.cpp +++ b/src/osgPlugins/vrml/ReaderWriterVRML2.cpp @@ -81,13 +81,13 @@ osgDB::ReaderWriter::ReadResult ReaderWriterVRML2::readNode(const std::string &f std::string unixFileName = osgDB::convertFileNameToUnixStyle(fileName); #ifdef WIN32 - fileName = "file://" + unixFileName; + if(unixFileName[1] == ':') // absolute path #else if(unixFileName[0] == '/') // absolute path +#endif fileName = "file://" + unixFileName; else // relative path fileName = unixFileName; -#endif std::fstream null; openvrml::browser *browser = new openvrml::browser(null, null);