[freetype2] master 4cdfefd: [truetype] Add another tricky font.

[Werner LEMBERG]

branch: master
commit 4cdfefd4bd0d1ae521a77385f5f0b635579c8771
Author: Derek B. Noonburg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    [truetype] Add another tricky font.
    
    * src/truetype/ttobjs.c (TRICK_SFNT_IDS_NUM_FACES): Increase.
    (sfnt_id): Add variant of `DFKaiShu'.
---
 ChangeLog                   |    7 +++++++
 include/freetype/freetype.h |    1 -
 src/truetype/ttobjs.c       |    7 ++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2f83095..45bc370 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2016-01-19  Derek B. Noonburg  <address@hidden>
+
+       [truetype] Add another tricky font.
+
+       * src/truetype/ttobjs.c (TRICK_SFNT_IDS_NUM_FACES): Increase.
+       (sfnt_id): Add variant of `DFKaiShu'.
+
 2016-01-14  Alexei Podtelezhnikov  <address@hidden>
 
        [base] Empower `FT_Library_SetLcdFilterWeights'.
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index 823aefb..8d0577c 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -141,7 +141,6 @@ FT_BEGIN_HEADER
   /*    FT_FACE_FLAG_GLYPH_NAMES                                           */
   /*    FT_FACE_FLAG_EXTERNAL_STREAM                                       */
   /*    FT_FACE_FLAG_HINTER                                                */
-  /*    FT_FACE_FLAG_TRICKY                                                */
   /*                                                                       */
   /*    FT_HAS_HORIZONTAL                                                  */
   /*    FT_HAS_VERTICAL                                                    */
diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c
index 419ce35..c3b2af0 100644
--- a/src/truetype/ttobjs.c
+++ b/src/truetype/ttobjs.c
@@ -246,7 +246,7 @@
   tt_check_trickyness_sfnt_ids( TT_Face  face )
   {
 #define TRICK_SFNT_IDS_PER_FACE   3
-#define TRICK_SFNT_IDS_NUM_FACES  17
+#define TRICK_SFNT_IDS_NUM_FACES  18
 
     static const tt_sfnt_id_rec sfnt_id[TRICK_SFNT_IDS_NUM_FACES]
                                        [TRICK_SFNT_IDS_PER_FACE] = {
@@ -270,6 +270,11 @@
         { 0x5A30CA3BUL, 0x00009063UL }, /* fpgm */
         { 0x13A42602UL, 0x0000007EUL }  /* prep */
       },
+      { /* DFKaiShu2 */
+        { 0x11E5EAD4UL, 0x00000350UL }, /* cvt  */
+        { 0xA6E78C01UL, 0x00008998UL }, /* fpgm */
+        { 0x13A42602UL, 0x0000007EUL }  /* prep */
+      },
       { /* HuaTianKaiTi */
         { 0xFFFBFFFCUL, 0x00000008UL }, /* cvt  */
         { 0x9C9E48B8UL, 0x0000BEA2UL }, /* fpgm */