mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-28 01:00:52 -07:00
Code Issues Projects Releases Wiki Activity

(ftfont_pattern_entity): Fix aliasing violations.

Browse source
This commit is contained in:
Andreas Schwab 2008-03-02 21:13:09 +00:00
parent 14daee73e5
commit f907fb2ebe
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ChangeLog
View file

@ -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.

6
src/ftfont.c
View file

@ -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)
{