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

diff --git a/libass/ass_cache.h b/libass/ass_cache.h
index fb99e3418bd1e4335298731b89b312db60d04c90..12f4293458131390f89469250edd272c16cef159 100644 (file)
--- 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 9f2d131b918be4c6f6193f55c3c5188bc0dcab22..990ea56baf0bebdc05195724e13ce3cc7d9b3b40 100644 (file)
--- 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 4fa31d0b0df65a815d827530c3821891033a6ea4..ed3c438d740d2cc4083373b9bcc089156e6dbd58 100644 (file)
--- 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);