freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freetype2] wl/sbix f2092d0ae 3/5: Add `FT_FACE_FLAG_SBIX` and `FT_HAS_S


From: Werner Lemberg
Subject: [freetype2] wl/sbix f2092d0ae 3/5: Add `FT_FACE_FLAG_SBIX` and `FT_HAS_SBIX`.
Date: Thu, 17 Mar 2022 07:00:35 -0400 (EDT)

branch: wl/sbix
commit f2092d0aeb6bafe712658c025dd5ba2691b07f4a
Author: Werner Lemberg <wl@gnu.org>
Commit: Werner Lemberg <wl@gnu.org>

    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.
---
 include/freetype/freetype.h | 22 ++++++++++++++++++++++
 src/sfnt/sfobjs.c           |  3 +++
 2 files changed, 25 insertions(+)

diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index 0bd06f1b8..f6d716123 100644
--- a/include/freetype/freetype.h
+++ b/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
@@ -1236,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 )
@@ -1254,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 )
 
 
   /**************************************************************************
@@ -1510,6 +1516,22 @@ 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.
+   *
+   * @since:
+   *   2.12
+   */
+#define FT_HAS_SBIX( face ) \
+          ( !!( (face)->face_flags & FT_FACE_FLAG_SBIX ) )
+
+
   /**************************************************************************
    *
    * @enum:
diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c
index 864dfa86a..efef128f3 100644
--- a/src/sfnt/sfobjs.c
+++ b/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 */
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]