[Emacs-diffs] Changes to emacs/src/ftfont.c,v

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   08/10/24 13:11:57

Index: ftfont.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ftfont.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- ftfont.c    17 Oct 2008 02:20:13 -0000      1.33
+++ ftfont.c    24 Oct 2008 13:11:56 -0000      1.34
@@ -1360,7 +1360,7 @@
          for (features = Qnil, k = otf_langsys->FeatureCount - 1; k >= 0; k--)
            {
              l = otf_langsys->FeatureIndex[k];
-             if (l > gsub_gpos->FeatureList.FeatureCount)
+             if (l >= gsub_gpos->FeatureList.FeatureCount)
                continue;
              OTF_TAG_SYM (sym, gsub_gpos->FeatureList.Feature[l].FeatureTag);
              features = Fcons (sym, features);
@@ -1391,9 +1391,11 @@
   if (! otf)
     return Qnil;
   gsub_gpos = Fcons (Qnil, Qnil);
-  if (OTF_get_table (otf, "GSUB") == 0)
+  if (OTF_get_table (otf, "GSUB") == 0
+      && otf->gsub->FeatureList.FeatureCount > 0)
     XSETCAR (gsub_gpos, ftfont_otf_features (otf->gsub));
-  if (OTF_get_table (otf, "GPOS") == 0)
+  if (OTF_get_table (otf, "GPOS") == 0
+      && otf->gpos->FeatureList.FeatureCount > 0)
     XSETCDR (gsub_gpos, ftfont_otf_features (otf->gpos));
   return gsub_gpos;
 }