(ftfont_pattern_entity): Fix aliasing violations.

f907fb2e · Andreas Schwab · 14daee73 · f907fb2e · f907fb2e
Commit f907fb2e authored Mar 02, 2008 by Andreas Schwab
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

src/ChangeLog src/ChangeLog +2 -0

src/ftfont.c src/ftfont.c +3 -3

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
 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
+++ b/src/ftfont.c
@@ -107,7 +107,7 @@ ftfont_pattern_entity (p, frame, registry)
  Lisp_Object entity;
  FcChar8 *file, *fontformat;
  FcCharSet *charset;
-  char *str;
+  FcChar8 *str;
  int numeric;
  double dbl;

@@ -127,9 +127,9 @@ ftfont_pattern_entity (p, frame, registry)
  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)
    {