Index: trunk/src_3rd/rnd_inclib/font/font.c =================================================================== --- trunk/src_3rd/rnd_inclib/font/font.c (revision 36638) +++ trunk/src_3rd/rnd_inclib/font/font.c (revision 36639) @@ -172,7 +172,7 @@ rnd_xform_mx_scale(mx, scx, scy); \ } while(0) -RND_FONT_DRAW_API void rnd_font_draw_string(rnd_font_t *font, const unsigned char *string, rnd_coord_t x0, rnd_coord_t y0, double scx, double scy, double rotdeg, rnd_font_mirror_t mirror, rnd_coord_t thickness, rnd_coord_t min_line_width, int poly_thin, rnd_font_tiny_t tiny, rnd_font_draw_atom_cb cb, void *cb_ctx) +void rnd_font_draw_string(rnd_font_t *font, const unsigned char *string, rnd_coord_t x0, rnd_coord_t y0, double scx, double scy, double rotdeg, rnd_font_mirror_t mirror, rnd_coord_t thickness, rnd_coord_t min_line_width, int poly_thin, rnd_font_tiny_t tiny, rnd_font_draw_atom_cb cb, void *cb_ctx) { rnd_xform_mx_t mx = RND_XFORM_MX_IDENT; const unsigned char *s; Index: trunk/src_3rd/rnd_inclib/font/font.h =================================================================== --- trunk/src_3rd/rnd_inclib/font/font.h (revision 36638) +++ trunk/src_3rd/rnd_inclib/font/font.h (revision 36639) @@ -33,10 +33,6 @@ #include #include -#ifndef RND_FONT_DRAW_API -#define RND_FONT_DRAW_API -#endif - #define RND_FONT_MAX_GLYPHS 255 #define RND_FONT_DEFAULT_CELLSIZE 50 @@ -83,7 +79,7 @@ typedef void (*rnd_font_draw_atom_cb)(void *cb_ctx, const rnd_glyph_atom_t *a); -RND_FONT_DRAW_API void rnd_font_draw_string(rnd_font_t *font, const unsigned char *string, rnd_coord_t x0, rnd_coord_t y0, double scx, double scy, double rotdeg, rnd_font_mirror_t mirror, rnd_coord_t thickness, rnd_coord_t min_line_width, int poly_thin, rnd_font_tiny_t tiny, rnd_font_draw_atom_cb cb, void *cb_ctx); +void rnd_font_draw_string(rnd_font_t *font, const unsigned char *string, rnd_coord_t x0, rnd_coord_t y0, double scx, double scy, double rotdeg, rnd_font_mirror_t mirror, rnd_coord_t thickness, rnd_coord_t min_line_width, int poly_thin, rnd_font_tiny_t tiny, rnd_font_draw_atom_cb cb, void *cb_ctx); /* Calculate all 4 corners of the transformed (e.g. rotated) box in cx;cy */ void rnd_font_string_bbox(rnd_coord_t cx[4], rnd_coord_t cy[4], rnd_font_t *font, const unsigned char *string, rnd_coord_t x0, rnd_coord_t y0, double scx, double scy, double rotdeg, rnd_font_mirror_t mirror, rnd_coord_t thickness, rnd_coord_t min_line_width);