xrDXT: fix 64-bit pointer issue

OpenXRay · May 13, 2018 · 440cc85 · 440cc85
1 parent 6674821
commit 440cc85
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/utils/xrDXT/Image_DXTC.cpp b/src/utils/xrDXT/Image_DXTC.cpp
@@ -541,14 +541,14 @@ void Image_DXTC::DecompressDXT1()
     for (int j = 0; j < yblocks; j++)
     {
         // 8 bytes per block
-        pBlock = (DXTColBlock*)((DWORD)m_pCompBytes + j * xblocks * 8);
+        pBlock = (DXTColBlock*)((DWORD_PTR)m_pCompBytes + j * xblocks * 8);
         for (int i = 0; i < xblocks; i++, pBlock++)
         {
             // inline func:
             GetColorBlockColors(pBlock, &col_0, &col_1, &col_2, &col_3, wrd);
             // now decode the color block into the bitmap bits
             // inline func:
-            pImPos = (DWORD*)((DWORD)pBase + i * 16 + (j * 4) * m_nWidth * 4);
+            pImPos = (DWORD*)((DWORD_PTR)pBase + i * 16 + (j * 4) * m_nWidth * 4);
             DecodeColorBlock(pImPos, pBlock, m_nWidth, (DWORD*)&col_0, (DWORD*)&col_1, (DWORD*)&col_2, (DWORD*)&col_3);
             if (false) // Set to RGB test pattern
             {
@@ -593,7 +593,7 @@ void Image_DXTC::DecompressDXT3()
     {
         // 8 bytes per block
         // 1 block for alpha, 1 block for color
-        pBlock = (DXTColBlock*)((DWORD)m_pCompBytes + j * xblocks * 16);
+        pBlock = (DXTColBlock*)((DWORD_PTR)m_pCompBytes + j * xblocks * 16);
         for (int i = 0; i < xblocks; i++, pBlock++)
         {
             // inline
@@ -604,7 +604,7 @@ void Image_DXTC::DecompressDXT3()
             pBlock++;
             GetColorBlockColors(pBlock, &col_0, &col_1, &col_2, &col_3, wrd);
             // Decode the color block into the bitmap bits inline func:
-            pImPos = (DWORD*)((DWORD)pBase + i * 16 + (j * 4) * m_nWidth * 4);
+            pImPos = (DWORD*)((DWORD_PTR)pBase + i * 16 + (j * 4) * m_nWidth * 4);
             DecodeColorBlock(pImPos, pBlock, m_nWidth, (DWORD*)&col_0, (DWORD*)&col_1, (DWORD*)&col_2, (DWORD*)&col_3);
             // Overwrite the previous alpha bits with the alpha block
             //  info
@@ -641,7 +641,7 @@ void Image_DXTC::DecompressDXT5()
     {
         // 8 bytes per block
         // 1 block for alpha, 1 block for color
-        DXTColBlock* pBlock = (DXTColBlock*)((DWORD)m_pCompBytes + j * xblocks * 16);
+        DXTColBlock* pBlock = (DXTColBlock*)((DWORD_PTR)m_pCompBytes + j * xblocks * 16);
         for (int i = 0; i < xblocks; i++, pBlock++)
         {
             // inline
@@ -653,7 +653,7 @@ void Image_DXTC::DecompressDXT5()
             // //TRACE("pBlock:   0x%.8x\n", pBlock );
             GetColorBlockColors(pBlock, &col_0, &col_1, &col_2, &col_3, wrd);
             // Decode the color block into the bitmap bits inline func:
-            pImPos = (DWORD*)((DWORD)pBase + i * 16 + (j * 4) * m_nWidth * 4);
+            pImPos = (DWORD*)((DWORD_PTR)pBase + i * 16 + (j * 4) * m_nWidth * 4);
             DecodeColorBlock(pImPos, pBlock, m_nWidth, (DWORD*)&col_0, (DWORD*)&col_1, (DWORD*)&col_2, (DWORD*)&col_3);
             // Overwrite the previous alpha bits with the alpha block info
             DecodeAlpha3BitLinear(pImPos, pAlphaBlock, m_nWidth, alphazero);