From: Keiichiro O. <ur...@us...> - 2016-12-14 06:55:39
|
Update of /cvsroot/sp-tk/SPTK/src/bin/gc2gc In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19183 Modified Files: gc2gc.c Log Message: fix gc2gc bug. when input/output is norm=false && gamma-multiply=true, c0 must be modified. Index: gc2gc.c =================================================================== RCS file: /cvsroot/sp-tk/SPTK/src/bin/gc2gc/gc2gc.c,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** gc2gc.c 9 Dec 2016 01:29:07 -0000 1.30 --- gc2gc.c 14 Dec 2016 06:55:37 -0000 1.31 *************** *** 242,249 **** while (freadf(gc1, sizeof(*gc1), m1 + 1, fp) == m1 + 1) { ! if (!norm1) gnorm(gc1, gc1, m1, g1); ! else if (mulg1) ! gc1[0] = (gc1[0] - 1.0) / g1; if (mulg1) --- 242,250 ---- while (freadf(gc1, sizeof(*gc1), m1 + 1, fp) == m1 + 1) { ! if (!norm1) { gnorm(gc1, gc1, m1, g1); ! if (mulg1) ! gc1[0] = (gc1[0] - 1.0) / g1; ! } if (mulg1) *************** *** 253,260 **** gc2gc(gc1, m1, g1, gc2, m2, g2); ! if (!norm2) ignorm(gc2, gc2, m2, g2); ! else if (mulg2) ! gc2[0] = gc2[0] * g2 + 1.0; if (mulg2) --- 254,262 ---- gc2gc(gc1, m1, g1, gc2, m2, g2); ! if (!norm2) { ignorm(gc2, gc2, m2, g2); ! if (mulg2) ! gc2[0] = gc2[0] * g2 + 1.0; ! } if (mulg2) |