merge branch work back into trunk

[xonotic/netradiant.git] / libs / ddslib / ddslib.c

diff --git a/libs/ddslib/ddslib.c b/libs/ddslib/ddslib.c
index bf1a9f15e217593fff7fa365e73a43fb1747bf0c..bea6fb36c5237b1dd4f049b60a0854569a35bbf7 100644 (file)
--- a/libs/ddslib/ddslib.c
+++ b/libs/ddslib/ddslib.c
@@ -523,7 +523,7 @@ static int DDSDecompressDXT1( ddsBuffer_t *dds, int width, int height, unsigned
        for( y = 0; y < yBlocks; y++ )
        {
                /* 8 bytes per block */
-               block = (ddsColorBlock_t*) ((unsigned int) dds->data + y * xBlocks * 8);
+               block = (ddsColorBlock_t*) ((size_t) dds->data + y * xBlocks * 8);
 
                /* walk x */
                for( x = 0; x < xBlocks; x++, block++ )
@@ -569,7 +569,7 @@ static int DDSDecompressDXT3( ddsBuffer_t *dds, int width, int height, unsigned
        for( y = 0; y < yBlocks; y++ )
        {
                /* 8 bytes per block, 1 block for alpha, 1 block for color */
-               block = (ddsColorBlock_t*) ((unsigned int) dds->data + y * xBlocks * 16);
+               block = (ddsColorBlock_t*) ((size_t) dds->data + y * xBlocks * 16);
 
                /* walk x */
                for( x = 0; x < xBlocks; x++, block++ )
@@ -625,7 +625,7 @@ static int DDSDecompressDXT5( ddsBuffer_t *dds, int width, int height, unsigned
        for( y = 0; y < yBlocks; y++ )
        {
                /* 8 bytes per block, 1 block for alpha, 1 block for color */
-               block = (ddsColorBlock_t*) ((unsigned int) dds->data + y * xBlocks * 16);
+               block = (ddsColorBlock_t*) ((size_t) dds->data + y * xBlocks * 16);
 
                /* walk x */
                for( x = 0; x < xBlocks; x++, block++ )