From 0610dd4f3064220a2e8fb1d8dc120044eb6c64a8 Mon Sep 17 00:00:00 2001 From: scuri Date: Tue, 23 Jun 2009 03:18:33 +0000 Subject: *** empty log message *** --- include/cd.h | 3 +++ include/cd_private.h | 4 ++++ include/wd.h | 1 + 3 files changed, 8 insertions(+) (limited to 'include') diff --git a/include/cd.h b/include/cd.h index b491d84..55ecb45 100644 --- a/include/cd.h +++ b/include/cd.h @@ -169,10 +169,13 @@ void cdCanvasVectorTextDirection(cdCanvas* canvas, int x1, int y1, int x2, int y double* cdCanvasVectorTextTransform(cdCanvas* canvas, const double* matrix); void cdCanvasVectorTextSize(cdCanvas* canvas, int size_x, int size_y, const char* s); int cdCanvasVectorCharSize(cdCanvas* canvas, int size); +void cdCanvasVectorFontSize(cdCanvas* canvas, double size_x, double size_y); +void cdCanvasGetVectorFontSize(cdCanvas* canvas, double *size_x, double *size_y); /* vector text properties */ void cdCanvasGetVectorTextSize(cdCanvas* canvas, const char* s, int *x, int *y); void cdCanvasGetVectorTextBounds(cdCanvas* canvas, const char* s, int x, int y, int *rect); +void cdCanvasGetVectorTextBox(cdCanvas* canvas, int x, int y, const char *s, int *xmin, int *xmax, int *ymin, int *ymax); /* properties */ void cdCanvasGetFontDim(cdCanvas* canvas, int *max_width, int *height, int *ascent, int *descent); diff --git a/include/cd_private.h b/include/cd_private.h index 9ca38ce..14db96e 100644 --- a/include/cd_private.h +++ b/include/cd_private.h @@ -268,6 +268,8 @@ int cdfCheckBoxSize(double *xmin, double *xmax, double *ymin, double *ymax); void cdNormalizeLimits(int w, int h, int *xmin, int *xmax, int *ymin, int *ymax); int cdGetFileName(const char* strdata, char* filename); int cdStrEqualNoCase(const char* str1, const char* str2); +int cdStrLineCount(const char* str); +char* cdStrDup(const char* str); #define _cdCheckCanvas(_canvas) (_canvas!=NULL && ((unsigned char*)_canvas)[0] == 'C' && ((unsigned char*)_canvas)[1] == 'D') #define _cdInvertYAxis(_canvas, _y) (_canvas->h - (_y) - 1) @@ -286,6 +288,8 @@ void cdMatrixInverse(const double* matrix, double* inv_matrix); void cdRotatePoint(cdCanvas* canvas, int x, int y, int cx, int cy, int *rx, int *ry, double sin_teta, double cos_teta); void cdRotatePointY(cdCanvas* canvas, int x, int y, int cx, int cy, int *ry, double sin_theta, double cos_theta); void cdTextTranslatePoint(cdCanvas* canvas, int x, int y, int w, int h, int baseline, int *rx, int *ry); +void cdMovePoint(int *x, int *y, double dx, double dy, double sin_theta, double cos_theta); +void cdfMovePoint(double *x, double *y, double dx, double dy, double sin_theta, double cos_theta); /*************/ /* Fonts */ diff --git a/include/wd.h b/include/wd.h index 83ebe0f..80ee7b0 100644 --- a/include/wd.h +++ b/include/wd.h @@ -66,6 +66,7 @@ double wdCanvasVectorCharSize(cdCanvas* canvas, double size); void wdCanvasVectorText(cdCanvas* canvas, double x, double y, const char* s); void wdCanvasMultiLineVectorText(cdCanvas* canvas, double x, double y, const char* s); void wdCanvasGetVectorTextBounds(cdCanvas* canvas, const char* s, double x, double y, double *rect); +void wdCanvasGetVectorTextBox(cdCanvas* canvas, double x, double y, const char *s, double *xmin, double *xmax, double *ymin, double *ymax); #ifdef __cplusplus } -- cgit v1.2.3