Changeset 3301 for OpenSceneGraph/trunk/src/osg/dxtctool.cpp

Timestamp:

08/18/04 08:06:02 (9 years ago)

Author:

robert

Message:

Rejigged the int* definitions to try and get round Mingw compile errors

Files:

• OpenSceneGraph/trunk/src/osg/dxtctool.cpp (modified) (5 diffs)

OpenSceneGraph/trunk/src/osg/dxtctool.cpp

@@ -79 +79 @@
 {
     // const size_t Size = ((m_Width + 3) / 4) * ((m_Height + 3) / 4) * BSIZE_DXT1;
-    __int8 * const pPixels = (__int8 * const) m_pPixels;
+    dxtc_int8 * const pPixels = (dxtc_int8 * const) m_pPixels;
 
     if (m_Height == 2)
@@ -102 +102 @@
 {
     // const size_t Size = ((m_Width + 3) / 4) * ((m_Height + 3) / 4) * BSIZE_DXT3;
-    // __int8 * const pPixels = (__int8 * const) m_pPixels;
+    // dxtc_int8 * const pPixels = (dxtc_int8 * const) m_pPixels;
 
     if (m_Height == 2)
         for (size_t j = 0; j < (m_Width + 3) / 4; ++j) {
-            BVF_Alpha_DXT3_H2(((__int8 * const) m_pPixels) + (j * BSIZE_DXT3));
-            BVF_Color_H2(((__int8 * const) m_pPixels) + (j * BSIZE_DXT3 + BSIZE_ALPHA_DXT3));
+            BVF_Alpha_DXT3_H2(((dxtc_int8 * const) m_pPixels) + (j * BSIZE_DXT3));
+            BVF_Color_H2(((dxtc_int8 * const) m_pPixels) + (j * BSIZE_DXT3 + BSIZE_ALPHA_DXT3));
         }
 
     if (m_Height == 4)
         for (size_t j = 0; j < (m_Width + 3) / 4; ++j) {
-            BVF_Alpha_DXT3_H4(((__int8 * const) m_pPixels) + (j * BSIZE_DXT3));
-            BVF_Color_H4(((__int8 * const) m_pPixels) + (j * BSIZE_DXT3 + BSIZE_ALPHA_DXT3));
+            BVF_Alpha_DXT3_H4(((dxtc_int8 * const) m_pPixels) + (j * BSIZE_DXT3));
+            BVF_Color_H4(((dxtc_int8 * const) m_pPixels) + (j * BSIZE_DXT3 + BSIZE_ALPHA_DXT3));
         }
 
@@ -121 +121 @@
                 const size_t TargetRow = ((m_Height + 3) / 4) - (i + 1);
                 BVF_Alpha_DXT3(GetBlock(i, j, BSIZE_DXT3), GetBlock(TargetRow, j, BSIZE_DXT3));
-                BVF_Color(((__int8 * const) GetBlock(i, j, BSIZE_DXT3)) + BSIZE_ALPHA_DXT3, 
-                          ((__int8 * const) GetBlock(TargetRow, j, BSIZE_DXT3)) + BSIZE_ALPHA_DXT3);
+                BVF_Color(((dxtc_int8 * const) GetBlock(i, j, BSIZE_DXT3)) + BSIZE_ALPHA_DXT3, 
+                          ((dxtc_int8 * const) GetBlock(TargetRow, j, BSIZE_DXT3)) + BSIZE_ALPHA_DXT3);
             }
 }
@@ -131 +131 @@
 {
     // const size_t Size = ((m_Width + 3) / 4) * ((m_Height + 3) / 4) * BSIZE_DXT5;
-    // __int8 * const pPixels = (__int8 * const) m_pPixels;
+    // dxtc_int8 * const pPixels = (dxtc_int8 * const) m_pPixels;
 
     if (m_Height == 2)
         for (size_t j = 0; j < (m_Width + 3) / 4; ++j) {
-            BVF_Alpha_DXT5_H2(((__int8 * const) m_pPixels) + (j * BSIZE_DXT5));
-            BVF_Color_H2(((__int8 * const) m_pPixels) + (j * BSIZE_DXT5 + BSIZE_ALPHA_DXT5));
+            BVF_Alpha_DXT5_H2(((dxtc_int8 * const) m_pPixels) + (j * BSIZE_DXT5));
+            BVF_Color_H2(((dxtc_int8 * const) m_pPixels) + (j * BSIZE_DXT5 + BSIZE_ALPHA_DXT5));
         }
 
     if (m_Height == 4)
         for (size_t j = 0; j < (m_Width + 3) / 4; ++j) {
-            BVF_Alpha_DXT5_H4(((__int8 * const) m_pPixels) + (j * BSIZE_DXT5));
-            BVF_Color_H4(((__int8 * const) m_pPixels) + (j * BSIZE_DXT5 + BSIZE_ALPHA_DXT5));
+            BVF_Alpha_DXT5_H4(((dxtc_int8 * const) m_pPixels) + (j * BSIZE_DXT5));
+            BVF_Color_H4(((dxtc_int8 * const) m_pPixels) + (j * BSIZE_DXT5 + BSIZE_ALPHA_DXT5));
         }
 
@@ -150 +150 @@
                 const size_t TargetRow = ((m_Height + 3) / 4) - (i + 1);
                 BVF_Alpha_DXT5(GetBlock(i, j, BSIZE_DXT5), GetBlock(TargetRow, j, BSIZE_DXT5));
-                BVF_Color(((__int8 * const) GetBlock(i, j, BSIZE_DXT5)) + BSIZE_ALPHA_DXT5, 
-                          ((__int8 * const) GetBlock(TargetRow, j, BSIZE_DXT5)) + BSIZE_ALPHA_DXT5);
+                BVF_Color(((dxtc_int8 * const) GetBlock(i, j, BSIZE_DXT5)) + BSIZE_ALPHA_DXT5, 
+                          ((dxtc_int8 * const) GetBlock(TargetRow, j, BSIZE_DXT5)) + BSIZE_ALPHA_DXT5);
             }
 }