diff options
Diffstat (limited to 'libass/ass_drawing.h')
| -rw-r--r-- | libass/ass_drawing.h | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/libass/ass_drawing.h b/libass/ass_drawing.h index 28a7040..95e361f 100644 --- a/libass/ass_drawing.h +++ b/libass/ass_drawing.h @@ -19,9 +19,6 @@ #ifndef LIBASS_DRAWING_H #define LIBASS_DRAWING_H -#include <ft2build.h> -#include FT_OUTLINE_H - #include "ass.h" #include "ass_outline.h" #include "ass_bitmap.h" @@ -39,7 +36,7 @@ typedef enum { typedef struct ass_drawing_token { ASS_TokenType type; - FT_Vector point; + ASS_Vector point; struct ass_drawing_token *next; struct ass_drawing_token *prev; } ASS_DrawingToken; @@ -48,26 +45,26 @@ typedef struct { char *text; // drawing string int scale; // scale (1-64) for subpixel accuracy double pbo; // drawing will be shifted in y direction by this amount - double scale_x; // FontScaleX - double scale_y; // FontScaleY - int asc; // ascender - int desc; // descender + double scale_x; // FontScaleX + double scale_y; // FontScaleY + int asc; // ascender + int desc; // descender ASS_Outline outline; // target outline - FT_Vector advance; // advance (from cbox) - int hash; // hash value (for caching) + ASS_Vector advance; // advance (from cbox) + int hash; // hash value (for caching) // private ASS_Library *library; ASS_DrawingToken *tokens; // tokenized drawing double point_scale_x; double point_scale_y; - FT_BBox cbox; // bounding box, or let's say... VSFilter's idea of it + ASS_Rect cbox; // bounding box, or let's say... VSFilter's idea of it } ASS_Drawing; -ASS_Drawing *ass_drawing_new(ASS_Library *lib, FT_Library ftlib); -void ass_drawing_free(ASS_Drawing* drawing); -void ass_drawing_set_text(ASS_Drawing* drawing, char *str, size_t n); -void ass_drawing_hash(ASS_Drawing* drawing); -ASS_Outline *ass_drawing_parse(ASS_Drawing *drawing, int raw_mode); +ASS_Drawing *ass_drawing_new(ASS_Library *lib); +void ass_drawing_free(ASS_Drawing *drawing); +void ass_drawing_set_text(ASS_Drawing *drawing, char *str, size_t n); +void ass_drawing_hash(ASS_Drawing *drawing); +ASS_Outline *ass_drawing_parse(ASS_Drawing *drawing, bool raw_mode); #endif /* LIBASS_DRAWING_H */ |