[Git][freetype/freetype][wl/sbix] 2 commits: * include/freetype/freetype

Werner Lemberg pushed to branch wl/sbix at FreeType / FreeType

Commits:

65c01154

by Werner Lemberg at 2022-02-09T08:38:48+01:00

* include/freetype/freetype.h (FT_LOAD_SBITS_ONLY): Tag macro as public.

3b04322f

by Werner Lemberg at 2022-02-09T08:47:48+01:00

Add `FT_FACE_FLAG_SBIX` and `FT_HAS_SBIX`.

Fonts with 'sbix' tables need special handling by the application.

* include/freetype/freetype.h (FT_FACE_FLAG_SBIX, FT_HAS_SBIX): New macros.

* src/sfnt/sfobjs.c (sfnt_load_face): Set `FT_FACE_FLAG_SBIX` if 'sbix'
table is present.

2 changed files:

include/freetype/freetype.h
src/sfnt/sfobjs.c

Changes:

include/freetype/freetype.h

@@ -154,6 +154,7 @@ FT_BEGIN_HEADER
     *   FT_FACE_FLAG_EXTERNAL_STREAM
     *   FT_FACE_FLAG_HINTER
     *   FT_FACE_FLAG_SVG
 +   *   FT_FACE_FLAG_SBIX
+    *
     *   FT_HAS_HORIZONTAL
     *   FT_HAS_VERTICAL
@@ -163,6 +164,7 @@ FT_BEGIN_HEADER
     *   FT_HAS_COLOR
     *   FT_HAS_MULTIPLE_MASTERS
     *   FT_HAS_SVG
 +   *   FT_HAS_SBIX
+    *
     *   FT_IS_SFNT
     *   FT_IS_SCALABLE
@@ -227,6 +229,7 @@ FT_BEGIN_HEADER
     *   FT_LOAD_NO_SCALE
     *   FT_LOAD_NO_HINTING
     *   FT_LOAD_NO_BITMAP
 +   *   FT_LOAD_SBITS_ONLY
     *   FT_LOAD_NO_AUTOHINT
     *   FT_LOAD_COLOR
+    *
@@ -1235,6 +1238,9 @@ FT_BEGIN_HEADER
+    *
     *   FT_FACE_FLAG_SVG ::
     *     [Since 2.12] The face has an 'SVG~' OpenType table.
 +   *
 +   *   FT_FACE_FLAG_SBIX ::
 +   *     [Since 2.12] The face has an 'sbix' OpenType table.
     */
  #define FT_FACE_FLAG_SCALABLE          ( 1L <<  0 )
  #define FT_FACE_FLAG_FIXED_SIZES       ( 1L <<  1 )
@@ -1253,6 +1259,7 @@ FT_BEGIN_HEADER
  #define FT_FACE_FLAG_COLOR             ( 1L << 14 )
  #define FT_FACE_FLAG_VARIATION         ( 1L << 15 )
  #define FT_FACE_FLAG_SVG               ( 1L << 16 )
 +#define FT_FACE_FLAG_SBIX              ( 1L << 17 )
    /**************************************************************************
@@ -1509,6 +1516,68 @@ FT_BEGIN_HEADER
            ( !!( (face)->face_flags & FT_FACE_FLAG_SVG ) )
 +  /**************************************************************************
 +   *
 +   * @macro:
 +   *   FT_HAS_SBIX
 +   *
 +   * @description:
 +   *   A macro that returns true whenever a face object contains an 'sbix'
 +   *   OpenType table.
 +   *
 +   * @note:
 +   *   Here is some pseudo code that roughly illustrates how to implement
 +   *   'sbix' handling according to the OpenType specification.
 +   *
 +   * ```
 +   *   if ( FT_HAS_SBIX( face ) )
 +   *   {
 +   *     <sort `face->available_size` as necessary into
 +   *      `preferred_sizes`[*]>
 +   *
 +   *     for ( i = 0; i < face->num_fixed_sizes; i++ )
 +   *     {
 +   *       size = preferred_sizes[i].size;
 +   *
 +   *       error = FT_Set_Pixel_Sizes( face, size, size );
 +   *       <error handling omitted>
 +   *
 +   *       // check whether we have a glyph in a bitmap strike
 +   *       error = FT_Load_Glyph( face,
 +   *                              glyph_index,
 +   *                              FT_LOAD_SBITS_ONLY          |
 +   *                              FT_LOAD_BITMAP_METRICS_ONLY )
 +   *       if ( error == FT_Err_Invalid_Argument )
 +   *         continue;
 +   *       else if ( error )
 +   *         <other error handling omitted>
 +   *       else
 +   *         break;
 +   *     }
 +   *
 +   *     if ( i == face->num_fixed_sizes )
 +   *       <no embedded bitmap found, load outline glyph with
 +   *        `FT_Load_Glyph`>
 +   *     else
 +   *       <load embedded bitmap with `FT_Load_Glyph`,
 +   *        scale it, display it, etc.>
 +   *   }
 +   * ```
 +   *
 +   * [*] Assuming a target value of 400dpi and available strike sizes 100,
 +   * 200, 300, and 400dpi, a possible order might be [400, 200, 300, 100]:
 +   * scaling 200dpi to 400dpi usually gives better results than scaling
 +   * 300dpi to 400dpi; it is also much faster.  However, scaling 100dpi to
 +   * 400dpi can yield a too pixelated result, thus the preference might be
 +   * 300dpi over 100dpi.
 +   *
 +   * @since:
 +   *   2.12
 +   */
 +#define FT_HAS_SBIX( face ) \
 +          ( !!( (face)->face_flags & FT_FACE_FLAG_SBIX ) )
++
++
    /**************************************************************************
+    *
     * @enum:
@@ -2976,6 +3045,15 @@ FT_BEGIN_HEADER
+    *
     *     @FT_LOAD_NO_SCALE always sets this flag.
+    *
 +   *   FT_LOAD_SBITS_ONLY ::
 +   *     [Since 2.12] This is the opposite of @FT_LOAD_NO_BITMAP, more or
 +   *     less: @FT_Load_Glyph returns `FT_Err_Invalid_Argument` if the face
 +   *     contains a bitmap strike for the given size (or the strike selected
 +   *     by @FT_Select_Size) but there is no glyph in the strike.
 +   *
 +   *     Note that this load flag was part of FreeType since version 2.0.6
 +   *     but previously tagged as internal.
 +   *
     *   FT_LOAD_VERTICAL_LAYOUT ::
     *     Load the glyph for vertical text layout.  In particular, the
     *     `advance` value in the @FT_GlyphSlotRec structure is set to the
@@ -3120,6 +3198,7 @@ FT_BEGIN_HEADER
  #define FT_LOAD_IGNORE_TRANSFORM             ( 1L << 11 )
  #define FT_LOAD_MONOCHROME                   ( 1L << 12 )
  #define FT_LOAD_LINEAR_DESIGN                ( 1L << 13 )
 +#define FT_LOAD_SBITS_ONLY                   ( 1L << 14 )
  #define FT_LOAD_NO_AUTOHINT                  ( 1L << 15 )
    /* Bits 16-19 are used by `FT_LOAD_TARGET_` */
  #define FT_LOAD_COLOR                        ( 1L << 20 )
@@ -3130,7 +3209,6 @@ FT_BEGIN_HEADER
    /* used internally only by certain font drivers */
  #define FT_LOAD_ADVANCE_ONLY                 ( 1L << 8  )
 -#define FT_LOAD_SBITS_ONLY                   ( 1L << 14 )
  #define FT_LOAD_SVG_ONLY                     ( 1L << 23 )

src/sfnt/sfobjs.c

@@ -1051,6 +1051,9 @@
             face->colr                                       )
          flags |= FT_FACE_FLAG_COLOR;      /* color glyphs */
 +      if ( face->sbit_table_type == TT_SBIT_TABLE_TYPE_SBIX )
 +        flags |= FT_FACE_FLAG_SBIX;       /* has 'sbix' embedded bitmaps */
++
        if ( has_outline == TRUE )
          flags |= FT_FACE_FLAG_SCALABLE;   /* scalable outlines */

From:	Werner Lemberg (@wl)
Subject:	[Git][freetype/freetype][wl/sbix] 2 commits: * include/freetype/freetype.h (FT_LOAD_SBITS_ONLY): Tag macro as public.
Date:	Wed, 09 Feb 2022 17:52:07 +0000