Changeset 7075

Timestamp:

07/06/07 15:33:40 (6 years ago)

Author:

robert

Message:

From Brede Johansen, "Attached is a fix that returns a default color (white) if an invalid
index to the color palette is used."

Files:

• OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/Pools.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/Pools.cpp

@@ -21 +21 @@
         bool fixedIntensity = (indexIntensity & 0x1000) ? true : false;
         unsigned int index = (fixedIntensity) ? (indexIntensity & 0x0fff)+(4096>>7) : indexIntensity >> 7;
-        assert(index<size());
-        osg::Vec4 col = at(index);
+
+        if (index>=size())
+        {
+            // color index not available.
+            return osg::Vec4(1,1,1,1);
+        }
+
+        osg::Vec4 col =  operator[](index);
         if (!fixedIntensity)
         {
@@ -36 +42 @@
         // bit 0-6:  intensity
         // bit 7-15  color index
-        int index = indexIntensity >> 7;
+        unsigned int index = indexIntensity >> 7;
 
-        if (index<0 || index>=(int)size())
+        if (index>=size())
         {
             // color index not available.
@@ -44 +50 @@
         }
 
-        osg::Vec4 col = at(index);
+        osg::Vec4 col =  operator[](index);
         float intensity = (float)(indexIntensity & 0x7f)/127.f;
         col[0] *= intensity;