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
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
|
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/MultiSyn/TargetCostRescoring.cc
===================================================================
--- a/src/modules/MultiSyn/TargetCostRescoring.cc
+++ b/src/modules/MultiSyn/TargetCostRescoring.cc
@@ -82,7 +82,7 @@
//cerr << scores << endl;
// calculate simple mean duration of some or all of candidates
- float meandur = 0.0;
+ long meandur = 0.0;
int n = 0;
if( beam_width < 0 ){ // just average all of them
@@ -107,7 +107,7 @@
// then tweak the scores based on that
for( EST_Litem *li = scores.head(); li != 0; li = next(li) ){
- float cand_dur = scores(li)._dur;
+ long cand_dur = scores(li)._dur;
// cerr << scores(li)._cand->score << " ";
scores(li)._cand->score += (mult * abs( cand_dur - meandur ) );
// cerr << scores(li)._cand->score << endl;
Index: b/src/modules/MultiSyn/inst_tmpl/hash_s_itemlistp_t.cc
===================================================================
--- a/src/modules/MultiSyn/inst_tmpl/hash_s_itemlistp_t.cc
+++ b/src/modules/MultiSyn/inst_tmpl/hash_s_itemlistp_t.cc
@@ -51,7 +51,7 @@
#if defined(INSTANTIATE_TEMPLATES)
-#include "../base_class/EST_THash.cc"
+#include "/usr/include/speech_tools/base_class/EST_THash.cc"
Instantiate_TStringHash_T(ItemList *, ItemListP)
Index: b/src/modules/MultiSyn/inst_tmpl/hash_itemp_tcdatap_t.cc
===================================================================
--- a/src/modules/MultiSyn/inst_tmpl/hash_itemp_tcdatap_t.cc
+++ b/src/modules/MultiSyn/inst_tmpl/hash_itemp_tcdatap_t.cc
@@ -50,7 +50,7 @@
#if defined(INSTANTIATE_TEMPLATES)
-#include "../base_class/EST_THash.cc"
+#include "/usr/include/speech_tools/base_class/EST_THash.cc"
Instantiate_THash_T(EST_Item*, TCData*, TCDataP)
Index: b/src/modules/MultiSyn/inst_tmpl/list_uttp_t.cc
===================================================================
--- a/src/modules/MultiSyn/inst_tmpl/list_uttp_t.cc
+++ b/src/modules/MultiSyn/inst_tmpl/list_uttp_t.cc
@@ -51,8 +51,8 @@
#if defined(INSTANTIATE_TEMPLATES)
-#include "../base_class/EST_TList.cc"
-#include "../base_class/EST_TSortable.cc"
+#include "/usr/include/speech_tools/base_class/EST_TList.cc"
+#include "/usr/include/speech_tools/base_class/EST_TSortable.cc"
Instantiate_TList_T_MIN(EST_Utterance *, EST_UtteranceP)
Index: b/src/modules/MultiSyn/inst_tmpl/list_itemp_t.cc
===================================================================
--- a/src/modules/MultiSyn/inst_tmpl/list_itemp_t.cc
+++ b/src/modules/MultiSyn/inst_tmpl/list_itemp_t.cc
@@ -51,8 +51,8 @@
#if defined(INSTANTIATE_TEMPLATES)
-#include "../base_class/EST_TList.cc"
-#include "../base_class/EST_TSortable.cc"
+#include "/usr/include/speech_tools/base_class/EST_TList.cc"
+#include "/usr/include/speech_tools/base_class/EST_TSortable.cc"
Instantiate_TList_T(EST_Item *, EST_ItemP)
Index: b/src/modules/MultiSyn/inst_tmpl/list_voicemodulep_t.cc
===================================================================
--- a/src/modules/MultiSyn/inst_tmpl/list_voicemodulep_t.cc
+++ b/src/modules/MultiSyn/inst_tmpl/list_voicemodulep_t.cc
@@ -50,8 +50,8 @@
#if defined(INSTANTIATE_TEMPLATES)
-#include "../base_class/EST_TList.cc"
-#include "../base_class/EST_TSortable.cc"
+#include "/usr/include/speech_tools/base_class/EST_TList.cc"
+#include "/usr/include/speech_tools/base_class/EST_TSortable.cc"
Instantiate_TList_T_MIN(DiphoneVoiceModule *, DiphoneVoiceModuleP)
Index: b/src/modules/MultiSyn/inst_tmpl/list_strlist_t.cc
===================================================================
--- a/src/modules/MultiSyn/inst_tmpl/list_strlist_t.cc
+++ b/src/modules/MultiSyn/inst_tmpl/list_strlist_t.cc
@@ -46,6 +46,6 @@
Declare_TList_T(EST_TList<EST_String>,STR_LIST)
#if defined(INSTANTIATE_TEMPLATES)
-#include "../base_class/EST_TList.cc"
+#include "/usr/include/speech_tools/base_class/EST_TList.cc"
Instantiate_TList_T(EST_StrList,STR_LIST);
#endif
Index: b/src/modules/MultiSyn/inst_tmpl/vector_jccp_t.cc
===================================================================
--- a/src/modules/MultiSyn/inst_tmpl/vector_jccp_t.cc
+++ b/src/modules/MultiSyn/inst_tmpl/vector_jccp_t.cc
@@ -50,8 +50,8 @@
#if defined(INSTANTIATE_TEMPLATES)
-#include "../base_class/EST_TSimpleVector.cc"
-#include "../base_class/EST_TVector.cc"
+#include "/usr/include/speech_tools/base_class/EST_TSimpleVector.cc"
+#include "/usr/include/speech_tools/base_class/EST_TVector.cc"
Instantiate_TVector_T_MIN(EST_JoinCostCache*,EST_JoinCostCacheP)
Instantiate_TSimpleVector(EST_JoinCostCache*)
Index: b/src/modules/MultiSyn/inst_tmpl/list_scorepair_t.cc
===================================================================
--- a/src/modules/MultiSyn/inst_tmpl/list_scorepair_t.cc
+++ b/src/modules/MultiSyn/inst_tmpl/list_scorepair_t.cc
@@ -45,8 +45,8 @@
Declare_TSortable(ScorePair)
#if defined(INSTANTIATE_TEMPLATES)
-#include "../base_class/EST_TList.cc"
-#include "../base_class/EST_TSortable.cc"
+#include "/usr/include/speech_tools/base_class/EST_TList.cc"
+#include "/usr/include/speech_tools/base_class/EST_TSortable.cc"
Instantiate_TList(ScorePair);
Instantiate_TSortable(ScorePair);
#endif
|
