summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-03 23:11:00 +0000
committereugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-03 23:11:00 +0000
commit46afb40907813caa8a9594e3ab020bb196b9cb28 (patch)
treefb6c319325ab2aedcc8b0d40456ac5b0887ce1fe
parenta28d7004b4f077b186d066fa5ce2407d13c93e7d (diff)
downloadmpv-46afb40907813caa8a9594e3ab020bb196b9cb28.tar.bz2
mpv-46afb40907813caa8a9594e3ab020bb196b9cb28.tar.xz
Prefer microsoft-specific charmaps to all other.
There are some fonts with both 'Unicode' and 'Microsoft/Unicode' charmaps, and the second always seems to be the right choice. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20653 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libass/ass_cache.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/libass/ass_cache.c b/libass/ass_cache.c
index a2f5bf2807..7ed4d7e7c4 100644
--- a/libass/ass_cache.c
+++ b/libass/ass_cache.c
@@ -57,6 +57,24 @@ static int font_compare(face_desc_t* a, face_desc_t* b) {
}
/**
+ * Select Microfost Unicode CharMap, if the font has one.
+ * Otherwise, let FreeType decide.
+ */
+static void charmap_magic(FT_Face face)
+{
+ int i;
+ for (i = 0; i < face->num_charmaps; ++i) {
+ FT_CharMap cmap = face->charmaps[i];
+ unsigned pid = cmap->platform_id;
+ unsigned eid = cmap->encoding_id;
+ if (pid == 3 /*microsoft*/ && (eid == 1 /*unicode bmp*/ || eid == 10 /*full unicode*/)) {
+ FT_Set_Charmap(face, cmap);
+ break;
+ }
+ }
+}
+
+/**
* \brief Get a face object, either from cache or created through FreeType+FontConfig.
* \param library FreeType library object
* \param fontconfig_priv fontconfig private data
@@ -91,6 +109,8 @@ int ass_new_face(FT_Library library, void* fontconfig_priv, face_desc_t* desc, /
no_more_font_messages = 1;
return 1;
}
+
+ charmap_magic(*face);
item = face_cache + face_cache_size;
item->path = strdup(path);