Commit ea2460a0 authored by Kenichi Handa's avatar Kenichi Handa
Browse files

Use FC_DUAL only when it is defined.

parent df61c790
2011-02-02 Kenichi Handa <handa@m17n.org>
* ftfont.c (ftfont_open): Use FC_DUAL only when it is defined.
* xftfont.c (xftfont_open): Likewise.
2011-01-29 Andreas Schwab <schwab@linux-m68k.org>
* image.c (DEF_IMGLIB_FN): Add parameter rettype, use it instead
......
......@@ -1262,7 +1262,11 @@ ftfont_open (f, entity, pixel_size)
spacing = XINT (AREF (entity, FONT_SPACING_INDEX));
else
spacing = FC_PROPORTIONAL;
if (spacing != FC_PROPORTIONAL && spacing != FC_DUAL)
if (spacing != FC_PROPORTIONAL
#ifdef FC_DUAL
&& spacing != FC_DUAL
#endif /* FC_DUAL */
)
font->min_width = font->average_width = font->space_width
= (scalable ? ft_face->max_advance_width * size / upEM
: ft_face->size->metrics.max_advance >> 6);
......
......@@ -430,7 +430,11 @@ xftfont_open (f, entity, pixel_size)
ascii_printable[i] = ' ' + i;
}
BLOCK_INPUT;
if (spacing != FC_PROPORTIONAL && spacing != FC_DUAL)
if (spacing != FC_PROPORTIONAL
#ifdef FC_DUAL
&& spacing != FC_DUAL
#endif /* FC_DUAL */
)
{
font->min_width = font->average_width = font->space_width
= xftfont->max_advance_width;
......
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