Changeset 3309

Timestamp:

08/23/04 10:44:47 (9 years ago)

Author:

robert

Message:

Added protection to prevent crashes on calls when no data is set up

Files:

• OpenSceneGraph/trunk/src/osgTerrain/DataSet.cpp (modified) (4 diffs)

OpenSceneGraph/trunk/src/osgTerrain/DataSet.cpp

@@ -56 +56 @@
 CoordinateSystemType getCoordinateSystemType(const osg::CoordinateSystemNode* lhs)
 {
+    if (!lhs) return PROJECTED;
+
     // set up LHS SpatialReference
     char* projection_string = strdup(lhs->getCoordinateSystem().c_str());
@@ -3253 +3255 @@
 void DataSet::computeDestinationGraphFromSources(unsigned int numLevels)
 {
+    if (!_sourceGraph) return;
 
     // ensure we have a valid coordinate system
@@ -3376 +3379 @@
 void DataSet::updateSourcesForDestinationGraphNeeds()
 {
+    if (!_destinationGraph || !_sourceGraph) return;
+
 
     std::string temporyFilePrefix("temporaryfile_");
@@ -3488 +3493 @@
 void DataSet::populateDestinationGraphFromSources()
 {
+    if (!_destinationGraph || !_sourceGraph) return;
+
     osg::notify(osg::NOTICE)<<std::endl<<"started DataSet::populateDestinationGraphFromSources)"<<std::endl;