mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-02 14:04:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make polint use 0-based indexing

Browse Source 
This avoids having to make LoadEnvelope2 pass &env_x[-1], which is very
strongly frowned upon by sanitizers such as usan.
This commit is contained in:
Samuel Thibault
2022-03-15 03:03:41 +01:00
parent 43d07abec4
commit 4dd1e04d8a
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libespeak-ng/compiledata.c
+2 -2
View File
@@ -1399,10 +1399,10 @@ static int LoadEnvelope2(FILE *f)
env_y[n_points] = env_y[n_points-1];
}
ix = -1;
ix = 0;
ix2 = 0;
if (n_points > 0) for (x = 0; x < ENV_LEN; x++) {
if (n_points > 3 && x > env_x[ix+4])
if (n_points > 3 && x > env_x[ix+3])
ix++;
if (n_points > 2 && x >= env_x[ix2+1])
ix2++;
src/libespeak-ng/spect.c
+8 -8
View File
@@ -60,24 +60,24 @@ float polint(float xa[], float ya[], int n, float x)
float y; // result
float c[9], d[9];
dif = fabs(x-xa[1]);
dif = fabs(x-xa[0]);
for (i = 1; i <= n; i++) {
if ((dift = fabs(x-xa[i])) < dif) {
if ((dift = fabs(x-xa[i-1])) < dif) {
ns = i;
dif = dift;
}
c[i] = ya[i];
d[i] = ya[i];
c[i] = ya[i-1];
d[i] = ya[i-1];
}
y = ya[ns--];
y = ya[--ns];
for (m = 1; m < n; m++) {
for (i = 1; i <= n-m; i++) {
ho = xa[i]-x;
hp = xa[i+m]-x;
ho = xa[i-1]-x;
hp = xa[i+m-1]-x;
w = c[i+1]-d[i];
if ((den = ho-hp) == 0.0)
return ya[2]; // two input xa are identical
return ya[1]; // two input xa are identical
den = w/den;
d[i] = hp*den;
c[i] = ho*den;