diff options
| author | eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-05-22 22:52:57 +0000 |
|---|---|---|
| committer | eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-05-22 22:52:57 +0000 |
| commit | 72170ac108b6c4572db12bb6af0e89267bc0deb2 (patch) | |
| tree | b740d527b6e3996b6caaf445bd169ac5fcb58fa6 /libass | |
| parent | 3e3a2a4e05ad4a0f5f211b2c61a69e7575710dcb (diff) | |
| download | mpv-72170ac108b6c4572db12bb6af0e89267bc0deb2.tar.bz2 mpv-72170ac108b6c4572db12bb6af0e89267bc0deb2.tar.xz | |
Read all faces of a memory font, not just the first one.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26856 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libass')
| -rw-r--r-- | libass/ass_fontconfig.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libass/ass_fontconfig.c b/libass/ass_fontconfig.c index 34ffdb8519..2d858802e9 100644 --- a/libass/ass_fontconfig.c +++ b/libass/ass_fontconfig.c @@ -351,12 +351,15 @@ static void process_fontdata(fc_instance_t* priv, ass_library_t* library, FT_Lib FcPattern* pattern; FcFontSet* fset; FcBool res; + int face_index, num_faces = 1; - rc = FT_New_Memory_Face(ftlibrary, (unsigned char*)data, data_size, 0, &face); + for (face_index = 0; face_index < num_faces; ++face_index) { + rc = FT_New_Memory_Face(ftlibrary, (unsigned char*)data, data_size, face_index, &face); if (rc) { mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_ErrorOpeningMemoryFont, name); return; } + num_faces = face->num_faces; pattern = FcFreeTypeQueryFace(face, (unsigned char*)name, 0, FcConfigGetBlanks(priv->config)); if (!pattern) { @@ -380,6 +383,7 @@ static void process_fontdata(fc_instance_t* priv, ass_library_t* library, FT_Lib } FT_Done_Face(face); + } #endif } |