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/bitmap | |
| parent | 2a3429413df27224ceeddd22500ce43b5431d698 (diff) | |
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/bitmap')
| -rw-r--r-- | src/bitmap/bitscale.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bitmap/bitscale.c b/src/bitmap/bitscale.c index e89ba7c..b864a28 100644 --- a/src/bitmap/bitscale.c +++ b/src/bitmap/bitscale.c @@ -751,6 +751,8 @@ compute_xform_matrix(FontScalablePtr vals, double dx, double dy, * ScaleFont * returns a pointer to the new scaled font, or NULL (due to AllocError). */ +#pragma GCC diagnostic ignored "-Wbad-function-cast" + static FontPtr ScaleFont(FontPtr opf, /* originating font */ double widthMult, /* glyphs width scale factor */ @@ -811,8 +813,6 @@ ScaleFont(FontPtr opf, /* originating font */ needs to be for the output font */ if (vals->nranges) { - int i; - pfi->allExist = 0; firstCol = 255; lastCol = 0; |