shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

Allow FT_ENCODING_NONE for `FT_Select_Charmap'.

This is a valid encoding tag for BDF, PCF, and Windows FNT, and
there is no reason to disallow it for these formats.

* src/base/ftobjs.c (FT_Select_Charmap): Implement it.

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

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,5 +1,14 @@

 2018-07-17  Werner Lemberg  <[email protected]>

+	Allow FT_ENCODING_NONE for `FT_Select_Charmap'.

+

+	This is a valid encoding tag for BDF, PCF, and Windows FNT, and

+	there is no reason to disallow it for these formats.

+

+	* src/base/ftobjs.c (FT_Select_Charmap): Implement it.

+

+2018-07-17  Werner Lemberg  <[email protected]>

+

 	* src/pcf/pcfread.c (pcf_get_encodings): Trace `defaultChar'.

 2018-07-16  Armin Hasitzka  <[email protected]>

--- a/include/freetype/freetype.h

+++ b/include/freetype/freetype.h

@@ -642,7 +642,8 @@

    *

    * @values:

    *   FT_ENCODING_NONE ::

-   *     The encoding value~0 is reserved.

+   *     The encoding value~0 is reserved for all formats except BDF, PCF,

+   *     and Windows FNT; see below for more information.

    *

    *   FT_ENCODING_UNICODE ::

    *     The Unicode character set.  This value covers all versions of

--- a/src/base/ftobjs.c

+++ b/src/base/ftobjs.c

@@ -3480,7 +3480,8 @@

     if ( !face )

       return FT_THROW( Invalid_Face_Handle );

-    if ( encoding == FT_ENCODING_NONE )

+    /* FT_ENCODING_NONE is a valid encoding for BDF, PCF, and Windows FNT */

+    if ( encoding == FT_ENCODING_NONE && !face->num_charmaps )

       return FT_THROW( Invalid_Argument );

     /* FT_ENCODING_UNICODE is special.  We try to find the `best' Unicode */

@@ -3501,7 +3502,7 @@

       if ( cur[0]->encoding == encoding )

       {

         face->charmap = cur[0];

-        return 0;

+        return FT_Err_Ok;

       }

     }