[freetype2] master d2c3bbcd8: [cff] Synchronize `cff_slot_load` with `TT_Load_Glyph`.

[Werner Lemberg]

branch: master
commit d2c3bbcd8ec175a750d76f0bf50162ea9e3aaf85
Author: Werner Lemberg <wl@gnu.org>
Commit: Werner Lemberg <wl@gnu.org>

    [cff] Synchronize `cff_slot_load` with `TT_Load_Glyph`.
    
    * src/cff/cffgload.c (IS_DEFAULT_INSTANCE): New macro.
    (cff_slot_load): Use it.
---
 src/cff/cffgload.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
index 2ef9c760c..ff0d9cf13 100644
--- a/src/cff/cffgload.c
+++ b/src/cff/cffgload.c
@@ -29,6 +29,14 @@
 
 #include "cfferrs.h"
 
+#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
+#define IS_DEFAULT_INSTANCE( _face )             \
+          ( !( FT_IS_NAMED_INSTANCE( _face ) ||  \
+               FT_IS_VARIATION( _face )      ) )
+#else
+#define IS_DEFAULT_INSTANCE( _face )  1
+#endif
+
 
   /**************************************************************************
    *
@@ -255,8 +263,8 @@
 
 
       if ( size->strike_index != 0xFFFFFFFFUL      &&
-           sfnt->load_eblc                         &&
-           ( load_flags & FT_LOAD_NO_BITMAP ) == 0 )
+           ( load_flags & FT_LOAD_NO_BITMAP ) == 0 &&
+           IS_DEFAULT_INSTANCE( size->root.face )  )
       {
         TT_SBit_MetricsRec  metrics;