Changeset 11122 for OpenSceneGraph/trunk/src/osgPlugins/txp/ReaderWriterTXP.h

Timestamp:

02/26/10 10:23:28 (3 years ago)

Author:

robert

Message:

From Ryan Kawicki, "I guess I missed these during my testing, but if the database pager has outstanding requests while the application is shutting down, the archive can become invalidated through unsafe calls to ReaderWriterTXP::getArchive. I've made this function return a ref_ptr and change other locations to as needed to conform to the change. I've tested this and no more crashes.

Following files from revision 11057 have been attached."

Files:

• OpenSceneGraph/trunk/src/osgPlugins/txp/ReaderWriterTXP.h (modified) (1 diff)

OpenSceneGraph/trunk/src/osgPlugins/txp/ReaderWriterTXP.h

@@ -82 +82 @@
     ReadResult local_readNode(const std::string& file, const osgDB::ReaderWriter::Options* options);
 
-    TXPArchive *getArchive(int id, const std::string&);
+    osg::ref_ptr< TXPArchive > getArchive(int id, const std::string&);
  
     osg::Node* getTileContent(const TXPArchive::TileInfo &info, int x, int y, int lod, TXPArchive* archive,  std::vector<TXPArchive::TileLocationInfo>& childrenLoc);