Changeset 2103 for trunk/packages/vizservers/nanovis/vr3d

Timestamp:

Feb 22, 2011 3:40:04 PM (13 years ago)

Author:

ldelgass

Message:

Remove unused _pixels data member, fixes warning about deleting a void pointer
being undefined.

Location:

trunk/packages/vizservers/nanovis/vr3d

Files:

• include/vr3d/vrTexture.h (modified) (1 diff)
• vrTexture.cpp (modified) (1 diff)
• vrTexture1D.cpp (modified) (1 diff)
• vrTexture2D.cpp (modified) (1 diff)
• vrTexture3D.cpp (modified) (1 diff)

trunk/packages/vizservers/nanovis/vr3d/include/vr3d/vrTexture.h

@@ -61 +61 @@
          */
         TEXFILTER               _magFilter;
-
-        /**
-         * @brief image data
-         * @brief Default value is NULL
-         */
-        void*                   _pixels;
 
         /**

trunk/packages/vizservers/nanovis/vr3d/vrTexture.cpp

@@ -9 +9 @@
   _minFilter(TF_LINEAR), 
   _magFilter(TF_LINEAR),
-  _pixels(0), 
   _compCount(4)
 {

trunk/packages/vizservers/nanovis/vr3d/vrTexture1D.cpp

@@ -46 +46 @@
         }
 
-        if (_pixels)
-        {
-                delete [] _pixels;
-        }
-
         glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
         glGenTextures(1, &_objectID);

trunk/packages/vizservers/nanovis/vr3d/vrTexture2D.cpp

@@ -70 +70 @@
         }
 
-        if (_pixels)
-        {
-                delete [] _pixels;
-        }
-
         //glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
         glGenTextures(1, &_objectID);

trunk/packages/vizservers/nanovis/vr3d/vrTexture3D.cpp

@@ -50 +50 @@
         }
 
-        if (_pixels)
-        {
-                delete [] _pixels;
-        }
-
         //glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
         glGenTextures(1, &_objectID);