Changeset 11813 for OpenSceneGraph/trunk/examples/osgvolume/osgvolume.cpp

Timestamp:

10/04/10 13:19:41 (3 years ago)

Author:

robert

Message:

Added checks for NULL images to prevent crashes when no valid images are created

Files:

• OpenSceneGraph/trunk/examples/osgvolume/osgvolume.cpp (modified) (4 diffs)

OpenSceneGraph/trunk/examples/osgvolume/osgvolume.cpp

@@ -1110 +1110 @@
             // not an option so assume string is a filename.
             osg::Image *image = osgDB::readImageFile( arguments[pos]);
-
             if(image)
             {
@@ -1121 +1120 @@
         // pack the textures into a single texture.
         ProcessRow processRow;
-        images.push_back(createTexture3D(imageList, processRow, numComponentsDesired, s_maximumTextureSize, t_maximumTextureSize, r_maximumTextureSize, resizeToPowerOfTwo));
+        osg::Image* image = createTexture3D(imageList, processRow, numComponentsDesired, s_maximumTextureSize, t_maximumTextureSize, r_maximumTextureSize, resizeToPowerOfTwo);
+        if (image) images.push_back(image);
     }
 
@@ -1145 +1145 @@
             {
                 // not an option so assume string is a filename.
-                osg::Image *image = osgDB::readImageFile(filename);
-                if(image)
+                osg::Image* image = osgDB::readImageFile(filename);
+                if (image)
                 {
                     images.push_back(image);
@@ -1162 +1162 @@
                 if (fileType == osgDB::DIRECTORY)
                 {
-                osg::Image *image = osgDB::readImageFile(filename+".dicom");
-                    if(image)
-                    {
-                        images.push_back(image);
-                    }
+                    osg::Image* image = osgDB::readImageFile(filename+".dicom");
+                    if (image) images.push_back(image);
                 }
                 else if (fileType == osgDB::REGULAR_FILE)
                 {
                     // not an option so assume string is a filename.
-                    images.push_back(osgDB::readImageFile( filename ));
+                    osg::Image* image = osgDB::readImageFile( filename );
+                    if (image) images.push_back(image);
                 }
                 else