diff options
| author | Andreas Schwab | 2008-03-02 21:13:09 +0000 |
|---|---|---|
| committer | Andreas Schwab | 2008-03-02 21:13:09 +0000 |
| commit | f907fb2ebe68be9869021262a6a8011717fbe0a5 (patch) | |
| tree | fe3bf677972c3742f575f72f9bb07beab8147ca7 /src | |
| parent | 14daee73e5eeb6977357e5d5bc0a05871a314d53 (diff) | |
| download | emacs-f907fb2ebe68be9869021262a6a8011717fbe0a5.tar.gz emacs-f907fb2ebe68be9869021262a6a8011717fbe0a5.zip | |
(ftfont_pattern_entity): Fix aliasing violations.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/ftfont.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 82b9d08657b..0976b3175c9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2008-03-02 Andreas Schwab <schwab@suse.de> | 1 | 2008-03-02 Andreas Schwab <schwab@suse.de> |
| 2 | 2 | ||
| 3 | * ftfont.c (ftfont_pattern_entity): Fix aliasing violations. | ||
| 4 | |||
| 3 | * coding.c (decode_coding_big5, produce_chars): Fix typos in last | 5 | * coding.c (decode_coding_big5, produce_chars): Fix typos in last |
| 4 | change. | 6 | change. |
| 5 | 7 | ||
diff --git a/src/ftfont.c b/src/ftfont.c index 834c4a6f07c..aac267b2095 100644 --- a/src/ftfont.c +++ b/src/ftfont.c | |||
| @@ -107,7 +107,7 @@ ftfont_pattern_entity (p, frame, registry) | |||
| 107 | Lisp_Object entity; | 107 | Lisp_Object entity; |
| 108 | FcChar8 *file, *fontformat; | 108 | FcChar8 *file, *fontformat; |
| 109 | FcCharSet *charset; | 109 | FcCharSet *charset; |
| 110 | char *str; | 110 | FcChar8 *str; |
| 111 | int numeric; | 111 | int numeric; |
| 112 | double dbl; | 112 | double dbl; |
| 113 | 113 | ||
| @@ -127,9 +127,9 @@ ftfont_pattern_entity (p, frame, registry) | |||
| 127 | ASET (entity, FONT_FRAME_INDEX, frame); | 127 | ASET (entity, FONT_FRAME_INDEX, frame); |
| 128 | ASET (entity, FONT_OBJLIST_INDEX, Qnil); | 128 | ASET (entity, FONT_OBJLIST_INDEX, Qnil); |
| 129 | 129 | ||
| 130 | if (FcPatternGetString (p, FC_FOUNDRY, 0, (FcChar8 **) &str) == FcResultMatch) | 130 | if (FcPatternGetString (p, FC_FOUNDRY, 0, &str) == FcResultMatch) |
| 131 | ASET (entity, FONT_FOUNDRY_INDEX, intern_downcase (str, strlen (str))); | 131 | ASET (entity, FONT_FOUNDRY_INDEX, intern_downcase (str, strlen (str))); |
| 132 | if (FcPatternGetString (p, FC_FAMILY, 0, (FcChar8 **) &str) == FcResultMatch) | 132 | if (FcPatternGetString (p, FC_FAMILY, 0, &str) == FcResultMatch) |
| 133 | ASET (entity, FONT_FAMILY_INDEX, intern_downcase (str, strlen (str))); | 133 | ASET (entity, FONT_FAMILY_INDEX, intern_downcase (str, strlen (str))); |
| 134 | if (FcPatternGetInteger (p, FC_WEIGHT, 0, &numeric) == FcResultMatch) | 134 | if (FcPatternGetInteger (p, FC_WEIGHT, 0, &numeric) == FcResultMatch) |
| 135 | { | 135 | { |