From ae93f0849260f34d2f25041f30ac0ade518b71cd Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 5 Dec 2006 17:10:39 +0000
Subject: [PATCH] From Roger James,"I have had another go at the windows
 specific file name handling in daeWMaterials.cpp. I think I have arrived at a
 temporary compromise.

I have decided to just normalise the drive letter part of file names for the time being and also ensure that names of the format x:/xxxxx are treated as absolute paths. This will cover a lot of cases.

I have raised a bug against collada which hopefully should resolve some others. However there are some pathological cases which I have commented on in the code, these will probably never work properly unless there is a significant rewrite of the daeURI functionality. Hopefully they are rare."
---
 src/osgPlugins/dae/daeWMaterials.cpp | 37 +++++++++++++++-------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/osgPlugins/dae/daeWMaterials.cpp b/src/osgPlugins/dae/daeWMaterials.cpp
index aeb198897..20c3d1e69 100644
--- a/src/osgPlugins/dae/daeWMaterials.cpp
+++ b/src/osgPlugins/dae/daeWMaterials.cpp
@@ -93,27 +93,30 @@ void daeWriter::processMaterial( osg::StateSet *ss, domInstance_geometry *ig, co
 
         osg::Image *osgimg = tex->getImage( 0 );
         domImage::domInit_from *imgif = daeSafeCast< domImage::domInit_from >( img->createAndPlace( "init_from" ) );
-        std::string imgstr = "/" + osgDB::convertFileNameToUnixStyle( osgDB::findDataFile( osgimg->getFileName() ) );
+        std::string imgstr = osgDB::convertFileNameToUnixStyle( osgDB::findDataFile( osgimg->getFileName() ) );
 #ifdef WIN32
-        daeURI uri( _strlwr( (char *)imgstr.c_str() ) );
-#else
+        // At this point imgstr might contain something like "c:/xxxx" which should be treated
+        // as an absolute path. In this case I will prepend a / and normalise the drive letter to upper case.
+        //
+        // There are also a number of valid windows path formats
+        // such as UNC names which will appear like this at this point
+        // //sharename/filepath
+        // and volume names which will appear like this at this point
+        // //?/{guid}/   where guid is a multi digit number
+        // In fact //?/ can be prepended to any path and is some wierd windows specific marker
+        // File paths of these formats are almost guaranteed to break the dae URI code.
+        //
+        if ((imgstr.length() > 3) && (isalpha(imgstr[0])) && (imgstr[1] == ':') && (imgstr[2] == '/'))
+        {
+            if (islower(imgstr[0]))
+                imgstr[0] = (char)_toupper(imgstr[0]);
+            imgstr = '/' + imgstr;
+        }
+#endif
         daeURI uri( imgstr.c_str() );
-#endif
-        uri.validate();
+        uri.validate(); // This returns an absolute URI
         imgif->setValue( uri.getURI() );
-        //imgif->setValue( imgstr.c_str() );
-        //imgif->getValue().validate();
-#ifdef WIN32
-        std::string docUriString = doc->getDocumentURI()->getFilepath();
-        docUriString += doc->getDocumentURI()->getFile();
-        daeURI docUri( _strlwr( (char *)docUriString.c_str() ) );
-        imgif->getValue().makeRelativeTo( &docUri );
-#else
         imgif->getValue().makeRelativeTo( doc->getDocumentURI() ); 
-#endif
-        //imgif->setValue( osgimg->getFileName().c_str() );
-        //osg::notify( osg::WARN ) << "original img filename " << osgimg->getFileName() << std::endl;
-        //osg::notify( osg::WARN ) << "init_from filename " << imgstr << std::endl;
 
 #ifndef EARTH_TEX
         domCommon_newparam_type *np = daeSafeCast< domCommon_newparam_type >( pc->createAndPlace( "newparam" ) );