[Git][freetype/freetype][API-organization] 15 commits: [services] FT

Werner Lemberg pushed to branch API-organization at FreeType / FreeType

Commits:

8154d8e2

by Ben Wagner at 2023-04-19T13:48:59-04:00

[services] FT_Size_Reset_Func to return FT_Error

The `MetricsVariations` `FT_Size_Reset_Func` is currently defined to
return `void`, but the implementations return `FT_Error`. Even though
the pointers passed will be the same at runtime, calling a function
through a pointer of a different type from the original function pointer
type is undefined behavior. This may be caught at runtime by Control
Flow Integrity with something like clang's `cfi-icall`.

Issue: https://crbug.com/1433651

* include/freetype/internal/services/svmetric.h (FT_Size_Reset_Func):
return `FT_Error` instead of `void`.

9806414c

by suzuki toshiya at 2023-04-24T13:36:30+09:00

[truetype] Fix `make multi'.

* src/truetype/ttgxvar.c: Include freetype/internal/services/svmetric.h
for the FT_Service_MetricsVariations type definition.

f312b340

by suzuki toshiya at 2023-04-24T14:06:09+09:00

[t1cid] Change the trace messages of the charstrings retrieval errors.

The t1cid driver catches 3 types of errors in
the charstrings retrieval;
A) The invalid FD number, there are 2 subtypes;
  A-1) FD number is the maximum number fitting to FDBytes.
  A-2) FD number is greater than num_dicts.
B) Declared length is overrunning.
C) Declared length is invalid (its end is before its head).

Considering that some widely distributed fonts
(e.g., "CJKV" book by O'Reilly) have A-1 errors
in the unimplemented glyphs, the trace level for
A-1 is calmed to level 1.

The errors A-2, B, and C would be irregular;
their trace levels are kept at level 0, but
the updated trace messages include the CID number.

40676afc

by Werner Lemberg at 2023-04-25T11:47:18+02:00

[sfnt] Fix handling of PS names for Variation Fonts.

* src/sfnt/sfdriver.c (get_win_string, get_apple_string): Continue
construction of string if an invalid character is encountered.

Fixes #1218.

0a3836c9
by Werner Lemberg at 2023-04-25T11:47:18+02:00
```
Improve/add source comments and documentation.
```

7ab541a2

by Alexei Podtelezhnikov at 2023-04-26T23:15:24-04:00

[bdf] Clean up the atom property parsing.

* src/bdflib.c (bdf_is_atom_): Refactor code with fewer checks.
(bdf_list_join_): Return NULL.
(bdf_add_comment_): Use const argument.
(bdf_get_property): Ditto, ditto, make the function static.
* src/bdf.h (bdf_get_property): Remove prototype.

cfe54d6a
by Werner Lemberg at 2023-04-27T06:24:48+02:00
```
s/this is,/that is,/
```

9a3d05d9

by Werner Lemberg at 2023-04-27T06:24:48+02:00

* src/ttgxvar.c: Minor changes.

(TT_Get_MM_Var): Improve tracing messages.
(tt_set_mm_blend): Minor speed-up.

13df1c7d
by Werner Lemberg at 2023-04-28T06:39:32+02:00
```
Minor documentation updates.
```

4908c1e8

by Werner Lemberg at 2023-04-28T06:54:25+02:00

* src/cid/cidgload.c (cid_load_glyph): Fix compiler warnings.

17a0c5df

by Werner Lemberg at 2023-04-28T10:40:41+02:00

* src/cff/cffdrivr.c (cff_ps_get_font_info): Reject 'CFF2' format.

966ff5a5

by Werner Lemberg at 2023-04-28T15:25:20+02:00

* src/cff/cffdrivr/c (cff_get_ps_name): Avoid unnecessary crash.

The situation can happen if `FT_New_Face` (or one of its siblings) is called
with a negative index to get the number of contained faces, followed
immediately by a call to `FT_Get_Postscript_Name`.  While this is not a valid
use of the FreeType library there is no need for a crash.

Fixes #1219.

08268691

by Werner Lemberg at 2023-04-28T15:33:58+02:00

* src/sfnt/ttload.c (tt_face_load_font_dir): Add another guard.

Reject 'OTTO' fonts with no valid tables.

36a086b6

by Alexei Podtelezhnikov at 2023-04-28T19:40:35-04:00

* src/sfnt/pngshim.c (Load_SBit_Png): Remove FALL_THROUGH warning.

77bbfc59

by Werner Lemberg at 2023-04-30T14:42:11+00:00

API documentation: Re-organize chapters and sections

* Split the very long 'Base Interface' section into smaller sections.
* Split the 'Core API' chapter into two chapters.
* Remove single enumeration values from `@order` fields since they have no
  effect.

27 changed files:

docs/CHANGES
docs/formats.txt
include/freetype/freetype.h
include/freetype/ftchapters.h
include/freetype/ftdriver.h
include/freetype/ftimage.h
include/freetype/ftoutln.h
include/freetype/internal/services/svmetric.h
include/freetype/internal/tttypes.h
src/autofit/afblue.dat
src/autofit/aflatin.c
src/autofit/afshaper.c
src/base/ftcalc.c
src/base/ftsystem.c
src/bdf/bdf.h
src/bdf/bdflib.c
src/cff/cffdrivr.c
src/cff/cffload.c
src/cff/cffparse.c
src/cid/cidgload.c
src/pshinter/pshalgo.c
src/sdf/ftsdf.c
src/sfnt/pngshim.c
src/sfnt/sfdriver.c
src/sfnt/ttload.c
src/truetype/ttgxvar.c
src/truetype/ttinterp.c

Changes:

docs/CHANGES

@@ -2424,7 +2424,7 @@ CHANGES BETWEEN 2.3.8 and 2.3.7
        is provided for x86 and ARM.  See FT_CONFIG_OPTION_INLINE_MULFIX
        and FT_CONFIG_OPTION_NO_ASSEMBLER (in ftoption.h) for more.
 -    - The handling of `tricky' fonts  (this is, fonts which don't work
 +    - The handling of `tricky' fonts  (that is, fonts which don't work
        with the  autohinter, needing the font  format's hinting engine)
        has been generalized and changed slightly:
@@ -2881,7 +2881,7 @@ CHANGES BETWEEN 2.2 and 2.1.10
    II. IMPORTANT CHANGES
 -    - Version 2.2 no longer exposes its internals, this is, the header
 +    - Version 2.2 no longer exposes its internals, that is, the header
        files  located in  the `include/freetype/internal'  directory of
        the source package are not  copied anymore by the `make install'
        command.  Consequently, a number of rogue clients which directly

docs/formats.txt

@@ -57,7 +57,7 @@ Notes
    (`*') in the table below.
    FreeType can  be configured to  support Mac  files (on older  Mac OS
 -  versions, a `file' is stored as a data and a resource fork, this is,
 +  versions, a `file' is stored as a data and a resource fork, that is,
    within two  separate data chunks).  If  a file can't be  opened as a
    font, FreeType then checks whether it  is a resource fork, trying to
    extract  the contained  font data  from  either a  `POST' or  `sfnt'

include/freetype/freetype.h

@@ -102,61 +102,25 @@ FT_BEGIN_HEADER
     */
+-
 -  /*************************************************************************/
 -  /*************************************************************************/
 -  /*                                                                       */
 -  /*                        B A S I C   T Y P E S                          */
 -  /*                                                                       */
 -  /*************************************************************************/
 -  /*************************************************************************/
+-
+-
    /**************************************************************************
+    *
     * @section:
 -   *   base_interface
 +   *   font_testing_macros
+    *
     * @title:
 -   *   Base Interface
 +   *   Font Testing Macros
+    *
     * @abstract:
 -   *   The FreeType~2 base font interface.
 +   *   Macros to test various properties of fonts.
+    *
     * @description:
 -   *   This section describes the most important public high-level API
 -   *   functions of FreeType~2.
 +   *   Macros to test the most important font properties.
+    *
 -   * @order:
 -   *   FT_Library
 -   *   FT_Face
 -   *   FT_Size
 -   *   FT_GlyphSlot
 -   *   FT_CharMap
 -   *   FT_Encoding
 -   *   FT_ENC_TAG
 -   *
 -   *   FT_FaceRec
 -   *
 -   *   FT_FACE_FLAG_SCALABLE
 -   *   FT_FACE_FLAG_FIXED_SIZES
 -   *   FT_FACE_FLAG_FIXED_WIDTH
 -   *   FT_FACE_FLAG_HORIZONTAL
 -   *   FT_FACE_FLAG_VERTICAL
 -   *   FT_FACE_FLAG_COLOR
 -   *   FT_FACE_FLAG_SFNT
 -   *   FT_FACE_FLAG_CID_KEYED
 -   *   FT_FACE_FLAG_TRICKY
 -   *   FT_FACE_FLAG_KERNING
 -   *   FT_FACE_FLAG_MULTIPLE_MASTERS
 -   *   FT_FACE_FLAG_VARIATION
 -   *   FT_FACE_FLAG_GLYPH_NAMES
 -   *   FT_FACE_FLAG_EXTERNAL_STREAM
 -   *   FT_FACE_FLAG_HINTER
 -   *   FT_FACE_FLAG_SVG
 -   *   FT_FACE_FLAG_SBIX
 -   *   FT_FACE_FLAG_SBIX_OVERLAY
 +   *   It is recommended to use these high-level macros instead of directly
 +   *   testing the corresponding flags, which are scattered over various
 +   *   structures.
+    *
 +   * @order:
     *   FT_HAS_HORIZONTAL
     *   FT_HAS_VERTICAL
     *   FT_HAS_KERNING
@@ -176,21 +140,59 @@ FT_BEGIN_HEADER
     *   FT_IS_NAMED_INSTANCE
     *   FT_IS_VARIATION
+    *
 -   *   FT_STYLE_FLAG_BOLD
 -   *   FT_STYLE_FLAG_ITALIC
 +   */
++
++
 +  /**************************************************************************
 +   *
 +   * @section:
 +   *   library_setup
+    *
 -   *   FT_SizeRec
 -   *   FT_Size_Metrics
 +   * @title:
 +   *   Library Setup
+    *
 -   *   FT_GlyphSlotRec
 -   *   FT_Glyph_Metrics
 -   *   FT_SubGlyph
 +   * @abstract:
 +   *   Functions to start and end the usage of the FreeType library.
+    *
 -   *   FT_Bitmap_Size
 +   * @description:
 +   *   Functions to start and end the usage of the FreeType library.
 +   *
 +   *   Note that @FT_Library_Version and @FREETYPE_XXX are of limited use
 +   *   because even a new release of FreeType with only documentation
 +   *   changes increases the version number.
+    *
 +   * @order:
 +   *   FT_Library
     *   FT_Init_FreeType
     *   FT_Done_FreeType
+    *
 +   *   FT_Library_Version
 +   *   FREETYPE_XXX
 +   *
 +   */
++
++
 +  /**************************************************************************
 +   *
 +   * @section:
 +   *   face_creation
 +   *
 +   * @title:
 +   *   Face Creation
 +   *
 +   * @abstract:
 +   *   Functions to manage fonts.
 +   *
 +   * @description:
 +   *   The functions and structures collected in this section operate on
 +   *   fonts globally.
 +   *
 +   * @order:
 +   *   FT_Face
 +   *   FT_FaceRec
 +   *   FT_FACE_FLAG_XXX
 +   *   FT_STYLE_FLAG_XXX
 +   *
     *   FT_New_Face
     *   FT_Done_Face
     *   FT_Reference_Face
@@ -198,10 +200,36 @@ FT_BEGIN_HEADER
     *   FT_Face_Properties
     *   FT_Open_Face
     *   FT_Open_Args
 +   *   FT_OPEN_XXX
     *   FT_Parameter
     *   FT_Attach_File
     *   FT_Attach_Stream
+    *
 +   */
++
++
 +  /**************************************************************************
 +   *
 +   * @section:
 +   *   sizing_and_scaling
 +   *
 +   * @title:
 +   *   Sizing and Scaling
 +   *
 +   * @abstract:
 +   *   Functions to manage font sizes.
 +   *
 +   * @description:
 +   *   The functions and structures collected in this section are related to
 +   *   selecting and manipulating the size of a font globally.
 +   *
 +   * @order:
 +   *   FT_Size
 +   *   FT_SizeRec
 +   *   FT_Size_Metrics
 +   *
 +   *   FT_Bitmap_Size
 +   *
     *   FT_Set_Char_Size
     *   FT_Set_Pixel_Sizes
     *   FT_Request_Size
@@ -209,44 +237,37 @@ FT_BEGIN_HEADER
     *   FT_Size_Request_Type
     *   FT_Size_RequestRec
     *   FT_Size_Request
 +   *
     *   FT_Set_Transform
     *   FT_Get_Transform
 -   *   FT_Load_Glyph
 -   *   FT_Get_Char_Index
 -   *   FT_Get_First_Char
 -   *   FT_Get_Next_Char
 -   *   FT_Load_Char
+    *
 -   *   FT_OPEN_MEMORY
 -   *   FT_OPEN_STREAM
 -   *   FT_OPEN_PATHNAME
 -   *   FT_OPEN_DRIVER
 -   *   FT_OPEN_PARAMS
 -   *
 -   *   FT_LOAD_DEFAULT
 -   *   FT_LOAD_RENDER
 -   *   FT_LOAD_MONOCHROME
 -   *   FT_LOAD_LINEAR_DESIGN
 -   *   FT_LOAD_NO_SCALE
 -   *   FT_LOAD_NO_HINTING
 -   *   FT_LOAD_NO_BITMAP
 -   *   FT_LOAD_SBITS_ONLY
 -   *   FT_LOAD_NO_AUTOHINT
 -   *   FT_LOAD_COLOR
 -   *
 -   *   FT_LOAD_VERTICAL_LAYOUT
 -   *   FT_LOAD_IGNORE_TRANSFORM
 -   *   FT_LOAD_FORCE_AUTOHINT
 -   *   FT_LOAD_NO_RECURSE
 -   *   FT_LOAD_PEDANTIC
 -   *
 -   *   FT_LOAD_TARGET_NORMAL
 -   *   FT_LOAD_TARGET_LIGHT
 -   *   FT_LOAD_TARGET_MONO
 -   *   FT_LOAD_TARGET_LCD
 -   *   FT_LOAD_TARGET_LCD_V
 +   */
++
++
 +  /**************************************************************************
 +   *
 +   * @section:
 +   *   glyph_retrieval
 +   *
 +   * @title:
 +   *   Glyph Retrieval
 +   *
 +   * @abstract:
 +   *   Functions to manage glyphs.
 +   *
 +   * @description:
 +   *   The functions and structures collected in this section operate on
 +   *   single glyphs, of which @FT_Load_Glyph is most important.
+    *
 +   * @order:
 +   *   FT_GlyphSlot
 +   *   FT_GlyphSlotRec
 +   *   FT_Glyph_Metrics
 +   *
 +   *   FT_Load_Glyph
 +   *   FT_LOAD_XXX
     *   FT_LOAD_TARGET_MODE
 +   *   FT_LOAD_TARGET_XXX
+    *
     *   FT_Render_Glyph
     *   FT_Render_Mode
@@ -254,34 +275,121 @@ FT_BEGIN_HEADER
     *   FT_Kerning_Mode
     *   FT_Get_Track_Kerning
+    *
 +   */
++
++
 +  /**************************************************************************
 +   *
 +   * @section:
 +   *   character_mapping
 +   *
 +   * @title:
 +   *   Character Mapping
 +   *
 +   * @abstract:
 +   *   Functions to manage character-to-glyph maps.
 +   *
 +   * @description:
 +   *   This section holds functions and structures that are related to
 +   *   mapping character input codes to glyph indices.
 +   *
 +   *   Note that for many scripts the simplistic approach used by FreeType
 +   *   of mapping a single character to a single glyph is not valid or
 +   *   possible!  In general, a higher-level library like HarfBuzz or ICU
 +   *   should be used for handling text strings.
 +   *
 +   * @order:
 +   *   FT_CharMap
     *   FT_CharMapRec
 +   *   FT_Encoding
 +   *   FT_ENC_TAG
 +   *
     *   FT_Select_Charmap
     *   FT_Set_Charmap
     *   FT_Get_Charmap_Index
+    *
 +   *   FT_Get_Char_Index
 +   *   FT_Get_First_Char
 +   *   FT_Get_Next_Char
 +   *   FT_Load_Char
 +   *
 +   */
++
++
 +  /**************************************************************************
 +   *
 +   * @section:
 +   *   information_retrieval
 +   *
 +   * @title:
 +   *   Information Retrieval
 +   *
 +   * @abstract:
 +   *   Functions to retrieve font and glyph information.
 +   *
 +   * @description:
 +   *   Functions to retrieve font and glyph information.  Only some very
 +   *   basic data is covered; see also the chapter on the format-specific
 +   *   API for more.
 +   *
 +   *
 +   * @order:
     *   FT_Get_Name_Index
     *   FT_Get_Glyph_Name
     *   FT_Get_Postscript_Name
     *   FT_Get_FSType_Flags
 +   *   FT_FSTYPE_XXX
     *   FT_Get_SubGlyph_Info
 +   *   FT_SUBGLYPH_FLAG_XXX
 +   *
 +   */
++
++
 +  /**************************************************************************
 +   *
 +   * @section:
 +   *   other_api_data
 +   *
 +   * @title:
 +   *   Other API Data
 +   *
 +   * @abstract:
 +   *   Other structures, enumerations, and macros.
+    *
 +   * @description:
 +   *   Other structures, enumerations, and macros.  Deprecated functions are
 +   *   also listed here.
 +   *
 +   * @order:
     *   FT_Face_Internal
     *   FT_Size_Internal
     *   FT_Slot_Internal
+    *
 -   *   FT_FACE_FLAG_XXX
 -   *   FT_STYLE_FLAG_XXX
 -   *   FT_OPEN_XXX
 -   *   FT_LOAD_XXX
 -   *   FT_LOAD_TARGET_XXX
 -   *   FT_SUBGLYPH_FLAG_XXX
 -   *   FT_FSTYPE_XXX
 +   *   FT_SubGlyph
+    *
     *   FT_HAS_FAST_GLYPHS
 +   *   FT_Face_CheckTrueTypePatents
 +   *   FT_Face_SetUnpatentedHinting
+    *
     */
 +  /*************************************************************************/
 +  /*************************************************************************/
 +  /*                                                                       */
 +  /*                        B A S I C   T Y P E S                          */
 +  /*                                                                       */
 +  /*************************************************************************/
 +  /*************************************************************************/
++
++
 +  /**************************************************************************
 +   *
 +   * @section:
 +   *   glyph_retrieval
 +   *
 +   */
++
    /**************************************************************************
+    *
     * @struct:
@@ -349,6 +457,13 @@ FT_BEGIN_HEADER
    } FT_Glyph_Metrics;
 +  /**************************************************************************
 +   *
 +   * @section:
 +   *   sizing_and_scaling
 +   *
 +   */
++
    /**************************************************************************
+    *
     * @struct:
@@ -409,6 +524,13 @@ FT_BEGIN_HEADER
    /*************************************************************************/
    /*************************************************************************/
 +  /**************************************************************************
 +   *
 +   * @section:
 +   *   library_setup
 +   *
 +   */
++
    /**************************************************************************
+    *
     * @type:
@@ -483,7 +605,7 @@ FT_BEGIN_HEADER
    /**************************************************************************
+    *
     * @section:
 -   *   base_interface
 +   *   face_creation
+    *
     */
@@ -519,6 +641,13 @@ FT_BEGIN_HEADER
    typedef struct FT_FaceRec_*  FT_Face;
 +  /**************************************************************************
 +   *
 +   * @section:
 +   *   sizing_and_scaling
 +   *
 +   */
++
    /**************************************************************************
+    *
     * @type:
@@ -551,6 +680,13 @@ FT_BEGIN_HEADER
    typedef struct FT_SizeRec_*  FT_Size;
 +  /**************************************************************************
 +   *
 +   * @section:
 +   *   glyph_retrieval
 +   *
 +   */
++
    /**************************************************************************
+    *
     * @type:
@@ -570,6 +706,13 @@ FT_BEGIN_HEADER
    typedef struct FT_GlyphSlotRec_*  FT_GlyphSlot;
 +  /**************************************************************************
 +   *
 +   * @section:
 +   *   character_mapping
 +   *
 +   */
++
    /**************************************************************************
+    *
     * @type:
@@ -877,6 +1020,13 @@ FT_BEGIN_HEADER
    /*************************************************************************/
 +  /**************************************************************************
 +   *
 +   * @section:
 +   *   other_api_data
 +   *
 +   */
++
    /**************************************************************************
+    *
     * @type:
@@ -892,6 +1042,13 @@ FT_BEGIN_HEADER
    typedef struct FT_Face_InternalRec_*  FT_Face_Internal;
 +  /**************************************************************************
 +   *
 +   * @section:
 +   *   face_creation
 +   *
 +   */
++
    /**************************************************************************
+    *
     * @struct:
@@ -918,7 +1075,7 @@ FT_BEGIN_HEADER
     *     If we have the third named instance of face~4, say, `face_index` is
     *     set to 0x00030004.
+    *
 -   *     Bit 31 is always zero (this is, `face_index` is always a positive
 +   *     Bit 31 is always zero (that is, `face_index` is always a positive
     *     value).
+    *
     *     [Since 2.9] Changing the design coordinates with
@@ -936,7 +1093,7 @@ FT_BEGIN_HEADER
+    *
     *     [Since 2.6.1] Bits 16-30 hold the number of named instances
     *     available for the current face if we have a GX or OpenType variation
 -   *     (sub)font.  Bit 31 is always zero (this is, `style_flags` is always
 +   *     (sub)font.  Bit 31 is always zero (that is, `style_flags` is always
     *     a positive value).  Note that a variation font has always at least
     *     one named instance, namely the default instance.
+    *
@@ -1002,7 +1159,7 @@ FT_BEGIN_HEADER
     *     Note that the bounding box might be off by (at least) one pixel for
     *     hinted fonts.  See @FT_Size_Metrics for further discussion.
+    *
 -   *     Note that the bounding box does not vary in OpenType variable fonts
 +   *     Note that the bounding box does not vary in OpenType variation fonts
     *     and should only be used in relation to the default instance.
+    *
     *   units_per_EM ::
@@ -1090,9 +1247,9 @@ FT_BEGIN_HEADER
      FT_Generic        generic;
 -    /*# The following member variables (down to `underline_thickness`) */
 -    /*# are only relevant to scalable outlines; cf. @FT_Bitmap_Size    */
 -    /*# for bitmap fonts.                                              */
 +    /* The following member variables (down to `underline_thickness`) */
 +    /* are only relevant to scalable outlines; cf. @FT_Bitmap_Size    */
 +    /* for bitmap fonts.                                              */
      FT_BBox           bbox;
      FT_UShort         units_per_EM;
@@ -1110,7 +1267,7 @@ FT_BEGIN_HEADER
      FT_Size           size;
      FT_CharMap        charmap;
 -    /*@private begin */
 +    /* private fields, internal to FreeType */
      FT_Driver         driver;
      FT_Memory         memory;
@@ -1123,8 +1280,6 @@ FT_BEGIN_HEADER
      FT_Face_Internal  internal;
 -    /*@private end */
+-
    } FT_FaceRec;
@@ -1207,13 +1362,13 @@ FT_BEGIN_HEADER
     *     successfully; in all other cases you get an
     *     `FT_Err_Invalid_Argument` error.
+    *
 -   *     Note that CID-keyed fonts that are in an SFNT wrapper (this is, all
 +   *     Note that CID-keyed fonts that are in an SFNT wrapper (that is, all
     *     OpenType/CFF fonts) don't have this flag set since the glyphs are
     *     accessed in the normal way (using contiguous indices); the
     *     'CID-ness' isn't visible to the application.
+    *
     *   FT_FACE_FLAG_TRICKY ::
 -   *     The face is 'tricky', this is, it always needs the font format's
 +   *     The face is 'tricky', that is, it always needs the font format's
     *     native hinting engine to get a reasonable result.  A typical example
     *     is the old Chinese font `mingli.ttf` (but not `mingliu.ttc`) that
     *     uses TrueType bytecode instructions to move and scale all of its
@@ -1235,8 +1390,8 @@ FT_BEGIN_HEADER
     *   FT_FACE_FLAG_VARIATION ::
     *     [Since 2.9] Set if the current face (or named instance) has been
     *     altered with @FT_Set_MM_Design_Coordinates,
 -   *     @FT_Set_Var_Design_Coordinates, or @FT_Set_Var_Blend_Coordinates.
 -   *     This flag is unset by a call to @FT_Set_Named_Instance.
 +   *     @FT_Set_Var_Design_Coordinates, @FT_Set_Var_Blend_Coordinates, or
 +   *     @FT_Set_MM_WeightVector to select a non-default instance.
+    *
     *   FT_FACE_FLAG_SVG ::
     *     [Since 2.12] The face has an 'SVG~' OpenType table.
@@ -1272,6 +1427,13 @@ FT_BEGIN_HEADER
  #define FT_FACE_FLAG_SBIX_OVERLAY      ( 1L << 18 )
 +  /**************************************************************************
 +   *
 +   * @section:
 +   *   font_testing_macros
 +   *
 +   */
++
    /**************************************************************************
+    *
     * @macro:
@@ -1381,6 +1543,13 @@ FT_BEGIN_HEADER
            ( !!( (face)->face_flags & FT_FACE_FLAG_FIXED_SIZES ) )
 +  /**************************************************************************
 +   *
 +   * @section:
 +   *   other_api_data
 +   *
 +   */
++
    /**************************************************************************
+    *
     * @macro:
@@ -1393,6 +1562,13 @@ FT_BEGIN_HEADER
  #define FT_HAS_FAST_GLYPHS( face )  0
 +  /**************************************************************************
 +   *
 +   * @section:
 +   *   font_testing_macros
 +   *
 +   */
++
    /**************************************************************************
+    *
     * @macro:
@@ -1451,8 +1627,8 @@ FT_BEGIN_HEADER
+    *
     * @description:
     *   A macro that returns true whenever a face object has been altered by
 -   *   @FT_Set_MM_Design_Coordinates, @FT_Set_Var_Design_Coordinates, or
 -   *   @FT_Set_Var_Blend_Coordinates.
 +   *   @FT_Set_MM_Design_Coordinates, @FT_Set_Var_Design_Coordinates,
 +   *   @FT_Set_Var_Blend_Coordinates, or @FT_Set_MM_WeightVector.
+    *
     * @since:
     *   2.9
@@ -1628,6 +1804,13 @@ FT_BEGIN_HEADER
            ( !!( (face)->face_flags & FT_FACE_FLAG_SBIX_OVERLAY ) )
 +  /**************************************************************************
 +   *
 +   * @section:
 +   *   face_creation
 +   *
 +   */
++
    /**************************************************************************
+    *
     * @enum:
@@ -1654,6 +1837,13 @@ FT_BEGIN_HEADER
  #define FT_STYLE_FLAG_BOLD    ( 1 << 1 )
 +  /**************************************************************************
 +   *
 +   * @section:
 +   *   other_api_data
 +   *
 +   */
++
    /**************************************************************************
+    *
     * @type:
@@ -1666,6 +1856,13 @@ FT_BEGIN_HEADER
    typedef struct FT_Size_InternalRec_*  FT_Size_Internal;
 +  /**************************************************************************
 +   *
 +   * @section:
 +   *   sizing_and_scaling
 +   *
 +   */
++
    /**************************************************************************
+    *
     * @struct:
@@ -1817,6 +2014,13 @@ FT_BEGIN_HEADER
    } FT_SizeRec;
 +  /**************************************************************************
 +   *
 +   * @section:
 +   *   other_api_data
 +   *
 +   */
++
    /**************************************************************************
+    *
     * @struct:
@@ -1848,6 +2052,13 @@ FT_BEGIN_HEADER
    typedef struct FT_Slot_InternalRec_*  FT_Slot_Internal;
 +  /**************************************************************************
 +   *
 +   * @section:
 +   *   glyph_retrieval
 +   *
 +   */
++
    /**************************************************************************
+    *
     * @struct:
@@ -2092,6 +2303,13 @@ FT_BEGIN_HEADER
    /*************************************************************************/
 +  /**************************************************************************
 +   *
 +   * @section:
 +   *   library_setup
 +   *
 +   */
++
    /**************************************************************************
+    *
     * @function:
@@ -2149,6 +2367,13 @@ FT_BEGIN_HEADER
    FT_Done_FreeType( FT_Library  library );
 +  /**************************************************************************
 +   *
 +   * @section:
 +   *   face_creation
 +   *
 +   */
++
    /**************************************************************************
+    *
     * @enum:
@@ -2451,7 +2676,7 @@ FT_BEGIN_HEADER
     *   Each new face object created with this function also owns a default
     *   @FT_Size object, accessible as `face->size`.
+    *
 -   *   One @FT_Library instance can have multiple face objects, this is,
 +   *   One @FT_Library instance can have multiple face objects, that is,
     *   @FT_Open_Face and its siblings can be called multiple times using the
     *   same `library` argument.
+    *
@@ -2650,6 +2875,13 @@ FT_BEGIN_HEADER
    FT_Done_Face( FT_Face  face );
 +  /**************************************************************************
 +   *
 +   * @section:
 +   *   sizing_and_scaling
 +   *
 +   */
++
    /**************************************************************************
+    *
     * @function:
@@ -2679,7 +2911,7 @@ FT_BEGIN_HEADER
     *   silently uses outlines if there is no bitmap for a given glyph index.
+    *
     *   For GX and OpenType variation fonts, a bitmap strike makes sense only
 -   *   if the default instance is active (this is, no glyph variation takes
 +   *   if the default instance is active (that is, no glyph variation takes
     *   place); otherwise, FreeType simply ignores bitmap strikes.  The same
     *   is true for all named instances that are different from the default
     *   instance.
@@ -2942,6 +3174,13 @@ FT_BEGIN_HEADER
                        FT_UInt  pixel_height );
 +  /**************************************************************************
 +   *
 +   * @section:
 +   *   glyph_retrieval
 +   *
 +   */
++
    /**************************************************************************
+    *
     * @function:
@@ -2976,7 +3215,7 @@ FT_BEGIN_HEADER
     *   glyph may be transformed.  See @FT_Set_Transform for the details.
+    *
     *   For subsetted CID-keyed fonts, `FT_Err_Invalid_Argument` is returned
 -   *   for invalid CID values (this is, for CID values that don't have a
 +   *   for invalid CID values (that is, for CID values that don't have a
     *   corresponding glyph in the font).  See the discussion of the
     *   @FT_FACE_FLAG_CID_KEYED flag for more details.
+    *
@@ -2990,6 +3229,13 @@ FT_BEGIN_HEADER
                   FT_Int32  load_flags );
 +  /**************************************************************************
 +   *
 +   * @section:
 +   *   character_mapping
 +   *
 +   */
++
    /**************************************************************************
+    *
     * @function:
@@ -3033,6 +3279,13 @@ FT_BEGIN_HEADER
                  FT_Int32  load_flags );
 +  /**************************************************************************
 +   *
 +   * @section:
 +   *   glyph_retrieval
 +   *
 +   */
++
    /**************************************************************************
+    *
     * @enum:
@@ -3372,6 +3625,13 @@ FT_BEGIN_HEADER
            FT_STATIC_CAST( FT_Render_Mode, ( (x) >> 16 ) & 15 )
 +  /**************************************************************************
 +   *
 +   * @section:
 +   *   sizing_and_scaling
 +   *
 +   */
++
    /**************************************************************************
+    *
     * @function:
@@ -3447,6 +3707,13 @@ FT_BEGIN_HEADER
                      FT_Vector*  delta );
 +  /**************************************************************************
 +   *
 +   * @section:
 +   *   glyph_retrieval
 +   *
 +   */
++
    /**************************************************************************
+    *
     * @enum:
@@ -3841,6 +4108,13 @@ FT_BEGIN_HEADER
                          FT_Fixed*  akerning );
 +  /**************************************************************************
 +   *
 +   * @section:
 +   *   character_mapping
 +   *
 +   */
++
    /**************************************************************************
+    *
     * @function:
@@ -4057,6 +4331,13 @@ FT_BEGIN_HEADER
                      FT_UInt   *agindex );
 +  /**************************************************************************
 +   *
 +   * @section:
 +   *   face_creation
 +   *
 +   */
++
    /**************************************************************************
+    *
     * @function:
@@ -4155,6 +4436,13 @@ FT_BEGIN_HEADER
                        FT_Parameter*  properties );
 +  /**************************************************************************
 +   *
 +   * @section:
 +   *   information_retrieval
 +   *
 +   */
++
    /**************************************************************************
+    *
     * @function:
@@ -4266,9 +4554,10 @@ FT_BEGIN_HEADER
+    *
     *   [Since 2.9] Special PostScript names for named instances are only
     *   returned if the named instance is set with @FT_Set_Named_Instance (and
 -   *   the font has corresponding entries in its 'fvar' table).  If
 -   *   @FT_IS_VARIATION returns true, the algorithmically derived PostScript
 -   *   name is provided, not looking up special entries for named instances.
 +   *   the font has corresponding entries in its 'fvar' table or is the
 +   *   default named instance).  If @FT_IS_VARIATION returns true, the
 +   *   algorithmically derived PostScript name is provided, not looking up
 +   *   special entries for named instances.
     */
    FT_EXPORT( const char* )
    FT_Get_Postscript_Name( FT_Face  face );
@@ -4900,32 +5189,10 @@ FT_BEGIN_HEADER
    /**************************************************************************
+    *
     * @section:
 -   *   version
 -   *
 -   * @title:
 -   *   FreeType Version
 -   *
 -   * @abstract:
 -   *   Functions and macros related to FreeType versions.
 -   *
 -   * @description:
 -   *   Note that those functions and macros are of limited use because even a
 -   *   new release of FreeType with only documentation changes increases the
 -   *   version number.
 -   *
 -   * @order:
 -   *   FT_Library_Version
 -   *
 -   *   FREETYPE_MAJOR
 -   *   FREETYPE_MINOR
 -   *   FREETYPE_PATCH
 -   *
 -   *   FT_Face_CheckTrueTypePatents
 -   *   FT_Face_SetUnpatentedHinting
 +   *   library_setup
+    *
     */
+-
    /**************************************************************************
+    *
     * @enum:
@@ -4992,6 +5259,13 @@ FT_BEGIN_HEADER
                        FT_Int      *apatch );
 +  /**************************************************************************
 +   *
 +   * @section:
 +   *   other_api_data
 +   *
 +   */
++
    /**************************************************************************
+    *
     * @function:

include/freetype/ftchapters.h

@@ -31,9 +31,28 @@
     *   Core API
+    *
     * @sections:
 -   *   version
     *   basic_types
 -   *   base_interface
 +   *   library_setup
 +   *   face_creation
 +   *   font_testing_macros
 +   *   sizing_and_scaling
 +   *   glyph_retrieval
 +   *   character_mapping
 +   *   information_retrieval
 +   *   other_api_data
 +   *
 +   */
++
++
 +  /**************************************************************************
 +   *
 +   * @chapter:
 +   *   extended_api
 +   *
 +   * @title:
 +   *   Extended API
 +   *
 +   * @sections:
     *   glyph_variants
     *   color_management
     *   layer_management

include/freetype/ftdriver.h

@@ -134,7 +134,7 @@ FT_BEGIN_HEADER
     *   each being rounded to the nearest pixel edge, taking care of overshoot
     *   suppression at small sizes, stem darkening, and scaling.
+    *
 -   *   Hstems (this is, hint values defined in the font to help align
 +   *   Hstems (that is, hint values defined in the font to help align
     *   horizontal features) that fall within a blue zone are said to be
     *   'captured' and are aligned to that zone.  Uncaptured stems are moved
     *   in one of four ways, top edge up or down, bottom edge up or down.
@@ -446,7 +446,7 @@ FT_BEGIN_HEADER
     *   at smaller sizes.
+    *
     *   For the auto-hinter, stem-darkening is experimental currently and thus
 -   *   switched off by default (this is, `no-stem-darkening` is set to TRUE
 +   *   switched off by default (that is, `no-stem-darkening` is set to TRUE
     *   by default).  Total consistency with the CFF driver is not achieved
     *   right now because the emboldening method differs and glyphs must be
     *   scaled down on the Y-axis to keep outline points inside their

include/freetype/ftimage.h


    *   @FT_SpanFunc that takes the y~coordinate of the span as a parameter.
    *
    *   The anti-aliased rasterizer produces coverage values from 0 to 255,
-   *   this is, from completely transparent to completely opaque.
+   *   that is, from completely transparent to completely opaque.
    */
   typedef struct  FT_Span_
   {

include/freetype/ftoutln.h

@@ -118,7 +118,7 @@ FT_BEGIN_HEADER
     *   attachement.
+    *
     *   Similarly, the function returns success for an empty outline also
 -   *   (doing nothing, this is, not calling any emitter); if necessary, you
 +   *   (doing nothing, that is, not calling any emitter); if necessary, you
     *   should filter this out, too.
     */
    FT_EXPORT( FT_Error )

include/freetype/internal/services/svmetric.h

@@ -77,7 +77,7 @@ FT_BEGIN_HEADER
    typedef void
    (*FT_Metrics_Adjust_Func)( FT_Face  face );
 -  typedef void
 +  typedef FT_Error
    (*FT_Size_Reset_Func)( FT_Size  size );

include/freetype/internal/tttypes.h

@@ -1200,12 +1200,16 @@ FT_BEGIN_HEADER
     *   mm ::
     *     A pointer to the Multiple Masters service.
+    *
 -   *   var ::
 -   *     A pointer to the Metrics Variations service.
 +   *   tt_var ::
 +   *     A pointer to the Metrics Variations service for the "truetype"
 +   *     driver.
+    *
 -   *   hdmx ::
 -   *     The face's horizontal device metrics ('hdmx' table).  This table is
 -   *     optional in TrueType/OpenType fonts.
 +   *   face_var ::
 +   *     A pointer to the Metrics Variations service for this `TT_Face`'s
 +   *     driver.
 +   *
 +   *   psaux ::
 +   *     A pointer to the PostScript Auxiliary service.
+    *
     *   gasp ::
     *     The grid-fitting and scaling properties table ('gasp').  This table
@@ -1357,14 +1361,6 @@ FT_BEGIN_HEADER
     *     A mapping between the strike indices exposed by the API and the
     *     indices used in the font's sbit table.
+    *
 -   *   cpal ::
 -   *     A pointer to data related to the 'CPAL' table.  `NULL` if the table
 -   *     is not available.
 -   *
 -   *   colr ::
 -   *     A pointer to data related to the 'COLR' table.  `NULL` if the table
 -   *     is not available.
 -   *
     *   kern_table ::
     *     A pointer to the 'kern' table.
+    *
@@ -1405,6 +1401,18 @@ FT_BEGIN_HEADER
+    *
     *   ebdt_size ::
     *     The size of the sbit data table.
 +   *
 +   *   cpal ::
 +   *     A pointer to data related to the 'CPAL' table.  `NULL` if the table
 +   *     is not available.
 +   *
 +   *   colr ::
 +   *     A pointer to data related to the 'COLR' table.  `NULL` if the table
 +   *     is not available.
 +   *
 +   *   svg ::
 +   *     A pointer to data related to the 'SVG' table.  `NULL` if the table
 +   *     is not available.
     */
    typedef struct  TT_FaceRec_
+   {
@@ -1462,7 +1470,7 @@ FT_BEGIN_HEADER
      /* a typeless pointer to the FT_Service_MetricsVariationsRec table */
      /* used to handle the HVAR, VVAR, and MVAR OpenType tables by this */
      /* TT_Face's driver                                                */
 -    void*                 face_var;
 +    void*                 face_var;             /* since 2.13.1 */
  #endif
      /* a typeless pointer to the PostScript Aux service */

src/autofit/afblue.dat

@@ -89,7 +89,7 @@ AF_BLUE_STRING_ENUM AF_BLUE_STRINGS_ARRAY AF_BLUE_STRING_MAX_LEN:
      "ت ث ط ظ ك"
    // We don't necessarily have access to medial forms via Unicode in case
    // Arabic presentational forms are missing.  The only character that is
 -  // guaranteed to have the same vertical position with joining (this is,
 +  // guaranteed to have the same vertical position with joining (that is,
    // non-isolated) forms is U+0640, ARABIC TATWEEL, which must join both
    // round and flat curves.
    AF_BLUE_STRING_ARABIC_JOIN

src/autofit/aflatin.c

@@ -2038,7 +2038,7 @@
              max = seg2->max_coord;
            /* compute maximum coordinate difference of the two segments */
 -          /* (this is, how much they overlap)                          */
 +          /* (that is, how much they overlap)                          */
            len = max - min;
            if ( len >= len_threshold )
+           {

src/autofit/afshaper.c

@@ -258,7 +258,7 @@
      /*
       * We now check whether we can construct blue zones, using glyphs
       * covered by the feature only.  In case there is not a single zone
 -     * (this is, not a single character is covered), we skip this coverage.
 +     * (that is, not a single character is covered), we skip this coverage.
+      *
       */
      if ( style_class->coverage != AF_COVERAGE_DEFAULT )
@@ -313,9 +313,9 @@
       * hinted and usually rendered glyph.
+      *
       * Consider the superscript feature of font `pala.ttf': Some of the
 -     * glyphs are `real', this is, they have a zero vertical offset, but
 +     * glyphs are `real', that is, they have a zero vertical offset, but
       * most of them are small caps glyphs shifted up to the superscript
 -     * position (this is, the `sups' feature is present in both the GSUB and
 +     * position (that is, the `sups' feature is present in both the GSUB and
       * GPOS tables).  The code for blue zones computation actually uses a
       * feature's y offset so that the `real' glyphs get correct hints.  But
       * later on it is impossible to decide whether a glyph index belongs to,

src/base/ftcalc.c

@@ -1061,7 +1061,7 @@
      /*                                                           */
      /* This approach has the advantage that the angle between    */
      /* `in' and `out' is not checked.  In case one of the two    */
 -    /* vectors is `dominant', this is, much larger than the      */
 +    /* vectors is `dominant', that is, much larger than the      */
      /* other vector, we thus always have a flat corner.          */
      /*                                                           */
      /*                hypotenuse                                 */

src/base/ftsystem.c

@@ -206,7 +206,7 @@
     *     The number of bytes to read from the stream.
+    *
     * @Return:
 -   *   The number of bytes actually read.  If `count' is zero (this is,
 +   *   The number of bytes actually read.  If `count' is zero (that is,
     *   the function is used for seeking), a non-zero return value
     *   indicates an error.
     */

src/bdf/bdf.h

@@ -239,10 +239,6 @@ FT_BEGIN_HEADER
    FT_LOCAL( void )
    bdf_free_font( bdf_font_t*  font );
 -  FT_LOCAL( bdf_property_t * )
 -  bdf_get_property( char*        name,
 -                    bdf_font_t*  font );
+-
    FT_LOCAL( bdf_property_t * )
    bdf_get_font_property( bdf_font_t*  font,
                           const char*  name );

src/bdf/bdflib.c

@@ -378,7 +378,7 @@
      *alen = 0;
      if ( list == NULL || list->used == 0 )
 -      return 0;
 +      return NULL;
      dp = list->field[0];
      for ( i = j = 0; i < list->used; i++ )
@@ -887,18 +887,18 @@
+   }
 -  FT_LOCAL_DEF( bdf_property_t* )
 -  bdf_get_property( char*        name,
 +  static bdf_property_t*
 +  bdf_get_property( const char*  name,
                      bdf_font_t*  font )
+   {
      size_t*  propid;
      if ( name == NULL || *name == 0 )
 -      return 0;
 +      return NULL;
      if ( ( propid = ft_hash_str_lookup( name, &(font->proptbl) ) ) == NULL )
 -      return 0;
 +      return NULL;
      if ( *propid >= num_bdf_properties_ )
        return font->user_props + ( *propid - num_bdf_properties_ );
@@ -944,7 +944,7 @@
    static FT_Error
    bdf_add_comment_( bdf_font_t*    font,
 -                    char*          comment,
 +                    const char*    comment,
                      unsigned long  len )
+   {
      char*      cp;
@@ -1053,27 +1053,24 @@
      bdf_property_t*  p;
 -    *name = sp = ep = line;
 +    sp = ep = line;
      while ( *ep && *ep != ' ' && *ep != '\t' )
        ep++;
 -    hold = -1;
 -    if ( *ep )
 -    {
 -      hold = *ep;
 -      *ep  = 0;
 -    }
 +    hold = *ep;
 +    *ep  = '\0';
      p = bdf_get_property( sp, font );
 -    /* Restore the character that was saved before any return can happen. */
 -    if ( hold != -1 )
 -      *ep = (char)hold;
+-
      /* If the property exists and is not an atom, just return here. */
      if ( p && p->format != BDF_ATOM )
 +    {
 +      *ep = (char)hold;  /* Undo NUL-termination. */
        return 0;
 +    }
++
 +    *name = sp;
      /* The property is an atom.  Trim all leading and trailing whitespace */
      /* and double quotes for the atom value.                              */
@@ -1081,25 +1078,26 @@
      ep = line + linelen;
      /* Trim the leading whitespace if it exists. */
 -    if ( *sp )
 -      *sp++ = 0;
 -    while ( *sp                           &&
 -            ( *sp == ' ' || *sp == '\t' ) )
 -      sp++;
 +    if ( sp < ep )
 +      do
 +         sp++;
 +      while ( *sp == ' ' || *sp == '\t' );
      /* Trim the leading double quote if it exists. */
      if ( *sp == '"' )
        sp++;
++
      *value = sp;
      /* Trim the trailing whitespace if it exists. */
 -    while ( ep > sp                                       &&
 -            ( *( ep - 1 ) == ' ' || *( ep - 1 ) == '\t' ) )
 -      *--ep = 0;
 +    if ( sp < ep )
 +      do
 +        *ep-- = '\0';
 +      while ( *ep == ' ' || *ep  == '\t' );
      /* Trim the trailing double quote if it exists. */
 -    if ( ep > sp && *( ep - 1 ) == '"' )
 -      *--ep = 0;
 +    if ( *ep  == '"' )
 +      *ep = '\0';
      return 1;
+   }

src/cff/cffdrivr.c

@@ -471,6 +471,12 @@
      FT_Error  error = FT_Err_Ok;
 +    if ( face->is_cff2 )
 +    {
 +      error = FT_THROW( Invalid_Argument );
 +      goto Fail;
 +    }
++
      if ( cff && !cff->font_info )
+     {
        CFF_FontRecDict  dict      = &cff->top_font.font_dict;
@@ -628,7 +634,7 @@
          return service->get_ps_font_name( FT_FACE( face ) );
+     }
 -    return (const char*)cff->font_name;
 +    return cff ? (const char*)cff->font_name : NULL;
+   }

src/cff/cffload.c

@@ -400,7 +400,7 @@
    /* Allocate a table containing pointers to an index's elements. */
    /* The `pool' argument makes this function convert the index    */
 -  /* entries to C-style strings (this is, null-terminated).       */
 +  /* entries to C-style strings (that is, null-terminated).       */
    static FT_Error
    cff_index_get_pointers( CFF_Index   idx,
                            FT_Byte***  table,
@@ -1612,7 +1612,7 @@
      FT_Service_MultiMasters  mm = (FT_Service_MultiMasters)face->mm;
 -    if (mm)
 +    if ( mm )
        mm->done_blend( FT_FACE( face ) );
+   }

src/cff/cffparse.c

@@ -622,7 +622,7 @@
        dict->has_font_matrix = TRUE;
 -      /* We expect a well-formed font matrix, this is, the matrix elements */
 +      /* We expect a well-formed font matrix, that is, the matrix elements */
        /* `xx' and `yy' are of approximately the same magnitude.  To avoid  */
        /* loss of precision, we use the magnitude of the largest matrix     */
        /* element to scale all other elements.  The scaling factor is then  */

src/cid/cidgload.c

@@ -117,11 +117,44 @@
        off2      = cid_get_offset( &p, cid->gd_bytes );
        FT_FRAME_EXIT();
 -      if ( fd_select >= cid->num_dicts ||
 -           off2 > stream->size         ||
 -           off1 > off2                 )
++
 +      if ( fd_select >= cid->num_dicts )
+       {
 -        FT_TRACE0(( "cid_load_glyph: invalid glyph stream offsets\n" ));
 +        /*
 +         * fd_select == 0xFF is often used to indicate that the CID
 +         * has no charstring to be rendered, similar to GID = 0xFFFF
 +         * in TrueType fonts.
 +         */
 +        if ( (cid->fd_bytes == 1 && fd_select == 0xFFU   ) ||
 +             (cid->fd_bytes == 2 && fd_select == 0xFFFFU ) )
 +        {
 +          FT_TRACE1(( "cid_load_glyph: fail for glyph_index=%d, "
 +                      "FD number %ld is the max integer fitting into %d byte%s\n",
 +                      glyph_index, fd_select, cid->fd_bytes,
 +                      cid->fd_bytes == 1 ? "" : "s" ));
 +        }
 +        else
 +        {
 +          FT_TRACE0(( "cid_load_glyph: fail for glyph_index=%d, "
 +                      "FD number %ld > number of dicts %d\n",
 +                      glyph_index, fd_select, cid->num_dicts ));
 +        }
 +        error = FT_THROW( Invalid_Offset );
 +        goto Exit;
 +      }
 +      else if ( off2 > stream->size )
 +      {
 +        FT_TRACE0(( "cid_load_glyph: fail for glyph_index=%d, "
 +                    "end of the glyph data is beyond the data stream\n",
 +                    glyph_index ));
 +        error = FT_THROW( Invalid_Offset );
 +        goto Exit;
 +      }
 +      else if ( off1 > off2 )
 +      {
 +        FT_TRACE0(( "cid_load_glyph: fail for glyph_index=%d, "
 +                    "the end position of glyph data is set before the start position\n",
 +                    glyph_index ));
          error = FT_THROW( Invalid_Offset );
          goto Exit;
+       }
@@ -161,7 +194,9 @@
        cs_offset = decoder->lenIV >= 0 ? (FT_UInt)decoder->lenIV : 0;
        if ( cs_offset > glyph_length )
+       {
 -        FT_TRACE0(( "cid_load_glyph: invalid glyph stream offsets\n" ));
 +        FT_TRACE0(( "cid_load_glyph: fail for glyph_index=%d, "
 +                    "offset to the charstring is beyond glyph length\n",
 +                    glyph_index ));
          error = FT_THROW( Invalid_Offset );
          goto Exit;
+       }

src/pshinter/pshalgo.c

@@ -516,7 +516,7 @@
              if ( !psh_hint_is_fitted( parent ) )
                psh_hint_align( parent, globals, dimension, glyph );
 -            /* keep original relation between hints, this is, use the */
 +            /* keep original relation between hints, that is, use the */
              /* scaled distance between the centers of the hints to    */
              /* compute the new position                               */
              par_org_center = parent->org_pos + ( parent->org_len >> 1 );

src/sdf/ftsdf.c


      *     ```
      *
      * (6) Our task is to find a value of `t` such that the above equation
-     *     `Q(t)` becomes zero, this is, the point-to-curve vector makes
+     *     `Q(t)` becomes zero, that is, the point-to-curve vector makes
      *     90~degrees with the curve.  We solve this with the Newton-Raphson
      *     method.
      *

      *     ```
      *
      * (6) Our task is to find a value of `t` such that the above equation
-     *     `Q(t)` becomes zero, this is, the point-to-curve vector makes
+     *     `Q(t)` becomes zero, that is, the point-to-curve vector makes
      *     90~degree with curve.  We solve this with the Newton-Raphson
      *     method.
      *

src/sfnt/pngshim.c

@@ -406,10 +406,7 @@
      switch ( color_type )
+     {
 -    default:
 -      /* Shouldn't happen, but ... */
 -      FALL_THROUGH;
+-
 +    default:  /* Shouldn't happen, but ... */
      case PNG_COLOR_TYPE_RGB_ALPHA:
        png_set_read_user_transform_fn( png, premultiply_data );
        break;

src/sfnt/sfdriver.c

@@ -523,15 +523,14 @@
            FT_TRACE0(( "get_win_string:"
                        " Character 0x%X invalid in PS name string\n",
                        ((unsigned)p[0])*256 + (unsigned)p[1] ));
 -        break;
 +        continue;
+       }
+     }
 -    if ( !len )
 -      *r = '\0';
 +    *r = '\0';
      FT_FRAME_EXIT();
 -    if ( !len )
 +    if ( r != result )
        return result;
    get_win_string_error:
@@ -580,15 +579,14 @@
            FT_TRACE0(( "get_apple_string:"
                        " Character `%c' (0x%X) invalid in PS name string\n",
                        *p, *p ));
 -        break;
 +        continue;
+       }
+     }
 -    if ( !len )
 -      *r = '\0';
 +    *r = '\0';
      FT_FRAME_EXIT();
 -    if ( !len )
 +    if ( r != result )
        return result;
    get_apple_string_error:
@@ -819,9 +817,9 @@
        if ( !found )
+       {
 -        /* as a last resort we try the family name; note that this is */
 -        /* not in the Adobe TechNote, but GX fonts (which predate the */
 -        /* TechNote) benefit from this behaviour                      */
 +        /* according to the 'name' documentation in the OpenType   */
 +        /* specification the font family name is to be used if the */
 +        /* typographic family name is missing, so let's do that    */
          found = sfnt_get_name_id( face,
                                    TT_NAME_ID_FONT_FAMILY,
                                    &win,
@@ -853,6 +851,10 @@
+       {
          FT_TRACE0(( "sfnt_get_var_ps_name:"
                      " No valid PS name prefix for font instances found\n" ));
 +        /* XXX It probably makes sense to never let this fail */
 +        /*     since an arbitrary prefix should work, too.    */
 +        /*     On the other hand, it is very unlikely that    */
 +        /*     we ever reach this code at all.                */
          return NULL;
+       }

src/sfnt/ttload.c

@@ -504,6 +504,13 @@
      FT_FRAME_EXIT();
 +    if ( !valid_entries )
 +    {
 +      FT_TRACE2(( "tt_face_load_font_dir: no valid tables found\n" ));
 +      error = FT_THROW( Unknown_File_Format );
 +      goto Exit;
 +    }
++
      FT_TRACE2(( "table directory loaded\n" ));
      FT_TRACE2(( "\n" ));

src/truetype/ttgxvar.c

@@ -45,6 +45,7 @@
  #include <freetype/internal/ftcalc.h>
  #include <freetype/internal/ftstream.h>
  #include <freetype/internal/sfnt.h>
 +#include <freetype/internal/services/svmetric.h>
  #include <freetype/tttags.h>
  #include <freetype/ttnameid.h>
  #include <freetype/ftmm.h>
@@ -2543,7 +2544,7 @@
            goto Exit;
+       }
 -      FT_TRACE5(( "%d instance%s\n",
 +      FT_TRACE5(( "%d named instance%s\n",
                    fvar_head.instanceCount,
                    fvar_head.instanceCount == 1 ? "" : "s" ));
@@ -2601,7 +2602,7 @@
            (void)FT_STREAM_SEEK( pos );
 -          FT_TRACE5(( "  instance %d (%s%s%s, %s%s%s)\n",
 +          FT_TRACE5(( "  named instance %d (%s%s%s, %s%s%s)\n",
                        i,
                        strname ? "name: `" : "",
                        strname ? strname : "unnamed",
@@ -2844,26 +2845,29 @@
+         }
+       }
 -      if ( FT_IS_NAMED_INSTANCE( FT_FACE( face ) ) )
 +      if ( !have_diff )
+       {
 -        FT_UInt  instance_index = (FT_UInt)face->root.face_index >> 16;
 +        if ( FT_IS_NAMED_INSTANCE( FT_FACE( face ) ) )
 +        {
 +          FT_UInt  instance_index = (FT_UInt)face->root.face_index >> 16;
 -        c = blend->normalizedcoords + i;
 -        n = blend->normalized_stylecoords            +
 -            ( instance_index - 1 ) * mmvar->num_axis +
 -            i;
 +          c = blend->normalizedcoords + i;
 +          n = blend->normalized_stylecoords            +
 +              ( instance_index - 1 ) * mmvar->num_axis +
 +              i;
 -        for ( j = i; j < mmvar->num_axis; j++, n++, c++ )
 -          if ( *c != *n )
 -            have_diff = 1;
 -      }
 -      else
 -      {
 -        c = blend->normalizedcoords + i;
 -        for ( j = i; j < mmvar->num_axis; j++, c++ )
 -          if ( *c != 0 )
 -            have_diff = 1;
 +          for ( j = i; j < mmvar->num_axis; j++, n++, c++ )
 +            if ( *c != *n )
 +              have_diff = 1;
 +        }
 +        else
 +        {
 +          c = blend->normalizedcoords + i;
 +          for ( j = i; j < mmvar->num_axis; j++, c++ )
 +            if ( *c != 0 )
 +              have_diff = 1;
 +        }
+       }
        /* return value -1 indicates `no change' */
@@ -2961,7 +2965,8 @@
     *     An array of `num_coords', each between [-1,1].
+    *
     * @Return:
 -   *   FreeType error code.  0 means success.
 +   *   FreeType error code.  0 means success, -1 means success and unchanged
 +   *   axis values.
     */
    FT_LOCAL_DEF( FT_Error )
    TT_Set_MM_Blend( TT_Face    face,
@@ -3008,7 +3013,8 @@
     *     An array of `num_coords', each between [-1,1].
+    *
     * @Return:
 -   *   FreeType error code.  0 means success.
 +   *   FreeType error code.  0 means success, -1 means success and unchanged
 +   *   axis values.
     */
    FT_LOCAL_DEF( FT_Error )
    TT_Get_MM_Blend( TT_Face    face,

src/truetype/ttinterp.c

@@ -7837,7 +7837,7 @@
          /* a variable number of arguments             */
          /* it is the job of the application to `activate' GX handling, */
 -        /* this is, calling any of the GX API functions on the current */
 +        /* that is, calling any of the GX API functions on the current */
          /* font to select a variation instance                         */
          if ( exc->face->blend )
            exc->new_top = exc->args + exc->face->blend->num_axis;
@@ -8397,7 +8397,7 @@
  #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
          case 0x91:
            /* it is the job of the application to `activate' GX handling, */
 -          /* this is, calling any of the GX API functions on the current */
 +          /* that is, calling any of the GX API functions on the current */
            /* font to select a variation instance                         */
            if ( exc->face->blend )
              Ins_GETVARIATION( exc, args );

From:	Werner Lemberg (@wl)
Subject:	[Git][freetype/freetype][API-organization] 15 commits: [services] FT_Size_Reset_Func to return FT_Error
Date:	Sun, 30 Apr 2023 14:42:39 +0000