summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexei Podtelezhnikov <apodtele@gmail.com>2017-08-17 21:28:32 -0400
committerAlexei Podtelezhnikov <apodtele@gmail.com>2017-08-17 21:28:32 -0400
commit7653c76533dcde3d87bd7af5a2c12e8c95412c12 (patch)
tree45fbba7edb3b5fd7fd48dcba3f9996460dafa49c
parentcadd29de08abd1bba38d42a76efdb4971d45d01e (diff)
downloadfreetype2-7653c76533dcde3d87bd7af5a2c12e8c95412c12.tar.gz
[sfnt] Avoid synthetic unicode for symbol fonts with PUA.
Reported as https://bugs.chromium.org/p/chromium/issues/detail?id=754574 * src/sfnt/sfobjs.c (sfnt_load_face): Check for FT_ENCODING_MS_SYMBOL.
-rw-r--r--ChangeLog10
-rw-r--r--src/sfnt/sfobjs.c3
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ca92d3275..236842ee8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2017-08-17 Alexei Podtelezhnikov <apodtele@gmail.com>
+
+ [sfnt] Avoid synthetic unicode for symbol fonts with PUA.
+
+ Reported as
+
+ https://bugs.chromium.org/p/chromium/issues/detail?id=754574
+
+ * src/sfnt/sfobjs.c (sfnt_load_face): Check for FT_ENCODING_MS_SYMBOL.
+
2017-08-16 Werner Lemberg <wl@gnu.org>
* src/sfnt/pngshim.c (premultiply_data): Fix compiler warnings.
diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c
index 58f67c03e..289eeef7b 100644
--- a/src/sfnt/sfobjs.c
+++ b/src/sfnt/sfobjs.c
@@ -1492,7 +1492,8 @@
#ifdef FT_CONFIG_OPTION_POSTSCRIPT_NAMES
- if ( charmap->encoding == FT_ENCODING_UNICODE )
+ if ( charmap->encoding == FT_ENCODING_UNICODE ||
+ charmap->encoding == FT_ENCODING_MS_SYMBOL ) /* PUA */
has_unicode = TRUE;
}