tweak warning level up.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3131 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/codec/gsm/inc/private.h b/libs/codec/gsm/inc/private.h
index 46071a662db8cb6763f9a7cff9ac94ed81711d37..82efc929ac6acd3e09d03cb5003389e15db9accb 100644 (file)
--- a/libs/codec/gsm/inc/private.h
+++ b/libs/codec/gsm/inc/private.h
@@ -33,7 +33,7 @@ struct gsm_state {
        word            v[9];           /* short_term.c, synthesis      */
        word            msr;            /* decoder.c,   Postprocessing  */
 
-       char            verbose;        /* only used if !NDEBUG         */
+       int                     verbose;        /* only used if !NDEBUG         */
        char            fast;           /* only used if FAST            */
 
        char            wav_fmt;        /* only used if WAV49 defined   */

diff --git a/libs/codec/gsm/libgsm.vcproj b/libs/codec/gsm/libgsm.vcproj
index 1d36add58cfc47c5d2f3bbe1de8ecc33f77e16fa..75e3e4398fa11aee2c3e9512e7b680bb6a20696f 100644 (file)
--- a/libs/codec/gsm/libgsm.vcproj
+++ b/libs/codec/gsm/libgsm.vcproj
@@ -46,9 +46,10 @@
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
+                               WarningLevel="4"\r
                                Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4131;4100"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -107,9 +108,10 @@
                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
+                               WarningLevel="4"\r
                                Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4131;4100"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r

diff --git a/libs/codec/gsm/src/long_term.c b/libs/codec/gsm/src/long_term.c
index aabd14a42ffe8d77bd8e50aea9fcf3c94e2f3c7c..954e2060be2d9d9b98782af13ce9b252497993d3 100644 (file)
--- a/libs/codec/gsm/src/long_term.c
+++ b/libs/codec/gsm/src/long_term.c
@@ -194,7 +194,7 @@ static void Calculation_of_the_LTP_parameters P4((d,dp,bc_out,Nc_out),
        /*  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
         */
@@ -231,7 +231,7 @@ static void Calculation_of_the_LTP_parameters P4((d,dp,bc_out,Nc_out),
 
                if (L_result > L_max) {
 
-                       Nc    = lambda;
+                       Nc    = (word)lambda;
                        L_max = L_result;
                }
        }

diff --git a/libs/codec/gsm/src/preprocess.c b/libs/codec/gsm/src/preprocess.c
index b1a7089f677248461a0581993c41da9c36386fb1..80981b00783b26809a6dd232c2f94b4be75e9ce1 100644 (file)
--- a/libs/codec/gsm/src/preprocess.c
+++ b/libs/codec/gsm/src/preprocess.c
@@ -40,7 +40,7 @@ void Gsm_Preprocess P3((S, s, so),
 
        word       z1 = S->z1;
        longword L_z2 = S->L_z2;
-       word       mp = S->mp;
+       word       mp = (word)S->mp;
 
        word            s1;
        longword      L_s2;
@@ -59,7 +59,7 @@ void Gsm_Preprocess P3((S, s, so),
 
        /*  4.2.1   Downscaling of the input signal
         */
-               SO = SASR( *s, 3 ) << 2;
+               SO = (word)SASR( *s, 3 ) << 2;
                s++;
 
                assert (SO >= -0x4000); /* downscaled by     */

diff --git a/libs/codec/gsm/src/rpe.c b/libs/codec/gsm/src/rpe.c
index c6cb05146f47f4b91f46ba9d84242805ef4c0f8b..51ab12634d9f86f56f9b04db64a2c481de80a0c4 100644 (file)
--- a/libs/codec/gsm/src/rpe.c
+++ b/libs/codec/gsm/src/rpe.c
@@ -232,7 +232,7 @@ static void APCM_quantization_xmaxc_to_exp_mant P3((xmaxc,exp_out,mant_out),
         */
 
        exp = 0;
-       if (xmaxc > 15) exp = SASR(xmaxc, 3) - 1;
+       if (xmaxc > 15) exp = (word)SASR(xmaxc, 3) - 1;
        mant = xmaxc - (exp << 3);
 
        if (mant == 0) {
@@ -283,13 +283,13 @@ static void APCM_quantization P5((xM,xMc,mant_out,exp_out,xmaxc_out),
         */
 
        exp   = 0;
-       temp  = SASR( xmax, 9 );
+       temp  = (word)SASR( xmax, 9 );
        itest = 0;
 
        for (i = 0; i <= 5; i++) {
 
                itest |= (temp <= 0);
-               temp = SASR( temp, 1 );
+               temp = (word)SASR( temp, 1 );
 
                assert(exp <= 5);
                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 = (word) GSM_MULT( temp, temp2 );
-               temp = SASR(temp, 12);
+               temp = (word)SASR(temp, 12);
                xMc[i] = temp + 4;              /* see note below */
        }
 

diff --git a/libs/codec/gsm/src/short_term.c b/libs/codec/gsm/src/short_term.c
index b953d5b262dfc27c0048deffdf56a012c23a5707..aeec28589977574596c653ff2a036e578e94ab62 100644 (file)
--- a/libs/codec/gsm/src/short_term.c
+++ b/libs/codec/gsm/src/short_term.c
@@ -167,9 +167,9 @@ static void LARp_to_rp P1((LARp),
 
                if (*LARp < 0) {
                        temp = *LARp == MIN_WORD ? MAX_WORD : -(*LARp);
-                       *LARp = - ((temp < 11059) ? temp << 1
-                               : ((temp < 20070) ? temp + 11059
-                               :  (word) GSM_ADD( temp >> 2, 26112 )));
+                       *LARp =(word)( - ((temp < 11059) ? (word)(temp << 1)
+                               : ((temp < 20070) ? (word)(temp + 11059)
+                               :  (word) GSM_ADD( temp >> 2, 26112 ))));
                } else {
                        temp  = *LARp;
                        *LARp =    (temp < 11059) ? temp << 1