mirror of https://github.com/mpv-player/mpv
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
This commit is contained in:
parent
f356ada7fb
commit
65dbd03fed
|
@ -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);
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue