Fix 64bit problem with dds loader, not yet tested, though.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3731 dfc29bdd-3216-0410-991c-e03cc46cb475

source/Irrlicht/CImageLoaderDDS.cpp

@@ -28,21 +28,21 @@ namespace irr
 namespace video
 {
 
+namespace
+{
+
 /*!
 	DDSDecodePixelFormat()
 	determines which pixel format the dds texture is in
 */
 void DDSDecodePixelFormat( ddsBuffer *dds, eDDSPixelFormat *pf )
 {
-	u32	fourCC;
-
-
 	/* dummy check */
 	if(	dds == NULL || pf == NULL )
 		return;
 
 	/* extract fourCC */
-	fourCC = dds->pixelFormat.fourCC;
+	const u32 fourCC = dds->pixelFormat.fourCC;
 
 	/* test it */
 	if( fourCC == 0 )
@@ -62,7 +62,6 @@ void DDSDecodePixelFormat( ddsBuffer *dds, eDDSPixelFormat *pf )
 }
 
 
-
 /*!
 DDSGetInfo()
 extracts relevant info from a dds texture, returns 0 on success
@@ -93,7 +92,6 @@ s32 DDSGetInfo( ddsBuffer *dds, s32 *width, s32 *height, eDDSPixelFormat *pf )
 }
 
 
-
 /*!
 	DDSGetColorBlockColors()
 	extracts colors from a dds color block
@@ -188,14 +186,13 @@ void DDSGetColorBlockColors( ddsColorBlock *block, ddsColor colors[ 4 ] )
 }
 
 
-
 /*
 DDSDecodeColorBlock()
 decodes a dds color block
 fixme: make endian-safe
 */
 
-static void DDSDecodeColorBlock( u32 *pixel, ddsColorBlock *block, s32 width, u32 colors[ 4 ] )
+void DDSDecodeColorBlock( u32 *pixel, ddsColorBlock *block, s32 width, u32 colors[ 4 ] )
 {
 	s32				r, n;
 	u32	bits;
@@ -246,13 +243,11 @@ static void DDSDecodeColorBlock( u32 *pixel, ddsColorBlock *block, s32 width, u3
 }
 
 
-
 /*
 DDSDecodeAlphaExplicit()
 decodes a dds explicit alpha block
 */
-
-static void DDSDecodeAlphaExplicit( u32 *pixel, ddsAlphaBlockExplicit *alphaBlock, s32 width, u32 alphaZero )
+void DDSDecodeAlphaExplicit( u32 *pixel, ddsAlphaBlockExplicit *alphaBlock, s32 width, u32 alphaZero )
 {
 	s32				row, pix;
 	u16	word;
@@ -279,7 +274,6 @@ static void DDSDecodeAlphaExplicit( u32 *pixel, ddsAlphaBlockExplicit *alphaBloc
 			*pixel |= *((u32*) &color);
 			word >>= 4;		/* move next bits to lowest 4 */
 			pixel++;		/* move to next pixel in the row */
-
 		}
 	}
 }
@@ -290,8 +284,7 @@ static void DDSDecodeAlphaExplicit( u32 *pixel, ddsAlphaBlockExplicit *alphaBloc
 DDSDecodeAlpha3BitLinear()
 decodes interpolated alpha block
 */
-
-static void DDSDecodeAlpha3BitLinear( u32 *pixel, ddsAlphaBlock3BitLinear *alphaBlock, s32 width, u32 alphaZero )
+void DDSDecodeAlpha3BitLinear( u32 *pixel, ddsAlphaBlock3BitLinear *alphaBlock, s32 width, u32 alphaZero )
 {
 
 	s32 row, pix;
@@ -300,7 +293,6 @@ static void DDSDecodeAlpha3BitLinear( u32 *pixel, ddsAlphaBlock3BitLinear *alpha
 	u16 alphas[ 8 ];
 	ddsColor aColors[ 4 ][ 4 ];
 
-
 	/* get initial alphas */
 	alphas[ 0 ] = alphaBlock->alpha0;
 	alphas[ 1 ] = alphaBlock->alpha1;
@@ -397,7 +389,6 @@ static void DDSDecodeAlpha3BitLinear( u32 *pixel, ddsAlphaBlock3BitLinear *alpha
 }
 
 
-
 /*
 DDSDecompressDXT1()
 decompresses a dxt1 format texture
@@ -409,7 +400,6 @@ s32 DDSDecompressDXT1( ddsBuffer *dds, s32 width, s32 height, u8 *pixels )
 	ddsColorBlock *block;
 	ddsColor colors[ 4 ];
 
-
 	/* setup */
 	xBlocks = width / 4;
 	yBlocks = height / 4;
@@ -418,7 +408,7 @@ s32 DDSDecompressDXT1( ddsBuffer *dds, s32 width, s32 height, u8 *pixels )
 	for( y = 0; y < yBlocks; y++ )
 	{
 		/* 8 bytes per block */
-		block = (ddsColorBlock*) ((u32) dds->data + y * xBlocks * 8);
+		block = (ddsColorBlock*) (dds->data + y * xBlocks * 8);
 
 		/* walk x */
 		for( x = 0; x < xBlocks; x++, block++ )
@@ -434,7 +424,6 @@ s32 DDSDecompressDXT1( ddsBuffer *dds, s32 width, s32 height, u8 *pixels )
 }
 
 
-
 /*
 DDSDecompressDXT3()
 decompresses a dxt3 format texture
@@ -448,7 +437,6 @@ s32 DDSDecompressDXT3( ddsBuffer *dds, s32 width, s32 height, u8 *pixels )
 	ddsAlphaBlockExplicit *alphaBlock;
 	ddsColor colors[ 4 ];
 
-
 	/* setup */
 	xBlocks = width / 4;
 	yBlocks = height / 4;
@@ -464,7 +452,7 @@ s32 DDSDecompressDXT3( ddsBuffer *dds, s32 width, s32 height, u8 *pixels )
 	for( y = 0; y < yBlocks; y++ )
 	{
 		/* 8 bytes per block, 1 block for alpha, 1 block for color */
-		block = (ddsColorBlock*) ((u32) dds->data + y * xBlocks * 16);
+		block = (ddsColorBlock*) (dds->data + y * xBlocks * 16);
 
 		/* walk x */
 		for( x = 0; x < xBlocks; x++, block++ )
@@ -490,7 +478,6 @@ s32 DDSDecompressDXT3( ddsBuffer *dds, s32 width, s32 height, u8 *pixels )
 }
 
 
-
 /*
 DDSDecompressDXT5()
 decompresses a dxt5 format texture
@@ -503,7 +490,6 @@ s32 DDSDecompressDXT5( ddsBuffer *dds, s32 width, s32 height, u8 *pixels )
 	ddsAlphaBlock3BitLinear *alphaBlock;
 	ddsColor colors[ 4 ];
 
-
 	/* setup */
 	xBlocks = width / 4;
 	yBlocks = height / 4;
@@ -519,7 +505,7 @@ s32 DDSDecompressDXT5( ddsBuffer *dds, s32 width, s32 height, u8 *pixels )
 	for( y = 0; y < yBlocks; y++ )
 	{
 		/* 8 bytes per block, 1 block for alpha, 1 block for color */
-		block = (ddsColorBlock*) ((u32) dds->data + y * xBlocks * 16);
+		block = (ddsColorBlock*) (dds->data + y * xBlocks * 16);
 
 		/* walk x */
 		for( x = 0; x < xBlocks; x++, block++ )
@@ -545,62 +531,49 @@ s32 DDSDecompressDXT5( ddsBuffer *dds, s32 width, s32 height, u8 *pixels )
 }
 
 
-
 /*
 DDSDecompressDXT2()
 decompresses a dxt2 format texture (fixme: un-premultiply alpha)
 */
 s32 DDSDecompressDXT2( ddsBuffer *dds, s32 width, s32 height, u8 *pixels )
 {
-	s32		r;
-
-
 	/* decompress dxt3 first */
-	r = DDSDecompressDXT3( dds, width, height, pixels );
+	const s32 r = DDSDecompressDXT3( dds, width, height, pixels );
 
 	/* return to sender */
 	return r;
 }
 
 
-
 /*
 DDSDecompressDXT4()
 decompresses a dxt4 format texture (fixme: un-premultiply alpha)
 */
 s32 DDSDecompressDXT4( ddsBuffer *dds, s32 width, s32 height, u8 *pixels )
 {
-	s32		r;
-
-
 	/* decompress dxt5 first */
-	r = DDSDecompressDXT5( dds, width, height, pixels );
+	const s32 r = DDSDecompressDXT5( dds, width, height, pixels );
 
 	/* return to sender */
 	return r;
 }
 
 
-
 /*
 DDSDecompressARGB8888()
 decompresses an argb 8888 format texture
 */
 s32 DDSDecompressARGB8888( ddsBuffer *dds, s32 width, s32 height, u8 *pixels )
 {
-	s32							x, y;
-	u8				*in, *out;
-
-
 	/* setup */
-	in = dds->data;
-	out = pixels;
+	u8* in = dds->data;
+	u8* out = pixels;
 
 	/* walk y */
-	for( y = 0; y < height; y++ )
+	for(s32 y = 0; y < height; y++)
 	{
 		/* walk x */
-		for( x = 0; x < width; x++ )
+		for(s32 x = 0; x < width; x++)
 		{
 			*out++ = *in++;
 			*out++ = *in++;
@@ -614,20 +587,18 @@ s32 DDSDecompressARGB8888( ddsBuffer *dds, s32 width, s32 height, u8 *pixels )
 }
 
 
-
 /*
 DDSDecompress()
 decompresses a dds texture into an rgba image buffer, returns 0 on success
 */
 s32 DDSDecompress( ddsBuffer *dds, u8 *pixels )
 {
-	s32			width, height, r;
+	s32 width, height;
 	eDDSPixelFormat pf;
 
-
 	/* get dds info */
-	r = DDSGetInfo( dds, &width, &height, &pf );
-	if( r )
+	s32 r = DDSGetInfo( dds, &width, &height, &pf );
+	if ( r )
 		return r;
 
 	/* decompress */
@@ -669,6 +640,9 @@ s32 DDSDecompress( ddsBuffer *dds, u8 *pixels )
 	return r;
 }
 
+} // end anonymous namespace
+
+
 //! returns true if the file maybe is able to be loaded by this class
 //! based on the file extension (e.g. ".tga")
 bool CImageLoaderDDS::isALoadableFileExtension(const io::path& filename) const
@@ -677,8 +651,6 @@ bool CImageLoaderDDS::isALoadableFileExtension(const io::path& filename) const
 }
 
 
-
-
 //! returns true if the file maybe is able to be loaded by this class
 bool CImageLoaderDDS::isALoadableFileFormat(io::IReadFile* file) const
 {
@@ -691,11 +663,10 @@ bool CImageLoaderDDS::isALoadableFileFormat(io::IReadFile* file) const
 	s32 width, height;
 	eDDSPixelFormat pixelFormat;
 
-	return 0 == DDSGetInfo( &header, &width, &height, &pixelFormat);
+	return (0 == DDSGetInfo( &header, &width, &height, &pixelFormat));
 }
 
 
-
 //! creates a surface from the file
 IImage* CImageLoaderDDS::loadImage(io::IReadFile* file) const
 {
@@ -727,7 +698,7 @@ IImage* CImageLoaderDDS::loadImage(io::IReadFile* file) const
 }
 
 
-//! creates a loader which is able to load tgas
+//! creates a loader which is able to load dds images
 IImageLoader* createImageLoaderDDS()
 {
 	return new CImageLoaderDDS();
@@ -738,4 +709,3 @@ IImageLoader* createImageLoaderDDS()
 } // end namespace irr
 
 #endif
-

source/Irrlicht/CImageLoaderDDS.h

@@ -9,13 +9,13 @@
 
 #include "IImageLoader.h"
 
-
+#define _IRR_COMPILE_WITH_DDS_LOADER_
 namespace irr
 {
 namespace video
 {
 
-#if defined(_IRR_COMPILE_WITH_DDS_LOADER_) || defined(_IRR_COMPILE_WITH_DDS_WRITER_)
+#if defined(_IRR_COMPILE_WITH_DDS_LOADER_)
 
 // byte-align structures
 #if defined(_MSC_VER) ||  defined(__BORLANDC__) || defined (__BCPLUSPLUS__)
@@ -195,13 +195,6 @@ struct ddsColor
 } PACK_STRUCT;
 
 
-
-/* public functions */
-s32	DDSGetInfo( ddsBuffer *dds, s32 *width, s32 *height, eDDSPixelFormat *pf );
-s32 DDSDecompress( ddsBuffer *dds, u8 *pixels );
-
-
-
 /* endian tomfoolery */
 typedef union
 {
@@ -295,7 +288,7 @@ floatSwapUnion;
 #ifdef _IRR_COMPILE_WITH_DDS_LOADER_
 
 /*!
-	Surface Loader for targa images
+	Surface Loader for DDS images
 */
 class CImageLoaderDDS : public IImageLoader
 {
@@ -315,7 +308,7 @@ private:
 
 };
 
-#endif // compiled with loader
+#endif // compiled with DDS loader
 
 } // end namespace video
 } // end namespace irr