From 9aea06cf7dde9592672e4dba09fb03b2b89d6863 Mon Sep 17 00:00:00 2001 From: greg Date: Fri, 8 Jan 2010 18:35:44 +0000 Subject: Update internal libass copy to commit 8db4a5 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30242 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libass/ass_fontconfig.h | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'libass/ass_fontconfig.h') diff --git a/libass/ass_fontconfig.h b/libass/ass_fontconfig.h index 77806909cf..ad5b9f0e46 100644 --- a/libass/ass_fontconfig.h +++ b/libass/ass_fontconfig.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 * @@ -25,6 +23,7 @@ #include #include "ass_types.h" +#include "ass.h" #include #include FT_FREETYPE_H @@ -32,10 +31,17 @@ #include #endif -typedef struct fc_instance_s fc_instance_t; +typedef struct fc_instance FCInstance; -fc_instance_t* fontconfig_init(ass_library_t* library, FT_Library ftlibrary, const char* family, const char* path, int fc); -char* fontconfig_select(fc_instance_t* priv, const char* family, int treat_family_as_pattern, unsigned bold, unsigned italic, int* index, uint32_t code); -void fontconfig_done(fc_instance_t* priv); +FCInstance *fontconfig_init(ASS_Library *library, + FT_Library ftlibrary, const char *family, + const char *path, int fc, const char *config, + int update); +char *fontconfig_select(ASS_Library *library, FCInstance *priv, + const char *family, int treat_family_as_pattern, + unsigned bold, unsigned italic, int *index, + uint32_t code); +void fontconfig_done(FCInstance *priv); +int fontconfig_update(FCInstance *priv); -#endif /* LIBASS_FONTCONFIG_H */ +#endif /* LIBASS_FONTCONFIG_H */ -- cgit v1.2.3