Commit 064766f2 authored by Kenichi Handa's avatar Kenichi Handa

(ftfont_otf_features): Fix previous change.

(ftfont_otf_capability): Check FeatureList.FeatureCount before
calling ftfont_otf_features.
parent 091b0137
2008-10-24 Kenichi Handa <handa@m17n.org>
* ftfont.c (ftfont_otf_features): Fix previous change.
(ftfont_otf_capability): Check FeatureList.FeatureCount before
calling ftfont_otf_features.
2008-10-23 Kenichi Handa <handa@m17n.org>
* font.c (font_match_p): Fix for the case that a vector of
characters is in script-representative-chars.
2008-10-24 Michael Albinus <michael.albinus@gmx.de>
* dbusbind.c (xd_in_read_queued_messages): New variable.
......
......@@ -1360,7 +1360,7 @@ ftfont_otf_features (gsub_gpos)
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 @@ ftfont_otf_capability (font)
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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment