Mercurial > emacs
changeset 92407:7ba52081e343
(ftfont_pattern_entity): Fix aliasing violations.
| author | Andreas Schwab <schwab@suse.de> |
|---|---|
| date | Sun, 02 Mar 2008 21:13:09 +0000 |
| parents | c36bda0a03cc |
| children | a371504924ef |
| files | src/ChangeLog src/ftfont.c |
| diffstat | 2 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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 <schwab@suse.de> + * ftfont.c (ftfont_pattern_entity): Fix aliasing violations. + * coding.c (decode_coding_big5, produce_chars): Fix typos in last change.
--- 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) {