walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add the range support in blank element

This commit is contained in:
Akira TAGOH 2010-12-06 12:18:23 +09:00
parent 51e352a1bd
commit d975cdda78
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/fcxml.c
View File

@ -1093,29 +1093,36 @@ static void
FcParseBlank (FcConfigParse *parse) FcParseBlank (FcConfigParse *parse)
{ {
int n = FcVStackElements (parse); int n = FcVStackElements (parse);
FcChar32 i;
while (n-- > 0) while (n-- > 0)
{ {
FcVStack *v = FcVStackFetch (parse, n); FcVStack *v = FcVStackFetch (parse, n);
if (v->tag != FcVStackInteger)
FcConfigMessage (parse, FcSevereError, "non-integer blank");
else
{
if (!parse->config->blanks) if (!parse->config->blanks)
{ {
parse->config->blanks = FcBlanksCreate (); parse->config->blanks = FcBlanksCreate ();
if (!parse->config->blanks) if (!parse->config->blanks)
{ goto bail;
FcConfigMessage (parse, FcSevereError, "out of memory");
break;
}
} }
switch (v->tag) {
case FcVStackInteger:
if (!FcBlanksAdd (parse->config->blanks, v->u.integer)) if (!FcBlanksAdd (parse->config->blanks, v->u.integer))
goto bail;
break;
case FcVStackRange:
for (i = v->u.range.begin; i <= v->u.range.end; i++)
{ {
FcConfigMessage (parse, FcSevereError, "out of memory"); if (!FcBlanksAdd (parse->config->blanks, i))
goto bail;
}
break;
default:
FcConfigMessage (parse, FcSevereError, "invalid element in blank");
break; break;
} }
} }
} return;
bail:
FcConfigMessage (parse, FcSevereError, "out of memory");
} }
static void static void