Changeset 23

Timestamp:

06/26/08 10:58:46

Author:

robert

Message:

Introduced workaround which fixes odd OSX bug relating to the freeing of libxml2 generated data structures (looks like a libxml2 bug).

Fixed the parsing of holding slides so that that both .xml and .p3d extensions are accepted.

Files:

• trunk/Makefile (deleted)
• trunk/src/ReadShowFile.cpp (modified) (4 diffs)
• trunk/src/ReaderWriterXML.cpp (modified) (2 diffs)

trunk/src/ReadShowFile.cpp

@@ -34 +34 @@
-        {
-            std::string ext = osgDB::getFileExtension(arguments[pos]);
-
+ || osgDB::equalCaseInsensitive(ext,"p3d")
-            {
-                xmlFiles.push_back(arguments[pos]);
@@ -61 +61 @@
-                if (!file.empty())
-                {
+                    std::string path = osgDB::getFilePath(file);
+                    if (!path.empty())
+                    {
+                        osgDB::getDataFilePathList().push_front(path);
+                    }
+                    
-                    if (p3d::readEnvVars(file)) readVars = true;
-                }
@@ -125 +131 @@
-    }
-
+ #ifndef __APPLE__
+    
-    xmlFreeDoc(doc);
-    
-
+
+
+
-}
-
@@ -145 +155 @@
-{
-    std::string ext = osgDB::getFileExtension(filename);
-
+
+
-    return osgDB::readNodeFile(filename, options);
-}

trunk/src/ReaderWriterXML.cpp

@@ -1269 +1269 @@
-    SlideShowConstructor constructor;
-          
+    osgDB::FilePathList previousPaths = osgDB::getDataFilePathList();
+          
-    bool readSlide = false;
+    
-    
-    xmlChar *key;
@@ -1381 +1384 @@
-
-    xmlFreeDoc(doc);
+    
+    osgDB::getDataFilePathList() = previousPaths;
+    
-
-    return constructor.takePresentation();