From 31ffa3f7198122adb23c6182ef3edab0e67b5c81 Mon Sep 17 00:00:00 2001
From: Jared Szechy <jared.szechy@gmail.com>
Date: Sun, 21 Aug 2011 03:39:16 -0400
Subject: [PATCH] version 1.2.3

---
 CHANGELOG       | 6 ++++++
 README          | 4 ++--
 ambe3600x2250.c | 2 +-
 configure       | 0
 mbelib.c        | 7 +++----
 mbelib.h        | 2 +-
 6 files changed, 13 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 configure

diff --git a/CHANGELOG b/CHANGELOG
index df41118..f963222 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+1.2.3	Fixed bugs:
+	Cik array in mbe_decodeAmbe2250Parms was too small
+
+1.2.2	Fixed bugs:
+	uninitialized variable in SpectralAmpEnhance()
+
 1.2.1	New Features:
 
 	Improved unvoiced speech synthesis
diff --git a/README b/README
index 354f86a..a1098a6 100644
--- a/README
+++ b/README
@@ -7,8 +7,8 @@ PATENT NOTICE
 	Readers are strongly advised to check for any patent restrictions or 
 	licencing requirements before compiling or using this source code.
 
-mbelib 1.2.1
+mbelib 1.2.3
  
-        mbelib 1.2.1 supports the 7200x4400 bit/s codec used in P25 Phase 1,
+        mbelib 1.2.3 supports the 7200x4400 bit/s codec used in P25 Phase 1,
 	the 7100x4400 bit/s codec used in ProVoice and the "Half Rate"
         3600x2250 bit/s vocoder used in various radio systems.
diff --git a/ambe3600x2250.c b/ambe3600x2250.c
index 2902312..89d688f 100644
--- a/ambe3600x2250.c
+++ b/ambe3600x2250.c
@@ -142,7 +142,7 @@ mbe_decodeAmbe2250Parms (char *ambe_d, mbe_parms * cur_mp, mbe_parms * prev_mp)
   int ji, i, j, k, l, L, L9, m, am, ak;
   int intkl[57];
   int b0, b1, b2, b3, b4, b5, b6, b7, b8;
-  float f0, Cik[5][11], flokl[57], deltal[57];
+  float f0, Cik[5][18], flokl[57], deltal[57];
   float Sum42, Sum43, Tl[57], Gm[9], Ri[9], sum, c1, c2;
   char tmpstr[13];
   int silence;
diff --git a/configure b/configure
old mode 100644
new mode 100755
diff --git a/mbelib.c b/mbelib.c
index 8760ed7..a9ed3bf 100644
--- a/mbelib.c
+++ b/mbelib.c
@@ -96,17 +96,16 @@ void
 mbe_spectralAmpEnhance (mbe_parms * cur_mp)
 {
 
-  float Rm0, Rm1, R2m0, R2m1, Wl[57], cw0l;
+  float Rm0, Rm1, R2m0, R2m1, Wl[57];
   int l;
   float sum, gamma, M;
 
   Rm0 = 0;
   Rm1 = 0;
-  cw0l = cur_mp->w0 * (float) l;
   for (l = 1; l <= cur_mp->L; l++)
     {
       Rm0 = Rm0 + powf (cur_mp->Ml[l], (float) 2);
-      Rm1 = Rm1 + (powf (cur_mp->Ml[l], (float) 2) * cosf (cw0l));
+      Rm1 = Rm1 + (powf (cur_mp->Ml[l], (float) 2) * cosf (cur_mp->w0 * (float) l));
     }
 
   R2m0 = powf (Rm0, (float) 2);
@@ -116,7 +115,7 @@ mbe_spectralAmpEnhance (mbe_parms * cur_mp)
     {
       if (cur_mp->Ml[l] != 0)
         {
-          Wl[l] = sqrtf (cur_mp->Ml[l]) * powf ((((float) 0.96 * M_PI * ((R2m0 + R2m1) - ((float) 2 * Rm0 * Rm1 * cosf (cw0l)))) / (cur_mp->w0 * Rm0 * (R2m0 - R2m1))), (float) 0.25);
+          Wl[l] = sqrtf (cur_mp->Ml[l]) * powf ((((float) 0.96 * M_PI * ((R2m0 + R2m1) - ((float) 2 * Rm0 * Rm1 * cosf (cur_mp->w0 * (float) l)))) / (cur_mp->w0 * Rm0 * (R2m0 - R2m1))), (float) 0.25);
 
           if ((8 * l) <= cur_mp->L)
             {
diff --git a/mbelib.h b/mbelib.h
index d16d4dc..42629dc 100644
--- a/mbelib.h
+++ b/mbelib.h
@@ -18,7 +18,7 @@
 #ifndef _MBELIB_H
 #define _MBELIB_H
 
-#define MBELIB_VERSION "1.2.1"
+#define MBELIB_VERSION "1.2.3"
 
 #include "config.h"
 #include <stdio.h>