tweak warning level up.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3131 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2006-10-21 01:32:11 +00:00
parent 59f3204d61
commit 796ed1813e
6 changed files with 16 additions and 14 deletions

View File

@ -33,7 +33,7 @@ struct gsm_state {
word v[9]; /* short_term.c, synthesis */ word v[9]; /* short_term.c, synthesis */
word msr; /* decoder.c, Postprocessing */ word msr; /* decoder.c, Postprocessing */
char verbose; /* only used if !NDEBUG */ int verbose; /* only used if !NDEBUG */
char fast; /* only used if FAST */ char fast; /* only used if FAST */
char wav_fmt; /* only used if WAV49 defined */ char wav_fmt; /* only used if WAV49 defined */

View File

@ -46,9 +46,10 @@
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="4"
Detect64BitPortabilityProblems="true" Detect64BitPortabilityProblems="true"
DebugInformationFormat="3" DebugInformationFormat="3"
DisableSpecificWarnings="4131;4100"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
@ -107,9 +108,10 @@
PreprocessorDefinitions="WIN32;NDEBUG;_LIB" PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="4"
Detect64BitPortabilityProblems="true" Detect64BitPortabilityProblems="true"
DebugInformationFormat="3" DebugInformationFormat="3"
DisableSpecificWarnings="4131;4100"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"

View File

@ -194,7 +194,7 @@ static void Calculation_of_the_LTP_parameters P4((d,dp,bc_out,Nc_out),
/* Initialization of a working array wt /* Initialization of a working array wt
*/ */
for (k = 0; k <= 39; k++) wt[k] = SASR( d[k], scal ); for (k = 0; k <= 39; k++) wt[k] = (word)SASR( d[k], scal );
/* Search for the maximum cross-correlation and coding of the LTP lag /* Search for the maximum cross-correlation and coding of the LTP lag
*/ */
@ -231,7 +231,7 @@ static void Calculation_of_the_LTP_parameters P4((d,dp,bc_out,Nc_out),
if (L_result > L_max) { if (L_result > L_max) {
Nc = lambda; Nc = (word)lambda;
L_max = L_result; L_max = L_result;
} }
} }

View File

@ -40,7 +40,7 @@ void Gsm_Preprocess P3((S, s, so),
word z1 = S->z1; word z1 = S->z1;
longword L_z2 = S->L_z2; longword L_z2 = S->L_z2;
word mp = S->mp; word mp = (word)S->mp;
word s1; word s1;
longword L_s2; longword L_s2;
@ -59,7 +59,7 @@ void Gsm_Preprocess P3((S, s, so),
/* 4.2.1 Downscaling of the input signal /* 4.2.1 Downscaling of the input signal
*/ */
SO = SASR( *s, 3 ) << 2; SO = (word)SASR( *s, 3 ) << 2;
s++; s++;
assert (SO >= -0x4000); /* downscaled by */ assert (SO >= -0x4000); /* downscaled by */

View File

@ -232,7 +232,7 @@ static void APCM_quantization_xmaxc_to_exp_mant P3((xmaxc,exp_out,mant_out),
*/ */
exp = 0; exp = 0;
if (xmaxc > 15) exp = SASR(xmaxc, 3) - 1; if (xmaxc > 15) exp = (word)SASR(xmaxc, 3) - 1;
mant = xmaxc - (exp << 3); mant = xmaxc - (exp << 3);
if (mant == 0) { if (mant == 0) {
@ -283,13 +283,13 @@ static void APCM_quantization P5((xM,xMc,mant_out,exp_out,xmaxc_out),
*/ */
exp = 0; exp = 0;
temp = SASR( xmax, 9 ); temp = (word)SASR( xmax, 9 );
itest = 0; itest = 0;
for (i = 0; i <= 5; i++) { for (i = 0; i <= 5; i++) {
itest |= (temp <= 0); itest |= (temp <= 0);
temp = SASR( temp, 1 ); temp = (word)SASR( temp, 1 );
assert(exp <= 5); assert(exp <= 5);
if (itest == 0) exp++; /* exp = add (exp, 1) */ if (itest == 0) exp++; /* exp = add (exp, 1) */
@ -333,7 +333,7 @@ static void APCM_quantization P5((xM,xMc,mant_out,exp_out,xmaxc_out),
temp = xM[i] << temp1; temp = xM[i] << temp1;
temp = (word) GSM_MULT( temp, temp2 ); temp = (word) GSM_MULT( temp, temp2 );
temp = SASR(temp, 12); temp = (word)SASR(temp, 12);
xMc[i] = temp + 4; /* see note below */ xMc[i] = temp + 4; /* see note below */
} }

View File

@ -167,9 +167,9 @@ static void LARp_to_rp P1((LARp),
if (*LARp < 0) { if (*LARp < 0) {
temp = *LARp == MIN_WORD ? MAX_WORD : -(*LARp); temp = *LARp == MIN_WORD ? MAX_WORD : -(*LARp);
*LARp = - ((temp < 11059) ? temp << 1 *LARp =(word)( - ((temp < 11059) ? (word)(temp << 1)
: ((temp < 20070) ? temp + 11059 : ((temp < 20070) ? (word)(temp + 11059)
: (word) GSM_ADD( temp >> 2, 26112 ))); : (word) GSM_ADD( temp >> 2, 26112 ))));
} else { } else {
temp = *LARp; temp = *LARp;
*LARp = (temp < 11059) ? temp << 1 *LARp = (temp < 11059) ? temp << 1