Changeset 64763 in vbox for trunk/src/VBox/GuestHost/OpenGL

Timestamp:

Nov 29, 2016 5:59:55 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

112107

Message:

pixel.c: Compile with older gcc without failing on global shadow declaration of 'index'.

File:

• trunk/src/VBox/GuestHost/OpenGL/util/pixel.c (modified) (5 diffs)

trunk/src/VBox/GuestHost/OpenGL/util/pixel.c

@@ -382 +382 @@
         }
     }
-    else if (srcFormat == GL_LUMINANCE 
+    else if (srcFormat == GL_LUMINANCE
 #ifdef CR_EXT_texture_sRGB
              || srcFormat == GL_SLUMINANCE_EXT
@@ -983 +983 @@
 #endif
              ) {
-        int index;
+        int idx;
         if (dstFormat == GL_RED)
-            index = 0;
-        else if (dstFormat == GL_LUMINANCE 
+            idx = 0;
+        else if (dstFormat == GL_LUMINANCE
 #ifdef CR_EXT_texture_sRGB
                  || dstFormat == GL_SLUMINANCE_EXT
@@ -992 +992 @@
 #endif
                 )
-            index = 0;
+            idx = 0;
         else if (dstFormat == GL_INTENSITY)
-            index = 0;
+            idx = 0;
         else if (dstFormat == GL_GREEN)
-            index = 1;
+            idx = 1;
         else if (dstFormat == GL_BLUE)
-            index = 2;
+            idx = 2;
         else
-            index = 3;
+            idx = 3;
         switch (dstType) {
             case GL_BYTE:
                 for (i = 0; i < width; i++)
-                    bDst[i] = FLOAT_TO_BYTE(tmpRow[i*4+index]);
+                    bDst[i] = FLOAT_TO_BYTE(tmpRow[i*4+idx]);
                 break;
             case GL_UNSIGNED_BYTE:
                 for (i = 0; i < width; i++)
-                    ubDst[i] = FLOAT_TO_UBYTE(tmpRow[i*4+index]);
+                    ubDst[i] = FLOAT_TO_UBYTE(tmpRow[i*4+idx]);
                 break;
             case GL_SHORT:
                 for (i = 0; i < width; i++)
-                    sDst[i] = FLOAT_TO_SHORT(tmpRow[i*4+index]);
+                    sDst[i] = FLOAT_TO_SHORT(tmpRow[i*4+idx]);
                 break;
             case GL_UNSIGNED_SHORT:
                 for (i = 0; i < width; i++)
-                    usDst[i] = FLOAT_TO_USHORT(tmpRow[i*4+index]);
+                    usDst[i] = FLOAT_TO_USHORT(tmpRow[i*4+idx]);
                 break;
             case GL_INT:
                 for (i = 0; i < width; i++)
-                    iDst[i] = FLOAT_TO_INT(tmpRow[i*4+index]);
+                    iDst[i] = FLOAT_TO_INT(tmpRow[i*4+idx]);
                 break;
             case GL_UNSIGNED_INT:
                 for (i = 0; i < width; i++)
-                    uiDst[i] = FLOAT_TO_UINT(tmpRow[i*4+index]);
+                    uiDst[i] = FLOAT_TO_UINT(tmpRow[i*4+idx]);
                 break;
             case GL_FLOAT:
                 for (i = 0; i < width; i++)
-                    fDst[i] = tmpRow[i*4+index];
+                    fDst[i] = tmpRow[i*4+idx];
                 break;
             case GL_DOUBLE:
                 for (i = 0; i < width; i++)
-                    dDst[i] = tmpRow[i*4+index];
+                    dDst[i] = tmpRow[i*4+idx];
                 break;
             default:
@@ -1589 +1589 @@
         {
             CRASSERT(srcBytesPerRow == dstBytesPerRow);
-            
-            if (srcBytesPerRow==srcRowStrideBytes 
+
+            if (srcBytesPerRow==srcRowStrideBytes
                 && srcRowStrideBytes==dstRowStrideBytes)
             {
@@ -1806 +1806 @@
     char  depth;
     char  imagedesc;
-    
+
 } tgaheader_t;
 #pragma pack()