[Julius-cvs 594] CVS update: julius4/libjulius/src

アーカイブの一覧に戻る

sumom****@users***** sumom****@users*****
2011年 2月 7日 (月) 13:56:14 JST


Index: julius4/libjulius/src/m_fusion.c
diff -u julius4/libjulius/src/m_fusion.c:1.16 julius4/libjulius/src/m_fusion.c:1.17
--- julius4/libjulius/src/m_fusion.c:1.16	Sat Feb  5 22:27:22 2011
+++ julius4/libjulius/src/m_fusion.c	Mon Feb  7 13:56:14 2011
@@ -20,7 +20,7 @@
  * @author Akinobu Lee
  * @date   Thu May 12 13:31:47 2005
  *
- * $Revision: 1.16 $
+ * $Revision: 1.17 $
  * 
  */
 /*
@@ -285,6 +285,9 @@
 initialize_dict(JCONF_LM *lmconf, HTK_HMM_INFO *hmminfo)
 {
   WORD_INFO *winfo;
+  JCONF_LM_NAMELIST *nl;
+  char buf[MAXLINELEN];
+  int n;
 
   /* allocate new word dictionary */
   winfo = word_info_new();
@@ -303,9 +306,6 @@
   }
 
   /* load additional entries */
-  JCONF_LM_NAMELIST *nl;
-  char buf[MAXLINELEN];
-  int n;
   for (nl = lmconf->additional_dict_files; nl; nl=nl->next) {
     FILE *fp;
     if ((fp = fopen(nl->name, "rb")) == NULL) {
Index: julius4/libjulius/src/m_options.c
diff -u julius4/libjulius/src/m_options.c:1.20 julius4/libjulius/src/m_options.c:1.21
--- julius4/libjulius/src/m_options.c:1.20	Sat Feb  5 18:00:41 2011
+++ julius4/libjulius/src/m_options.c	Mon Feb  7 13:56:14 2011
@@ -18,7 +18,7 @@
  * @author Akinobu Lee
  * @date   Thu May 12 18:52:07 2005
  *
- * $Revision: 1.20 $
+ * $Revision: 1.21 $
  * 
  */
 /*
@@ -1273,9 +1273,9 @@
     } else if (strmatch(argv[i],"-adddict")) {
 	if (!check_section(jconf, argv[i], JCONF_OPT_LM)) return FALSE; 
 	GET_TMPARG;
-	char *arg = filepath(tmparg, cwd);
-	j_add_dict(jconf->lmnow, arg);
-	free(arg);
+	tmparg = filepath(tmparg, cwd);
+	j_add_dict(jconf->lmnow, tmparg);
+	free(tmparg);
 	continue;
     } else if (strmatch(argv[i],"-addentry")) {
 	if (!check_section(jconf, argv[i], JCONF_OPT_LM)) return FALSE; 



Julius-cvs メーリングリストの案内
アーカイブの一覧に戻る