diff options
author | Keith Packard <keithp@keithp.com> | 2013-11-15 21:46:15 +0900 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2014-01-29 15:20:03 -0800 |
commit | a96cc1f032a059da89319ceccb6659c8edd446fb (patch) | |
tree | 8e4aa6f868bc037f4fc036fb41f7f7844315c3f2 /src/FreeType | |
parent | 2a3429413df27224ceeddd22500ce43b5431d698 (diff) | |
download | xorg-lib-libXfont-a96cc1f032a059da89319ceccb6659c8edd446fb.tar.gz |
Warning fixes.
Many const char issues.
One extra 'i' declared in ScaleFont; we can just use the same 'i' as
exists at the top level scope.
Also ignore bad-function-cast in ftfuncs.c and bitscale.c because
we're casting the return value from floor or ceil from double to
int. As floor and ceil are kinda designed to generate integer results,
it's pretty clear that we're doing what we want and that the compiler
is generating noise. I'm not sure why bad-function-cast is ever a good
warning to turn on, but I'll leave that for another day.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Diffstat (limited to 'src/FreeType')
-rw-r--r-- | src/FreeType/ftfuncs.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/FreeType/ftfuncs.c b/src/FreeType/ftfuncs.c index 44e5e02..65efefc 100644 --- a/src/FreeType/ftfuncs.c +++ b/src/FreeType/ftfuncs.c @@ -1069,6 +1069,8 @@ FT_Do_SBit_Metrics( FT_Face ft_face, FT_Size ft_size, FT_ULong strike_index, #endif } +#pragma GCC diagnostic ignored "-Wbad-function-cast" + int FreeTypeRasteriseGlyph(unsigned idx, int flags, CharInfoPtr tgp, FTInstancePtr instance, int hasMetrics) |