diff options
| author | Tom \"spot\" Callaway <tcallawa@redhat.com> | 2011-10-06 15:58:29 -0400 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-10-10 13:02:29 -0700 |
| commit | 21a59c10803582c8f90d3b5f32e8f0240c050adf (patch) | |
| tree | aeaea48d43f16ed735abe6a2bfd3f5abe5c108ac | |
| parent | 6f1d7bcdd461b1f6cc64370793f52d7c170187d0 (diff) | |
| download | xorg-lib-libXft-21a59c10803582c8f90d3b5f32e8f0240c050adf.tar.gz | |
compiler noise cleanups related to subpixel LCD support
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
| -rw-r--r-- | src/xftglyphs.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/xftglyphs.c b/src/xftglyphs.c index 03d94ed..2639d12 100644 --- a/src/xftglyphs.c +++ b/src/xftglyphs.c @@ -358,7 +358,7 @@ XftFontLoadGlyphs (Display *dpy, unsigned char bufLocal[4096]; unsigned char *bufBitmap = bufLocal; int bufSize = sizeof (bufLocal); - int size, pitch; + int size; int width; int height; int left, right, top, bottom; @@ -572,7 +572,6 @@ XftFontLoadGlyphs (Display *dpy, width = ftbit->width; height = ftbit->rows; - pitch = (width+3) & ~3; if (XftDebug() & XFT_DBG_GLYPH) { @@ -674,12 +673,9 @@ XftFontLoadGlyphs (Display *dpy, /* swap bits in each byte */ if (BitmapBitOrder (dpy) != MSBFirst) { - unsigned char *line; - unsigned char c; - int i; + unsigned char *line = (unsigned char*)bufBitmap; + int i = size; - line = (unsigned char *) bufBitmap; - i = size; while (i--) { int c = *line; |