diff options
author | greg <greg@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-01-08 18:35:44 +0000 |
---|---|---|
committer | greg <greg@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-01-08 18:35:44 +0000 |
commit | 9aea06cf7dde9592672e4dba09fb03b2b89d6863 (patch) | |
tree | 0062d1e95bc58bd51028e14a6d88240a1d94ee7d /libass/ass_font.h | |
parent | f51c039c5fcdc24c3f33e1a48bed73bdb17e9e11 (diff) | |
download | mpv-9aea06cf7dde9592672e4dba09fb03b2b89d6863.tar.bz2 mpv-9aea06cf7dde9592672e4dba09fb03b2b89d6863.tar.xz |
Update internal libass copy to commit 8db4a5
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30242 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libass/ass_font.h')
-rw-r--r-- | libass/ass_font.h | 60 |
1 files changed, 33 insertions, 27 deletions
diff --git a/libass/ass_font.h b/libass/ass_font.h index 520431821b..ca0c213a09 100644 --- a/libass/ass_font.h +++ b/libass/ass_font.h @@ -1,5 +1,3 @@ -// -*- c-basic-offset: 8; indent-tabs-mode: t -*- -// vim:ts=8:sw=8:noet:ai: /* * Copyright (C) 2006 Evgeniy Stepanov <eugeni.stepanov@gmail.com> * @@ -29,32 +27,40 @@ #include "ass.h" #include "ass_types.h" -typedef struct ass_font_desc_s { - char* family; - unsigned bold; - unsigned italic; - int treat_family_as_pattern; -} ass_font_desc_t; - #define ASS_FONT_MAX_FACES 10 +#define DECO_UNDERLINE 1 +#define DECO_STRIKETHROUGH 2 + +typedef struct { + char *family; + unsigned bold; + unsigned italic; + int treat_family_as_pattern; +} ASS_FontDesc; -typedef struct ass_font_s { - ass_font_desc_t desc; - ass_library_t* library; - FT_Library ftlibrary; - FT_Face faces[ASS_FONT_MAX_FACES]; - int n_faces; - double scale_x, scale_y; // current transform - FT_Vector v; // current shift - double size; -} ass_font_t; +typedef struct { + ASS_FontDesc desc; + ASS_Library *library; + FT_Library ftlibrary; + FT_Face faces[ASS_FONT_MAX_FACES]; + int n_faces; + double scale_x, scale_y; // current transform + FT_Vector v; // current shift + double size; +} ASS_Font; -ass_font_t* ass_font_new(ass_library_t* library, FT_Library ftlibrary, void* fc_priv, ass_font_desc_t* desc); -void ass_font_set_transform(ass_font_t* font, double scale_x, double scale_y, FT_Vector* v); -void ass_font_set_size(ass_font_t* font, double size); -void ass_font_get_asc_desc(ass_font_t* font, uint32_t ch, int* asc, int* desc); -FT_Glyph ass_font_get_glyph(void* fontconfig_priv, ass_font_t* font, uint32_t ch, ass_hinting_t hinting); -FT_Vector ass_font_get_kerning(ass_font_t* font, uint32_t c1, uint32_t c2); -void ass_font_free(ass_font_t* font); +// FIXME: passing the hashmap via a void pointer is very ugly. +ASS_Font *ass_font_new(void *font_cache, ASS_Library *library, + FT_Library ftlibrary, void *fc_priv, + ASS_FontDesc *desc); +void ass_font_set_transform(ASS_Font *font, double scale_x, + double scale_y, FT_Vector *v); +void ass_font_set_size(ASS_Font *font, double size); +void ass_font_get_asc_desc(ASS_Font *font, uint32_t ch, int *asc, + int *desc); +FT_Glyph ass_font_get_glyph(void *fontconfig_priv, ASS_Font *font, + uint32_t ch, ASS_Hinting hinting, int flags); +FT_Vector ass_font_get_kerning(ASS_Font *font, uint32_t c1, uint32_t c2); +void ass_font_free(ASS_Font *font); -#endif /* LIBASS_FONT_H */ +#endif /* LIBASS_FONT_H */ |