Commit f907fb2e authored by Andreas Schwab's avatar Andreas Schwab
Browse files

(ftfont_pattern_entity): Fix aliasing violations.

parent 14daee73
2008-03-02 Andreas Schwab <schwab@suse.de> 2008-03-02 Andreas Schwab <schwab@suse.de>
* ftfont.c (ftfont_pattern_entity): Fix aliasing violations.
* coding.c (decode_coding_big5, produce_chars): Fix typos in last * coding.c (decode_coding_big5, produce_chars): Fix typos in last
change. change.
......
...@@ -107,7 +107,7 @@ ftfont_pattern_entity (p, frame, registry) ...@@ -107,7 +107,7 @@ ftfont_pattern_entity (p, frame, registry)
Lisp_Object entity; Lisp_Object entity;
FcChar8 *file, *fontformat; FcChar8 *file, *fontformat;
FcCharSet *charset; FcCharSet *charset;
char *str; FcChar8 *str;
int numeric; int numeric;
double dbl; double dbl;
...@@ -127,9 +127,9 @@ ftfont_pattern_entity (p, frame, registry) ...@@ -127,9 +127,9 @@ ftfont_pattern_entity (p, frame, registry)
ASET (entity, FONT_FRAME_INDEX, frame); ASET (entity, FONT_FRAME_INDEX, frame);
ASET (entity, FONT_OBJLIST_INDEX, Qnil); ASET (entity, FONT_OBJLIST_INDEX, Qnil);
if (FcPatternGetString (p, FC_FOUNDRY, 0, (FcChar8 **) &str) == FcResultMatch) if (FcPatternGetString (p, FC_FOUNDRY, 0, &str) == FcResultMatch)
ASET (entity, FONT_FOUNDRY_INDEX, intern_downcase (str, strlen (str))); ASET (entity, FONT_FOUNDRY_INDEX, intern_downcase (str, strlen (str)));
if (FcPatternGetString (p, FC_FAMILY, 0, (FcChar8 **) &str) == FcResultMatch) if (FcPatternGetString (p, FC_FAMILY, 0, &str) == FcResultMatch)
ASET (entity, FONT_FAMILY_INDEX, intern_downcase (str, strlen (str))); ASET (entity, FONT_FAMILY_INDEX, intern_downcase (str, strlen (str)));
if (FcPatternGetInteger (p, FC_WEIGHT, 0, &numeric) == FcResultMatch) if (FcPatternGetInteger (p, FC_WEIGHT, 0, &numeric) == FcResultMatch)
{ {
......
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