From sumomo ¡÷ users.sourceforge.jp Fri Apr 2 14:57:08 2010
From: sumomo ¡÷ users.sourceforge.jp (sumomo ¡÷ users.sourceforge.jp)
Date: Fri, 02 Apr 2010 14:57:08 +0900
Subject: [Julius-cvs 539] CVS update: julius4/jcontrol
Message-ID: <1270187828.870404.26379.nullmailer@users.sourceforge.jp>
Index: julius4/jcontrol/japi_grammar.c
diff -u julius4/jcontrol/japi_grammar.c:1.3 julius4/jcontrol/japi_grammar.c:1.4
--- julius4/jcontrol/japi_grammar.c:1.3 Fri Oct 17 08:33:23 2008
+++ julius4/jcontrol/japi_grammar.c Fri Apr 2 14:57:08 2010
@@ -12,7 +12,7 @@
* @author Akinobu LEE
* @date Thu Mar 24 07:13:41 2005
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
*/
/*
@@ -49,7 +49,7 @@
i = strlen(prefix) - 1;
while(prefix[i] != '.' && i >= 0) i--;
- if (i < 0 && strcmp(&(prefix[i]), ".dict") != 0) {
+ if (i < 0 || strcmp(&(prefix[i]), ".dict") != 0) {
snprintf(buf, MAXLINELEN, "%s.dfa", prefix);
if (access(buf, R_OK) < 0) {
fprintf(stderr, "Error: \"%s.dfa\" not exist\n", prefix);
@@ -94,7 +94,7 @@
i = strlen(prefix) - 1;
while(prefix[i] != '.' && i >= 0) i--;
- if (i < 0 && strcmp(&(prefix[i]), ".dict") != 0) {
+ if (i < 0 || strcmp(&(prefix[i]), ".dict") != 0) {
snprintf(buf, MAXLINELEN, "%s.dfa", prefix);
if ((fp = fopen(buf, "r")) == NULL) {
perror("japi_change_grammar"); return -1;
From sumomo ¡÷ users.sourceforge.jp Fri Apr 2 14:57:08 2010
From: sumomo ¡÷ users.sourceforge.jp (sumomo ¡÷ users.sourceforge.jp)
Date: Fri, 02 Apr 2010 14:57:08 +0900
Subject: [Julius-cvs 540] CVS update: julius4/julius
Message-ID: <1270187828.953826.26387.nullmailer@users.sourceforge.jp>
Index: julius4/julius/module.c
diff -u julius4/julius/module.c:1.9 julius4/julius/module.c:1.10
--- julius4/julius/module.c:1.9 Fri Nov 14 13:12:11 2008
+++ julius4/julius/module.c Fri Apr 2 14:57:08 2010
@@ -516,9 +516,8 @@
}
else if (strmatch(command, "DELPROCESS")) {
- JCONF_LM *lmconf;
- JCONF_AM *amconf;
JCONF_SEARCH *sconf;
+ JCONF_LM *lmconf;
RecogProcess *r;
if (
@@ -529,18 +528,14 @@
return;
}
- lmconf = j_get_lmconf_by_name(recog->jconf, buf);
- if (lmconf == NULL) {
- fprintf(stderr, "Error: msock(DELPROCESS): no lmconf named %s\n", buf);
- module_send(module_sd, "\n.\n");
- return;
- }
sconf = j_get_searchconf_by_name(recog->jconf, buf);
if (sconf == NULL) {
fprintf(stderr, "Error: msock(DELPROCESS): no searchconf named %s\n", buf);
module_send(module_sd, "\n.\n");
return;
}
+
+ lmconf = sconf->lmconf;
printf("remove process: SR%02d %s, LM%02d %s\n", sconf->id, sconf->name, lmconf->id, lmconf->name);
module_send(module_sd, "\n");
for(r=recog->process_list;r;r=r->next) {
From sumomo ¡÷ users.sourceforge.jp Sat Apr 3 17:44:32 2010
From: sumomo ¡÷ users.sourceforge.jp (sumomo ¡÷ users.sourceforge.jp)
Date: Sat, 03 Apr 2010 17:44:32 +0900
Subject: [Julius-cvs 541] CVS update: julius4/libjulius/src
Message-ID: <1270284272.824689.11784.nullmailer@users.sourceforge.jp>
Index: julius4/libjulius/src/m_options.c
diff -u julius4/libjulius/src/m_options.c:1.17 julius4/libjulius/src/m_options.c:1.18
--- julius4/libjulius/src/m_options.c:1.17 Tue Feb 10 17:15:48 2009
+++ julius4/libjulius/src/m_options.c Sat Apr 3 17:44:32 2010
@@ -18,7 +18,7 @@
* @author Akinobu Lee
* @date Thu May 12 18:52:07 2005
*
- * $Revision: 1.17 $
+ * $Revision: 1.18 $
*
*/
/*
@@ -898,6 +898,7 @@
continue;
} else if (strmatch(argv[i],"-mapunk")) { /* unknown word */
if (!check_section(jconf, argv[i], JCONF_OPT_LM)) return FALSE;
+ GET_TMPARG;
strncpy(jconf->lmnow->unknown_name, tmparg, UNK_WORD_MAXLEN);
continue;
} else if (strmatch(argv[i],"-iwspword")) { /* add short pause word */
From sumomo ¡÷ users.sourceforge.jp Sun Apr 4 00:06:15 2010
From: sumomo ¡÷ users.sourceforge.jp (sumomo ¡÷ users.sourceforge.jp)
Date: Sun, 04 Apr 2010 00:06:15 +0900
Subject: [Julius-cvs 542] CVS update: julius4/libjulius/src
Message-ID: <1270307175.899163.20447.nullmailer@users.sourceforge.jp>
Index: julius4/libjulius/src/m_options.c
diff -u julius4/libjulius/src/m_options.c:1.18 julius4/libjulius/src/m_options.c:1.19
--- julius4/libjulius/src/m_options.c:1.18 Sat Apr 3 17:44:32 2010
+++ julius4/libjulius/src/m_options.c Sun Apr 4 00:06:15 2010
@@ -18,7 +18,7 @@
* @author Akinobu Lee
* @date Thu May 12 18:52:07 2005
*
- * $Revision: 1.18 $
+ * $Revision: 1.19 $
*
*/
/*
@@ -1201,10 +1201,13 @@
} else if (strmatch(argv[i],"-htkconf")) {
if (!check_section(jconf, argv[i], JCONF_OPT_AM)) return FALSE;
GET_TMPARG;
+ tmparg = filepath(tmparg, cwd);
if (htk_config_file_parse(tmparg, &(jconf->amnow->analysis.para_htk)) == FALSE) {
jlog("ERROR: m_options: failed to read %s\n", tmparg);
+ free(tmparg);
return FALSE;
}
+ free(tmparg);
continue;
} else if (strmatch(argv[i], "-wlist")) {
if (!check_section(jconf, argv[i], JCONF_OPT_LM)) return FALSE;
From sumomo ¡÷ users.sourceforge.jp Sun Apr 4 18:16:40 2010
From: sumomo ¡÷ users.sourceforge.jp (sumomo ¡÷ users.sourceforge.jp)
Date: Sun, 04 Apr 2010 18:16:40 +0900
Subject: [Julius-cvs 543] CVS update: julius4/libsent/src/util
Message-ID: <1270372600.629811.20861.nullmailer@users.sourceforge.jp>
Index: julius4/libsent/src/util/mymalloc.c
diff -u julius4/libsent/src/util/mymalloc.c:1.4 julius4/libsent/src/util/mymalloc.c:1.5
--- julius4/libsent/src/util/mymalloc.c:1.4 Sat Jan 31 18:11:22 2009
+++ julius4/libsent/src/util/mymalloc.c Sun Apr 4 18:16:40 2010
@@ -17,7 +17,7 @@
* @author Akinobu LEE
* @date Thu Feb 17 16:27:03 2005
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
*/
/*
@@ -42,7 +42,11 @@
{
void *p;
if ( (p = malloc(size)) == NULL) {
+#if defined(_WIN32) && !defined(__CYGWIN32__)
+ jlog("Error: mymalloc: failed to allocate %Iu bytes\n", size);
+#else
jlog("Error: mymalloc: failed to allocate %zu bytes\n", size);
+#endif
exit(1);
}
return p;
@@ -64,12 +68,20 @@
if (sizeof(size_t) == 4) { /* 32bit environment */
limit = (double)4294967296.0 / elsize; /* 2^32 */
if (nelem >= limit) {
+#if defined(_WIN32) && !defined(__CYGWIN32__)
+ jlog("Error: mymalloc_big: %Iu bytes x %Iu unit exceeds 4GB limit\n", elsize, nelem);
+#else
jlog("Error: mymalloc_big: %zu bytes x %zu unit exceeds 4GB limit\n", elsize, nelem);
+#endif
exit(1);
}
}
if ( (p = malloc(nelem * elsize)) == NULL) {
- jlog("Error: mymalloc: failed to allocate %zu bytes\n", nelem * elsize);
+#if defined(_WIN32) && !defined(__CYGWIN32__)
+ jlog("Error: mymalloc_big: failed to allocate %Iu x %Iu bytes\n", elsize, nelem);
+#else
+ jlog("Error: mymalloc_big: failed to allocate %zu x %zu bytes\n", elsize, nelem);
+#endif
exit(1);
}
return p;
@@ -88,7 +100,11 @@
{
void *p;
if ( (p = realloc(ptr,size)) == NULL) {
+#if defined(_WIN32) && !defined(__CYGWIN32__)
+ jlog("Error: mymalloc: failed to reallocate %Iu bytes\n", size);
+#else
jlog("Error: mymalloc: failed to reallocate %zu bytes\n", size);
+#endif
exit(1);
}
return p;
@@ -107,7 +123,11 @@
{
void *p;
if ( (p = calloc(nelem,elsize)) == NULL) {
+#if defined(_WIN32) && !defined(__CYGWIN32__)
+ jlog("Error: mymalloc: failed to clear-allocate %Iu bytes\n", nelem*elsize);
+#else
jlog("Error: mymalloc: failed to clear-allocate %zu bytes\n", nelem*elsize);
+#endif
exit(1);
}
return p;
From sumomo ¡÷ users.sourceforge.jp Sun Apr 4 21:45:42 2010
From: sumomo ¡÷ users.sourceforge.jp (sumomo ¡÷ users.sourceforge.jp)
Date: Sun, 04 Apr 2010 21:45:42 +0900
Subject: [Julius-cvs 544] CVS update: julius4/libsent/src/adin
Message-ID: <1270385142.782249.21607.nullmailer@users.sourceforge.jp>
Index: julius4/libsent/src/adin/adin_file.c
diff -u julius4/libsent/src/adin/adin_file.c:1.7 julius4/libsent/src/adin/adin_file.c:1.8
--- julius4/libsent/src/adin/adin_file.c:1.7 Fri Jul 3 02:05:20 2009
+++ julius4/libsent/src/adin/adin_file.c Sun Apr 4 21:45:42 2010
@@ -56,7 +56,7 @@
* @author Akinobu LEE
* @date Sun Feb 13 13:31:20 2005
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
*/
/*
@@ -531,7 +531,7 @@
int cnt;
if (wav_p) {
- cnt = myfread(buf, sizeof(SP16), sampnum, stdin);
+ cnt = fread(buf, sizeof(SP16), sampnum, stdin);
if (cnt == 0) {
if (feof(stdin)) return -1; /* EOF */
if (ferror(stdin)) {