# HG changeset patch # User Andreas Schwab # Date 1204492389 0 # Node ID 7ba52081e343c62a69c8994b4215288853c0e024 # Parent c36bda0a03ccdffced21922a43a28f5c82824318 (ftfont_pattern_entity): Fix aliasing violations. diff -r c36bda0a03cc -r 7ba52081e343 src/ChangeLog --- a/src/ChangeLog Sun Mar 02 19:56:45 2008 +0000 +++ b/src/ChangeLog Sun Mar 02 21:13:09 2008 +0000 @@ -1,5 +1,7 @@ 2008-03-02 Andreas Schwab + * ftfont.c (ftfont_pattern_entity): Fix aliasing violations. + * coding.c (decode_coding_big5, produce_chars): Fix typos in last change. diff -r c36bda0a03cc -r 7ba52081e343 src/ftfont.c --- a/src/ftfont.c Sun Mar 02 19:56:45 2008 +0000 +++ b/src/ftfont.c Sun Mar 02 21:13:09 2008 +0000 @@ -107,7 +107,7 @@ Lisp_Object entity; FcChar8 *file, *fontformat; FcCharSet *charset; - char *str; + FcChar8 *str; int numeric; double dbl; @@ -127,9 +127,9 @@ ASET (entity, FONT_FRAME_INDEX, frame); 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))); - 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))); if (FcPatternGetInteger (p, FC_WEIGHT, 0, &numeric) == FcResultMatch) {