Fixed combining function.

[chise/kage.git] / kagecgi / kagecgi.h

diff --git a/kagecgi/kagecgi.h b/kagecgi/kagecgi.h
index 36dad00..cd38a5a 100755 (executable)
--- a/kagecgi/kagecgi.h
+++ b/kagecgi/kagecgi.h
@@ -1,21 +1,17 @@
 //kagecgi.h\r
 //\r
 \r
-#include <db1/db.h>\r
-//#include <db2/db_185.h>\r
-\r
-#include <png.h>\r
-#include <glib.h>\r
 #include "kage.h"\r
+#include "sysdep.h"\r
 \r
 #ifndef _KAGECGI_H_\r
 #define _KAGECGI_H_\r
 \r
 // define for localhost environment\r
-#define errorFileSize 4009\r
-#define errorFileName "error.png"\r
+#define errorFileSize 3992\r
+#define errorFileName "/usr/local/share/kagecgi/error.png"\r
 #define pngFilePath "/var/www/fontsjp/v0.4/"\r
-#define databaseFileName "../../kagedb/wiki"\r
+#define databaseFileName "/usr/local/share/kagecgi/kagedb"\r
 \r
 #define kBaseline 188\r
 #define pngWidth 200\r
@@ -36,50 +32,50 @@ int kDesign;
 int kSize;\r
 int kType;\r
 int kInput;\r
-GString *kResultText;\r
+KGString *kResultText;\r
 int kMode;\r
 \r
-void generateGlyph(const GString *in, GString *out);\r
-void searchPartsData(const GString *in, GString *out);\r
-void searchAliasData(const GString *in, GString *out);\r
-void searchCacheData(const GString *in, GString *out);\r
-void doCombine(const GString *in, GString *out);\r
-void drawGlyph(const GString *in, const int mode);\r
-\r
-int isIDS(const GString *in);\r
-void divideInto2(const GString *in, GString *partIDS1, GString *partIDS3);\r
-void divideInto3(const GString *in, GString *partIDS1, GString *partIDS2, GString *partIDS3);\r
-void addStrokeWithTransform(const GString *stroke, const int num, const int *tf, GString *out, int mode);\r
-void convertArray(int *buf, GString *out, int size, int mode);\r
+void generateGlyph(const KGString *in, KGString *out);\r
+void searchPartsData(const KGString *in, KGString *out);\r
+void searchAliasData(const KGString *in, KGString *out);\r
+void searchCacheData(const KGString *in, KGString *out);\r
+void doCombine(const KGString *in, KGString *out);\r
+void drawGlyph(const KGString *in, const int mode);\r
+\r
+int isIDS(const KGString *in);\r
+void divideInto2(const KGString *in, KGString *partIDS1, KGString *partIDS3);\r
+void divideInto3(const KGString *in, KGString *partIDS1, KGString *partIDS2, KGString *partIDS3);\r
+void addStrokeWithTransform(const KGString *stroke, const int num, const int *tf, KGString *out, int mode);\r
+void convertArray(int *buf, KGString *out, int size, int mode);\r
 int * convertStroke(const char *in, int *a, int *size);\r
-void convert99(const GString *in, GString *out);\r
-void convert99calc(const char *in, GString *out);\r
+void convert99(const KGString *in, KGString *out);\r
+void convert99calc(const char *in, KGString *out);\r
 \r
 void DotsWidth(int *dlx, int *drx);\r
 void DotsHeight(int *dly, int *dry);\r
-void PartsWidth(const GString *in, int *lx, int *rx);\r
-void PartsHeight(const GString *in, int *ly, int *ry);\r
-GString * CalcSizes(const GString *in, int mode);\r
+void PartsWidth(const KGString *in, int *lx, int *rx);\r
+void PartsHeight(const KGString *in, int *ly, int *ry);\r
+KGString * CalcSizes(const KGString *in, int mode);\r
 void DrawBox();\r
-void CalcOptions(const GString *in, int *mitsudo, int *flag, double *yoko, double *tate);\r
-void DoDrawParts(const GString *in, const int lx1, const double rf1, const int ly1, const double rfy1);\r
-void DoDrawMixFont(const GString *in1, const int lx1, const double rf1, const GString *in2, const int lx2, const double rf2, const int ly1, const double rfy1, const int ly2, const double rfy2);\r
+void CalcOptions(const KGString *in, int *mitsudo, int *flag, double *yoko, double *tate);\r
+void DoDrawParts(const KGString *in, const int lx1, const double rf1, const int ly1, const double rfy1);\r
+void DoDrawMixFont(const KGString *in1, const int lx1, const double rf1, const KGString *in2, const int lx2, const double rf2, const int ly1, const double rfy1, const int ly2, const double rfy2);\r
 \r
-void combineYoko2(const GString *parts1, const GString *parts3, int *result);\r
-void combineYoko3(const GString *parts1, const GString *parts2, const GString *parts3, int *result);\r
-void combineTate2(const GString *parts1, const GString *parts3, int *result);\r
-void combineTate3(const GString *parts1, const GString *parts2, const GString *parts3, int *result);\r
-void combineHame2(const GString *parts1, const GString *parts3, int *result);\r
+void combineYoko2(const KGString *parts1, const KGString *parts3, int *result);\r
+void combineYoko3(const KGString *parts1, const KGString *parts2, const KGString *parts3, int *result);\r
+void combineTate2(const KGString *parts1, const KGString *parts3, int *result);\r
+void combineTate3(const KGString *parts1, const KGString *parts2, const KGString *parts3, int *result);\r
+void combineHame2(const KGString *parts1, const KGString *parts3, int *result);\r
 \r
 int initDB();\r
 int closeDB();\r
-void searchPartsData(const GString *in, GString *out);\r
-void searchAliasData(const GString *in, GString *out);\r
+void searchPartsData(const KGString *in, KGString *out);\r
+void searchAliasData(const KGString *in, KGString *out);\r
 \r
 png_bytepp initPng(int width, int height);\r
 int closePng(int width, int height, png_bytepp canvas);\r
 int writePng(int width, int height, png_bytepp image, FILE *fp);\r
 \r
-void fillPolygon(struct kPoint *p, int number, int col, unsigned char **image);\r
+void fillPolygon(kPoint *p, int number, int col, unsigned char **image);\r
 \r
 #endif\r