mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-31 09:20:54 -08:00
Code Issues Projects Releases Wiki Activity

(uniscribe_check_otf): Rearrange loop for counting features.

Browse source
This commit is contained in:
Jason Rumney 2008-04-04 12:08:14 +00:00
parent e38ac6e203
commit d0bfec76e4
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ChangeLog
View file

@ -1,6 +1,8 @@
2008-04-04 Jason Rumney <jasonr@gnu.org>
* w32uniscribe.c (uniscribe_check_otf): Fix last change.
(uniscribe_check_otf): Add GC protection before consing.
Rearrange loop for counting features.
2008-04-03 Stefan Monnier <monnier@iro.umontreal.ca>

6
src/w32uniscribe.c
View file

@ -612,7 +612,6 @@ int uniscribe_check_otf (font, otf_spec)
unsigned short script_table, langsys_table, n_langs;
unsigned short feature_index, n_features;
DWORD tbl = feature_tables[i];
Lisp_Object feature;
/* Skip if no features requested from this table. */
if (NILP (features[i]))
@ -680,10 +679,9 @@ int uniscribe_check_otf (font, otf_spec)
/* Check the features. Features may contain nil according to
documentation in font_prop_validate_otf, so count them. */
n_match_features = 0;
rest = features[i];
for (feature = XCAR (rest); CONSP (rest); feature = CAR_SAFE (rest))
for (rest = features[i]; CONSP (rest); rest = XCDR (rest))
{
rest = XCDR (rest);
Lisp_Object feature = XCAR (rest);
if (!NILP (feature))
n_match_features++;
}