From: Steve Underwood <steveu@haswell.coppice.org>
Date: Tue, 15 Oct 2013 15:39:59 +0000 (+0800)
Subject: Eliminate some warnings in a Windows build
X-Git-Tag: v1.4.1~11^2~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81e805165a9bce63010f7e80c59e95145fece490;p=thirdparty%2Ffreeswitch.git

Eliminate some warnings in a Windows build
---

diff --git a/libs/libg722_1/src/tables.c b/libs/libg722_1/src/tables.c
index a0eed803bf..cf15bd3f73 100644
--- a/libs/libg722_1/src/tables.c
+++ b/libs/libg722_1/src/tables.c
@@ -63,70 +63,70 @@ const int16_t int_region_standard_deviation_table[REGION_POWER_TABLE_SIZE] =
 #else
 const float region_standard_deviation_table[REGION_POWER_TABLE_SIZE] =
 {
-    2.441406247570224e-04,
-    3.452669826719395e-04,
-    4.882812495545411e-04,
-    6.905339654011486e-04,
-    9.765624991900746e-04,
-    1.381067930916839e-03,
-    1.953124998542134e-03,
-    2.762135862062757e-03,
-    3.906249997408239e-03,
-    5.524271724583683e-03,
-    7.812499995464418e-03,
-    1.104854345008369e-02,
-    1.562499999222472e-02,
-    2.209708690200003e-02,
-    3.124999998704119e-02,
-    4.419417380766535e-02,
-    6.249999997926591e-02,
-    8.838834762266132e-02,
-    1.249999999688989e-01,
-    1.767766952599839e-01,
-    2.499999999585318e-01,
-    3.535533905492901e-01,
-    4.999999999585318e-01,
-    7.071067811572251e-01,
-    1.000000000000000e+00,
-    1.414213562431740e+00,
-    2.000000000165873e+00,
-    2.828427125098059e+00,
-    4.000000000663491e+00,
-    5.656854250665278e+00,
-    8.000000001990472e+00,
-    1.131370850226887e+01,
-    1.600000000530792e+01,
-    2.262741700641438e+01,
-    3.200000001326981e+01,
-    4.525483401658204e+01,
-    6.400000003184756e+01,
-    9.050966804067060e+01,
-    1.280000000743110e+02,
-    1.810193360963542e+02,
-    2.560000001698536e+02,
-    3.620386722227349e+02,
-    5.120000003821707e+02,
-    7.240773445055215e+02,
-    1.024000000849268e+03,
-    1.448154689131149e+03,
-    2.048000001868390e+03,
-    2.896309378502505e+03,
-    4.096000004076487e+03,
-    5.792618757485434e+03,
-    8.192000008832390e+03,
-    1.158523751593169e+04,
-    1.638400001902361e+04,
-    2.317047503378509e+04,
-    3.276800004076484e+04,
-    4.634095007141347e+04,
-    6.553600008696507e+04,
-    9.268190015051374e+04,
-    1.310720001848009e+05,
-    1.853638003164007e+05,
-    2.621440003913428e+05,
-    3.707276006635486e+05,
-    5.242880008261676e+05,
-    7.414552013885899e+05
+    2.441406247570224e-04f,
+    3.452669826719395e-04f,
+    4.882812495545411e-04f,
+    6.905339654011486e-04f,
+    9.765624991900746e-04f,
+    1.381067930916839e-03f,
+    1.953124998542134e-03f,
+    2.762135862062757e-03f,
+    3.906249997408239e-03f,
+    5.524271724583683e-03f,
+    7.812499995464418e-03f,
+    1.104854345008369e-02f,
+    1.562499999222472e-02f,
+    2.209708690200003e-02f,
+    3.124999998704119e-02f,
+    4.419417380766535e-02f,
+    6.249999997926591e-02f,
+    8.838834762266132e-02f,
+    1.249999999688989e-01f,
+    1.767766952599839e-01f,
+    2.499999999585318e-01f,
+    3.535533905492901e-01f,
+    4.999999999585318e-01f,
+    7.071067811572251e-01f,
+    1.000000000000000e+00f,
+    1.414213562431740e+00f,
+    2.000000000165873e+00f,
+    2.828427125098059e+00f,
+    4.000000000663491e+00f,
+    5.656854250665278e+00f,
+    8.000000001990472e+00f,
+    1.131370850226887e+01f,
+    1.600000000530792e+01f,
+    2.262741700641438e+01f,
+    3.200000001326981e+01f,
+    4.525483401658204e+01f,
+    6.400000003184756e+01f,
+    9.050966804067060e+01f,
+    1.280000000743110e+02f,
+    1.810193360963542e+02f,
+    2.560000001698536e+02f,
+    3.620386722227349e+02f,
+    5.120000003821707e+02f,
+    7.240773445055215e+02f,
+    1.024000000849268e+03f,
+    1.448154689131149e+03f,
+    2.048000001868390e+03f,
+    2.896309378502505e+03f,
+    4.096000004076487e+03f,
+    5.792618757485434e+03f,
+    8.192000008832390e+03f,
+    1.158523751593169e+04f,
+    1.638400001902361e+04f,
+    2.317047503378509e+04f,
+    3.276800004076484e+04f,
+    4.634095007141347e+04f,
+    6.553600008696507e+04f,
+    9.268190015051374e+04f,
+    1.310720001848009e+05f,
+    1.853638003164007e+05f,
+    2.621440003913428e+05f,
+    3.707276006635486e+05f,
+    5.242880008261676e+05f,
+    7.414552013885899e+05f
 };
 #endif
 
@@ -144,70 +144,70 @@ const int16_t standard_deviation_inverse_table[REGION_POWER_TABLE_SIZE] =
 #else
 const float standard_deviation_inverse_table[REGION_POWER_TABLE_SIZE] =
 {
-    4.096000004076488e+03,
-    2.896309378502504e+03,
-    2.048000001868390e+03,
-    1.448154689131149e+03,
-    1.024000000849268e+03,
-    7.240773445055215e+02,
-    5.120000003821708e+02,
-    3.620386722227349e+02,
-    2.560000001698537e+02,
-    1.810193360963542e+02,
-    1.280000000743110e+02,
-    9.050966804067060e+01,
-    6.400000003184756e+01,
-    4.525483401658203e+01,
-    3.200000001326982e+01,
-    2.262741700641438e+01,
-    1.600000000530793e+01,
-    1.131370850226887e+01,
-    8.000000001990474e+00,
-    5.656854250665277e+00,
-    4.000000000663491e+00,
-    2.828427125098059e+00,
-    2.000000000165873e+00,
-    1.414213562431740e+00,
-    1.000000000000000e+00,
-    7.071067811572251e-01,
-    4.999999999585318e-01,
-    3.535533905492901e-01,
-    2.499999999585318e-01,
-    1.767766952599838e-01,
-    1.249999999688989e-01,
-    8.838834762266132e-02,
-    6.249999997926592e-02,
-    4.419417380766535e-02,
-    3.124999998704120e-02,
-    2.209708690200002e-02,
-    1.562499999222472e-02,
-    1.104854345008369e-02,
-    7.812499995464418e-03,
-    5.524271724583683e-03,
-    3.906249997408239e-03,
-    2.762135862062757e-03,
-    1.953124998542134e-03,
-    1.381067930916839e-03,
-    9.765624991900747e-04,
-    6.905339654011486e-04,
-    4.882812495545411e-04,
-    3.452669826719394e-04,
-    2.441406247570224e-04,
-    1.726334913216520e-04,
-    1.220703123683871e-04,
-    8.631674565366727e-05,
-    6.103515617913153e-05,
-    4.315837282325419e-05,
-    3.051757808703478e-05,
-    2.157918640983742e-05,
-    1.525878904225187e-05,
-    1.078959320402385e-05,
-    7.629394520493171e-06,
-    5.394796601564505e-06,
-    3.814697259930213e-06,
-    2.697398300558537e-06,
-    1.907348629806920e-06,
-    1.348699150167414e-06
+    4.096000004076488e+03f,
+    2.896309378502504e+03f,
+    2.048000001868390e+03f,
+    1.448154689131149e+03f,
+    1.024000000849268e+03f,
+    7.240773445055215e+02f,
+    5.120000003821708e+02f,
+    3.620386722227349e+02f,
+    2.560000001698537e+02f,
+    1.810193360963542e+02f,
+    1.280000000743110e+02f,
+    9.050966804067060e+01f,
+    6.400000003184756e+01f,
+    4.525483401658203e+01f,
+    3.200000001326982e+01f,
+    2.262741700641438e+01f,
+    1.600000000530793e+01f,
+    1.131370850226887e+01f,
+    8.000000001990474e+00f,
+    5.656854250665277e+00f,
+    4.000000000663491e+00f,
+    2.828427125098059e+00f,
+    2.000000000165873e+00f,
+    1.414213562431740e+00f,
+    1.000000000000000e+00f,
+    7.071067811572251e-01f,
+    4.999999999585318e-01f,
+    3.535533905492901e-01f,
+    2.499999999585318e-01f,
+    1.767766952599838e-01f,
+    1.249999999688989e-01f,
+    8.838834762266132e-02f,
+    6.249999997926592e-02f,
+    4.419417380766535e-02f,
+    3.124999998704120e-02f,
+    2.209708690200002e-02f,
+    1.562499999222472e-02f,
+    1.104854345008369e-02f,
+    7.812499995464418e-03f,
+    5.524271724583683e-03f,
+    3.906249997408239e-03f,
+    2.762135862062757e-03f,
+    1.953124998542134e-03f,
+    1.381067930916839e-03f,
+    9.765624991900747e-04f,
+    6.905339654011486e-04f,
+    4.882812495545411e-04f,
+    3.452669826719394e-04f,
+    2.441406247570224e-04f,
+    1.726334913216520e-04f,
+    1.220703123683871e-04f,
+    8.631674565366727e-05f,
+    6.103515617913153e-05f,
+    4.315837282325419e-05f,
+    3.051757808703478e-05f,
+    2.157918640983742e-05f,
+    1.525878904225187e-05f,
+    1.078959320402385e-05f,
+    7.629394520493171e-06f,
+    5.394796601564505e-06f,
+    3.814697259930213e-06f,
+    2.697398300558537e-06f,
+    1.907348629806920e-06f,
+    1.348699150167414e-06f
 };
 #endif
 
@@ -239,14 +239,14 @@ const float step_size[NUM_CATEGORIES] =
 
 const float step_size_inverse_table[NUM_CATEGORIES] =
 {
-    2.82805443e+00,
-    2.00000000e+00,
-    1.41422713e+00,
-    1.00000000e+00,
-    7.07113564e-01,
-    5.00000000e-01,
-    3.53556782e-01,
-    3.53556782e-01
+    2.82805443e+00f,
+    2.00000000e+00f,
+    1.41422713e+00f,
+    1.00000000e+00f,
+    7.07113564e-01f,
+    5.00000000e-01f,
+    3.53556782e-01f,
+    3.53556782e-01f
 };
 #endif
 
@@ -277,137 +277,137 @@ const float dead_zone[NUM_CATEGORIES] =
 #if !defined(G722_1_USE_FIXED_POINT)
 const float region_power_table[REGION_POWER_TABLE_SIZE] =
 {
-    5.96046448e-08,
-    1.19209290e-07,
-    2.38418579e-07,
-    4.76837158e-07,
-    9.53674316e-07,
-    1.90734863e-06,
-    3.81469727e-06,
-    7.62939453e-06,
-    1.52587891e-05,
-    3.05175781e-05,
-    6.10351562e-05,
-    1.22070312e-04,
-    2.44140625e-04,
-    4.88281250e-04,
-    9.76562500e-04,
-    1.95312500e-03,
-    3.90625000e-03,
-    7.81250000e-03,
-    1.56250000e-02,
-    3.12500000e-02,
-    6.25000000e-02,
-    1.25000000e-01,
-    2.50000000e-01,
-    5.00000000e-01,
-    1.00000000e+00,
-    2.00000000e+00,
-    4.00000000e+00,
-    8.00000000e+00,
-    1.60000000e+01,
-    3.20000000e+01,
-    6.40000000e+01,
-    1.28000000e+02,
-    2.56000000e+02,
-    5.12000000e+02,
-    1.02400000e+03,
-    2.04800000e+03,
-    4.09600000e+03,
-    8.19200000e+03,
-    1.63840000e+04,
-    3.27680000e+04,
-    6.55360000e+04,
-    1.31072000e+05,
-    2.62144000e+05,
-    5.24288000e+05,
-    1.04857600e+06,
-    2.09715200e+06,
-    4.19430400e+06,
-    8.38860800e+06,
-    1.67772160e+07,
-    3.35544320e+07,
-    6.71088640e+07,
-    1.34217728e+08,
-    2.68435456e+08,
-    5.36870912e+08,
-    1.07374182e+09,
-    2.14748365e+09,
-    4.29496730e+09,
-    8.58993459e+09,
-    1.71798692e+10,
-    3.43597384e+10,
-    6.87194767e+10,
-    1.37438953e+11,
-    2.74877907e+11,
-    5.49755814e+11
+    5.96046448e-08f,
+    1.19209290e-07f,
+    2.38418579e-07f,
+    4.76837158e-07f,
+    9.53674316e-07f,
+    1.90734863e-06f,
+    3.81469727e-06f,
+    7.62939453e-06f,
+    1.52587891e-05f,
+    3.05175781e-05f,
+    6.10351562e-05f,
+    1.22070312e-04f,
+    2.44140625e-04f,
+    4.88281250e-04f,
+    9.76562500e-04f,
+    1.95312500e-03f,
+    3.90625000e-03f,
+    7.81250000e-03f,
+    1.56250000e-02f,
+    3.12500000e-02f,
+    6.25000000e-02f,
+    1.25000000e-01f,
+    2.50000000e-01f,
+    5.00000000e-01f,
+    1.00000000e+00f,
+    2.00000000e+00f,
+    4.00000000e+00f,
+    8.00000000e+00f,
+    1.60000000e+01f,
+    3.20000000e+01f,
+    6.40000000e+01f,
+    1.28000000e+02f,
+    2.56000000e+02f,
+    5.12000000e+02f,
+    1.02400000e+03f,
+    2.04800000e+03f,
+    4.09600000e+03f,
+    8.19200000e+03f,
+    1.63840000e+04f,
+    3.27680000e+04f,
+    6.55360000e+04f,
+    1.31072000e+05f,
+    2.62144000e+05f,
+    5.24288000e+05f,
+    1.04857600e+06f,
+    2.09715200e+06f,
+    4.19430400e+06f,
+    8.38860800e+06f,
+    1.67772160e+07f,
+    3.35544320e+07f,
+    6.71088640e+07f,
+    1.34217728e+08f,
+    2.68435456e+08f,
+    5.36870912e+08f,
+    1.07374182e+09f,
+    2.14748365e+09f,
+    4.29496730e+09f,
+    8.58993459e+09f,
+    1.71798692e+10f,
+    3.43597384e+10f,
+    6.87194767e+10f,
+    1.37438953e+11f,
+    2.74877907e+11f,
+    5.49755814e+11f
 };
 
 const float region_power_table_boundary[REGION_POWER_TABLE_SIZE - 1] =
 {
-    8.42936956e-08,
-    1.68587391e-07,
-    3.37174782e-07,
-    6.74349565e-07,
-    1.34869913e-06,
-    2.69739826e-06,
-    5.39479652e-06,
-    1.07895930e-05,
-    2.15791861e-05,
-    4.31583721e-05,
-    8.63167443e-05,
-    1.72633489e-04,
-    3.45266977e-04,
-    6.90533954e-04,
-    1.38106791e-03,
-    2.76213582e-03,
-    5.52427163e-03,
-    1.10485433e-02,
-    2.20970865e-02,
-    4.41941731e-02,
-    8.83883461e-02,
-    1.76776692e-01,
-    3.53553385e-01,
-    7.07106769e-01,
-    1.41421354e+00,
-    2.82842708e+00,
-    5.65685415e+00,
-    1.13137083e+01,
-    2.26274166e+01,
-    4.52548332e+01,
-    9.05096664e+01,
-    1.81019333e+02,
-    3.62038666e+02,
-    7.24077332e+02,
-    1.44815466e+03,
-    2.89630933e+03,
-    5.79261865e+03,
-    1.15852373e+04,
-    2.31704746e+04,
-    4.63409492e+04,
-    9.26818984e+04,
-    1.85363797e+05,
-    3.70727594e+05,
-    7.41455188e+05,
-    1.48291038e+06,
-    2.96582075e+06,
-    5.93164150e+06,
-    1.18632830e+07,
-    2.37265660e+07,
-    4.74531320e+07,
-    9.49062640e+07,
-    1.89812528e+08,
-    3.79625056e+08,
-    7.59250112e+08,
-    1.51850022e+09,
-    3.03700045e+09,
-    6.07400090e+09,
-    1.21480018e+10,
-    2.42960036e+10,
-    4.85920072e+10,
-    9.71840143e+10,
-    1.94368029e+11,
-    3.88736057e+11
+    8.42936956e-08f,
+    1.68587391e-07f,
+    3.37174782e-07f,
+    6.74349565e-07f,
+    1.34869913e-06f,
+    2.69739826e-06f,
+    5.39479652e-06f,
+    1.07895930e-05f,
+    2.15791861e-05f,
+    4.31583721e-05f,
+    8.63167443e-05f,
+    1.72633489e-04f,
+    3.45266977e-04f,
+    6.90533954e-04f,
+    1.38106791e-03f,
+    2.76213582e-03f,
+    5.52427163e-03f,
+    1.10485433e-02f,
+    2.20970865e-02f,
+    4.41941731e-02f,
+    8.83883461e-02f,
+    1.76776692e-01f,
+    3.53553385e-01f,
+    7.07106769e-01f,
+    1.41421354e+00f,
+    2.82842708e+00f,
+    5.65685415e+00f,
+    1.13137083e+01f,
+    2.26274166e+01f,
+    4.52548332e+01f,
+    9.05096664e+01f,
+    1.81019333e+02f,
+    3.62038666e+02f,
+    7.24077332e+02f,
+    1.44815466e+03f,
+    2.89630933e+03f,
+    5.79261865e+03f,
+    1.15852373e+04f,
+    2.31704746e+04f,
+    4.63409492e+04f,
+    9.26818984e+04f,
+    1.85363797e+05f,
+    3.70727594e+05f,
+    7.41455188e+05f,
+    1.48291038e+06f,
+    2.96582075e+06f,
+    5.93164150e+06f,
+    1.18632830e+07f,
+    2.37265660e+07f,
+    4.74531320e+07f,
+    9.49062640e+07f,
+    1.89812528e+08f,
+    3.79625056e+08f,
+    7.59250112e+08f,
+    1.51850022e+09f,
+    3.03700045e+09f,
+    6.07400090e+09f,
+    1.21480018e+10f,
+    2.42960036e+10f,
+    4.85920072e+10f,
+    9.71840143e+10f,
+    1.94368029e+11f,
+    3.88736057e+11f
 };
 #endif