changeset 2316:62391135da44

fixed some warnings
author Cristi Magherusan <majeru@atheme.org>
date Tue, 15 Jan 2008 12:35:54 +0200
parents 8f3476f7a696
children 447dce6f59f3 0be42d832217
files src/aac/libfaad2/cfft.c src/aac/libfaad2/ic_predict.c src/aac/libfaad2/ps_dec.c src/cue/cuesheet.c src/modplug/load_ptm.cxx src/modplug/modplugbmp.cxx
diffstat 6 files changed, 18 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/src/aac/libfaad2/cfft.c	Mon Jan 14 19:20:57 2008 +0100
+++ b/src/aac/libfaad2/cfft.c	Tue Jan 15 12:35:54 2008 +0200
@@ -849,12 +849,12 @@
 
 void cfftf(cfft_info *cfft, complex_t *c)
 {
-    cfftf1neg(cfft->n, c, cfft->work, (const uint16_t*)cfft->ifac, (const complex_t*)cfft->tab, -1);
+    cfftf1neg(cfft->n, c, cfft->work, (const uint16_t*)cfft->ifac, (const complex_t*)(void*)&(cfft->tab), -1);
 }
 
 void cfftb(cfft_info *cfft, complex_t *c)
 {
-    cfftf1pos(cfft->n, c, cfft->work, (const uint16_t*)cfft->ifac, (const complex_t*)cfft->tab, +1);
+    cfftf1pos(cfft->n, c, cfft->work, (const uint16_t*)cfft->ifac, (const complex_t*)(void*)&(cfft->tab), +1);
 }
 
 static void cffti1(uint16_t n, complex_t *wa, uint16_t *ifac)
--- a/src/aac/libfaad2/ic_predict.c	Mon Jan 14 19:20:57 2008 +0100
+++ b/src/aac/libfaad2/ic_predict.c	Tue Jan 15 12:35:54 2008 +0200
@@ -52,16 +52,16 @@
         tmp2 = tmp;                             /* add 1 lsb and elided one */
         tmp &= (uint32_t)0xff800000;       /* extract exponent and sign */
         
-        *pf = *(float32_t*)&tmp1 + *(float32_t*)&tmp2 - *(float32_t*)&tmp;
+        *pf = *(float32_t*)(void*)&tmp1 + *(float32_t*)(void*)&tmp2 - *(float32_t*)(void*)&tmp;
     } else {
-        *pf = *(float32_t*)&tmp;
+        *pf = *(float32_t*)(void*)&tmp;
     }
 }
 
 static int16_t quant_pred(float32_t x)
 {
     int16_t q;
-    uint32_t *tmp = (uint32_t*)&x;
+    uint32_t *tmp = (uint32_t*)(void*)&x;
 
     q = (int16_t)(*tmp>>16);
 
@@ -71,7 +71,7 @@
 static float32_t inv_quant_pred(int16_t q)
 {
     float32_t x;
-    uint32_t *tmp = (uint32_t*)&x;
+    uint32_t *tmp = (uint32_t*)(void*)&x;
     *tmp = ((uint32_t)q)<<16;
 
     return x;
--- a/src/aac/libfaad2/ps_dec.c	Mon Jan 14 19:20:57 2008 +0100
+++ b/src/aac/libfaad2/ps_dec.c	Tue Jan 15 12:35:54 2008 +0200
@@ -1030,7 +1030,7 @@
                            qmf_t X_hybrid_left[32][32], qmf_t X_hybrid_right[32][32])
 {
     uint8_t gr, n, m, bk;
-    uint8_t temp_delay;
+    uint8_t temp_delay=0;
     uint8_t sb, maxsb;
     const complex_t *Phi_Fract_SubQmf;
     uint8_t temp_delay_ser[NO_ALLPASS_LINKS];
@@ -1430,9 +1430,10 @@
     uint8_t sb, maxsb;
     uint8_t env;
     uint8_t nr_ipdopd_par;
-    complex_t h11, h12, h21, h22;
-    complex_t H11, H12, H21, H22;
-    complex_t deltaH11, deltaH12, deltaH21, deltaH22;
+    complex_t h11={0,0}, h12={0,0}, h21={0,0}, h22={0,0};
+    complex_t H11={0,0}, H12={0,0}, H21={0,0}, H22={0,0};
+    complex_t deltaH11={0,0}, deltaH12={0,0}, deltaH21={0,0}, deltaH22={0,0};
+    
     complex_t tempLeft;
     complex_t tempRight;
     complex_t phaseLeft;
--- a/src/cue/cuesheet.c	Mon Jan 14 19:20:57 2008 +0100
+++ b/src/cue/cuesheet.c	Tue Jan 15 12:35:54 2008 +0200
@@ -230,7 +230,7 @@
 	ProbeResult *pr;
 	InputPlugin *dec;
 
-	Tuple *phys_tuple, *out;
+	Tuple *phys_tuple=NULL, *out;
 
         if (_path != NULL && *_path == '?')
         {
--- a/src/modplug/load_ptm.cxx	Mon Jan 14 19:20:57 2008 +0100
+++ b/src/modplug/load_ptm.cxx	Tue Jan 15 12:35:54 2008 +0200
@@ -115,10 +115,10 @@
 		{
 			UINT smpflg = RS_PCM8D;
 			DWORD samplepos;
-			pins->nLength = bswapLE32(*(LPDWORD)(psmp->length));
-			pins->nLoopStart = bswapLE32(*(LPDWORD)(psmp->loopbeg));
-			pins->nLoopEnd = bswapLE32(*(LPDWORD)(psmp->loopend));
-			samplepos = bswapLE32(*(LPDWORD)(&psmp->fileofs));
+			pins->nLength = bswapLE32(*(LPDWORD)(void*)(psmp->length));
+			pins->nLoopStart = bswapLE32(*(LPDWORD)(void*)(psmp->loopbeg));
+			pins->nLoopEnd = bswapLE32(*(LPDWORD)(void*)(psmp->loopend));
+			samplepos = bswapLE32(*(LPDWORD)(void*)(&psmp->fileofs));
 			if (psmp->sampletype & 4) pins->uFlags |= CHN_LOOP;
 			if (psmp->sampletype & 8) pins->uFlags |= CHN_PINGPONGLOOP;
 			if (psmp->sampletype & 16)
--- a/src/modplug/modplugbmp.cxx	Mon Jan 14 19:20:57 2008 +0100
+++ b/src/modplug/modplugbmp.cxx	Tue Jan 15 12:35:54 2008 +0200
@@ -335,8 +335,8 @@
 
 void ModplugXMMS::PlayFile(const string& aFilename, InputPlayback *ipb)
 {
-	int32 aLength;
-	char *aModName;
+	int32 aLength=0;
+	char *aModName=NULL;
 	mStopped = true;
 	mPaused = false;