X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=kagecgi%2Fkagecgi.h;h=cd38a5af5287fb5222bb77d38ff2415131028a87;hb=21f38342930d8a535a5804f42bae19b8e6c8d983;hp=36dad00f299dfa2d04431de950db206be8172488;hpb=b755cadf536858496296e43b30baec2cd9ec8c13;p=chise%2Fkage.git

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