summaryrefslogtreecommitdiffstats
path: root/libass
diff options
context:
space:
mode:
authoreugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-27 17:50:05 +0000
committereugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-27 17:50:05 +0000
commit65dbd03fed146c94fa9a4f3ffb0539162f168213 (patch)
tree6cd54f34c9babfe1ba7ae81273d70c3d812fcb0b /libass
parentf356ada7fb65a424bda2ac71ddaad67ede75dc34 (diff)
downloadmpv-65dbd03fed146c94fa9a4f3ffb0539162f168213.tar.bz2
mpv-65dbd03fed146c94fa9a4f3ffb0539162f168213.tar.xz
Move ass_font_desc_t and ass_font_t declarations to ass_font.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21337 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libass')
-rw-r--r--libass/ass_cache.h17
-rw-r--r--libass/ass_font.c2
-rw-r--r--libass/ass_font.h17
3 files changed, 17 insertions, 19 deletions
diff --git a/libass/ass_cache.h b/libass/ass_cache.h
index fb99e3418b..12f4293458 100644
--- a/libass/ass_cache.h
+++ b/libass/ass_cache.h
@@ -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);
diff --git a/libass/ass_font.c b/libass/ass_font.c
index 9f2d131b91..990ea56baf 100644
--- a/libass/ass_font.c
+++ b/libass/ass_font.c
@@ -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"
diff --git a/libass/ass_font.h b/libass/ass_font.h
index 4fa31d0b0d..ed3c438d74 100644
--- a/libass/ass_font.h
+++ b/libass/ass_font.h
@@ -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);