[Tomoe-cvs 1222] CVS update: tomoe/recognizer

アーカイブの一覧に戻る

Hiroyuki Ikezoe ikezo****@users*****
2006年 11月 27日 (月) 22:24:40 JST


Index: tomoe/recognizer/tomoe-recognizer-simple-logic.c
diff -u tomoe/recognizer/tomoe-recognizer-simple-logic.c:1.42 tomoe/recognizer/tomoe-recognizer-simple-logic.c:1.43
--- tomoe/recognizer/tomoe-recognizer-simple-logic.c:1.42	Mon Nov 27 22:14:24 2006
+++ tomoe/recognizer/tomoe-recognizer-simple-logic.c	Mon Nov 27 22:24:40 2006
@@ -17,7 +17,7 @@
  *  Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  *  Boston, MA  02111-1307  USA
  *
- *  $Id: tomoe-recognizer-simple-logic.c,v 1.42 2006/11/27 13:14:24 ikezoe Exp $
+ *  $Id: tomoe-recognizer-simple-logic.c,v 1.43 2006/11/27 13:24:40 ikezoe Exp $
  */
 
 #include <stdlib.h>
@@ -120,13 +120,12 @@
         gboolean f = TRUE;
 
         cand_p = g_ptr_array_index (cands, i);
-        pj = match_stroke_num (tomoe_candidate_get_char (cand_p->cand),
-                               input_stroke_num, cand_p->adapted_strokes);
+        a = tomoe_candidate_get_char (cand_p->cand);
+        pj = match_stroke_num (a, input_stroke_num, cand_p->adapted_strokes);
 
         if (pj <= 0)
             continue;
 
-        a = tomoe_candidate_get_char (cand_p->cand);
         ac = tomoe_char_get_utf8 (a);
 
         for (j = 0; j < (guint)matches->len; j++) {
@@ -140,11 +139,10 @@
         if (f) {
             TomoeCandidate *c = cand_p->cand;
             TomoeCandidate *cand;
-            TomoeChar *chr = tomoe_candidate_get_char (c);
-            cand = tomoe_candidate_new (chr);
+            cand = tomoe_candidate_new (a);
             tomoe_candidate_set_score (cand, tomoe_candidate_get_score (c) / pj);
             matched = g_list_prepend (matched, cand);
-            g_ptr_array_add (matches, (gpointer) tomoe_char_get_utf8 (chr));
+            g_ptr_array_add (matches, (gpointer) ac);
         }
     }
 


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