1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34
|
This patch is part of a series of patches for festival for
Debian GNU/Linux, which primarily fix build errors with GCC 4.3 and newer.
Index: b/src/modules/diphone/diphone.cc
===================================================================
--- a/src/modules/diphone/diphone.cc
+++ b/src/modules/diphone/diphone.cc
@@ -180,6 +180,8 @@
db->group_encoding = di_raw;
else if (streq(db->group_encoding_str,"ulaw"))
db->group_encoding = di_ulaw;
+ else if (streq(db->group_encoding_str,"alaw"))
+ db->group_encoding = di_alaw;
else
{
cerr << "Diphone: unknown group encoding" << endl;
@@ -218,7 +220,7 @@
{
wfree(db->indx[0]->diph); // ptr to the whole diphname table
wfree(db->allsignal);
- wfree(db->allulawsignal);
+ wfree(db->allualawsignal);
wfree(db->allframes);
}
for (i=0; i < db->nindex; i++)
@@ -275,7 +277,7 @@
db->alternates_before = NIL;
db->alternates_after = NIL;
db->allsignal = 0;
- db->allulawsignal = 0;
+ db->allualawsignal = 0;
db->offsets = 0;
db->gfd = 0;
db->default_diphone = 0;
|