mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-01 05:46:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

[1.29.15] Fix compiler warning, conversion from string constant to 'char *'.

Browse Source 
espeakedit: Change compile_report file to include the phoneme name as well as phoneme table which uses each data file.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@95 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2007-11-01 19:09:27 +00:00
parent 9543dcc00d
commit 531de957cd
30 changed files with 2128 additions and 845 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vowelchart.cpp
+5 -5
View File
@@ -47,7 +47,7 @@ extern PHONEME_TAB_LIST phoneme_tab_list[N_PHONEME_TABS];
// size of the vowelchart png
#define WIDTH 1200
#define WIDTH 1580
#define HEIGHT 800
@@ -131,8 +131,8 @@ static double log2a(double x)
static int VowelX(int f2)
{//======================
return(WIDTH - int((log2a(f2) - 9.49)*WIDTH/1.8));
// return(1024 - int((log2a(f2) - 9.50)*1020/1.8));
return(WIDTH - int((log2a(f2) - 9.40)*WIDTH/1.9));
// return(WIDTH - int((log2a(f2) - 9.49)*WIDTH/1.8));
}
static int VowelY(int f1)
@@ -168,7 +168,7 @@ static void DrawVowel(wxDC *dc, wxString name, int f1, int f2, int f3, int g1, i
if(y < 0) y = 0;
if(y > (HEIGHT-4)) y= (HEIGHT-4);
if(x < 0) x = 0;
if(x > (WIDTH-8)) x = (WIDTH-8);
if(x > (WIDTH-12)) x = (WIDTH-12);
r = z;
g = 255;
@@ -351,7 +351,7 @@ void VowelChart(int control, char *fname)
if((ix % 100) == 0)
dc.DrawText(wxString::Format(_T("%d"),ix),1,y);
}
for(ix=800; ix<=2400; ix+=100)
for(ix=700; ix<=2400; ix+=100)
{
x = VowelX(ix);
dc.DrawLine(x,0,x,HEIGHT);