Commit 118c6025b7dddb86f8027f64b00f8bc3c46a3e0a
2012-10-24T12:26:20
[autofit] Only use Unicode CMap. * src/autofit/aflatin.c (af_latin_metrics_init): Implement it, to be in sync with `af_face_globals_compute_script_coverage)'.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53
diff --git a/ChangeLog b/ChangeLog
index 1ea0acd..a2581b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-10-24 Werner Lemberg <wl@gnu.org>
+
+ [autofit] Only use Unicode CMap.
+
+ * src/autofit/aflatin.c (af_latin_metrics_init): Implement it, to be
+ in sync with `af_face_globals_compute_script_coverage)'.
+
2012-10-21 Werner Lemberg <wl@gnu.org>
[psaux] Improve parsing of invalid numbers.
diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c
index a5c1e7d..001d8fb 100644
--- a/src/autofit/aflatin.c
+++ b/src/autofit/aflatin.c
@@ -523,32 +523,12 @@
af_latin_metrics_init( AF_LatinMetrics metrics,
FT_Face face )
{
- FT_Error error = AF_Err_Ok;
FT_CharMap oldmap = face->charmap;
- FT_UInt ee;
-
- static const FT_Encoding latin_encodings[] =
- {
- FT_ENCODING_UNICODE,
- FT_ENCODING_APPLE_ROMAN,
- FT_ENCODING_ADOBE_STANDARD,
- FT_ENCODING_ADOBE_LATIN_1,
-
- FT_ENCODING_NONE /* end of list */
- };
metrics->units_per_em = face->units_per_EM;
- /* do we have a latin charmap in there? */
- for ( ee = 0; latin_encodings[ee] != FT_ENCODING_NONE; ee++ )
- {
- error = FT_Select_Charmap( face, latin_encodings[ee] );
- if ( !error )
- break;
- }
-
- if ( !error )
+ if ( !FT_Select_Charmap( face, FT_ENCODING_UNICODE ) )
{
/* For now, compute the standard width and height from the `o'. */
af_latin_metrics_init_widths( metrics, face, 'o' );