shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

[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)'.

git/fs: mount .git/fs: mount/attach disallowed

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,10 @@

+2012-10-24  Werner Lemberg  <[email protected]>

+

+	[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  <[email protected]>

 	[psaux] Improve parsing of invalid numbers.

--- 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' );