Mercurial > mplayer.hg
changeset 21321:7b7627ff1937
Move ass_font_desc_t and ass_font_t declarations to ass_font.h.
| author | eugeni |
|---|---|
| date | Mon, 27 Nov 2006 17:50:05 +0000 |
| parents | 4a7e96f1eebf |
| children | bb55f4f7b3cb |
| files | libass/ass_cache.h libass/ass_font.c libass/ass_font.h |
| diffstat | 3 files changed, 17 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/libass/ass_cache.h Mon Nov 27 17:34:47 2006 +0000 +++ b/libass/ass_cache.h Mon Nov 27 17:50:05 2006 +0000 @@ -26,23 +26,6 @@ #include FT_STROKER_H #include FT_GLYPH_H -// font cache -typedef struct ass_font_desc_s { - char* family; - unsigned bold; - unsigned italic; -} ass_font_desc_t; - -typedef struct ass_font_s { - ass_font_desc_t desc; - char* path; - int index; - FT_Face face; - FT_Matrix m; // current transformation - FT_Vector v; // current shift - int size; -} ass_font_t; - void ass_font_cache_init(void); ass_font_t* ass_font_cache_find(ass_font_desc_t* desc); void ass_font_cache_add(ass_font_t* font);
--- a/libass/ass_font.c Mon Nov 27 17:34:47 2006 +0000 +++ b/libass/ass_font.c Mon Nov 27 17:50:05 2006 +0000 @@ -27,6 +27,8 @@ #include FT_GLYPH_H #include "ass_font.h" +#include "ass_bitmap.h" +#include "ass_cache.h" #include "ass_fontconfig.h" #include "mputils.h"
--- a/libass/ass_font.h Mon Nov 27 17:34:47 2006 +0000 +++ b/libass/ass_font.h Mon Nov 27 17:50:05 2006 +0000 @@ -26,8 +26,21 @@ #include FT_STROKER_H #include FT_GLYPH_H -#include "ass_bitmap.h" -#include "ass_cache.h" +typedef struct ass_font_desc_s { + char* family; + unsigned bold; + unsigned italic; +} ass_font_desc_t; + +typedef struct ass_font_s { + ass_font_desc_t desc; + char* path; + int index; + FT_Face face; + FT_Matrix m; // current transformation + FT_Vector v; // current shift + int size; +} ass_font_t; ass_font_t* ass_font_new(FT_Library ftlibrary, void* fc_priv, ass_font_desc_t* desc); void ass_font_set_transform(ass_font_t* font, FT_Matrix* m, FT_Vector* v);