Add error processing for combine(U+2ffa).

diff --git a/kagecgi/Makefile b/kagecgi/Makefile
index 3de3da3..5181c8a 100755 (executable)
--- a/kagecgi/Makefile
+++ b/kagecgi/Makefile
@@ -8,14 +8,9 @@ BINDIR=/usr/local/bin
 SHAREDIR=/usr/local/share/kagecgi
 DBURL=http://fonts.jp/kagedb/kagedb
 
-#for cygwin
 CFLAGS=
 LIBS= -lpng -ldb
 
-#for linux
-#CFLAGS= -I/usr/local/include
-#LIBS= -L/usr/local/lib -lpng -ldb
-
 #for MacOSX with fink
 #CFLAGS= -I/sw/include -I/sw/include/db3 -I/sw/include/libpng/
 #LIBS= -L/sw/lib -lpng -ldb

diff --git a/kagecgi/kagecomb.c b/kagecgi/kagecomb.c
index 3b1ac74..16ebe34 100755 (executable)
--- a/kagecgi/kagecomb.c
+++ b/kagecgi/kagecomb.c
@@ -377,9 +377,11 @@ void combineTate3(const KGString *parts1, const KGString *parts2, const KGString
 }\r
 \r
 void combineHame2(const KGString *parts1, const KGString *parts3, int *result){\r
-  int i;\r
+  int i, flag;\r
   int *buf, strokes;\r
 \r
+  flag = 0;\r
+\r
   //set results\r
   result[0] = 0;\r
   result[1] = 0;\r
@@ -388,12 +390,17 @@ void combineHame2(const KGString *parts1, const KGString *parts3, int *result){
   buf = convertStroke(parts1->str, buf, &strokes);\r
   for(i = 0; i < strokes; i++){\r
     if(buf[i * 11 + 0] == 9){\r
-\r
       result[8] = buf[i * 11 + 3];\r
       result[9] = buf[i * 11 + 4];\r
       result[10] = buf[i * 11 + 5];\r
       result[11] = buf[i * 11 + 6];\r
     }\r
   }\r
-       //not yet\r
+  if(flag == 0){ //error\r
+    result[8] = 50;\r
+    result[9] = 50;\r
+    result[10] = 150;\r
+    result[11] = 150;\r
+  }\r
+  //not yet\r
 }\r