Render: Fix 'comparing between distinct pointer types' warning

Add the appropriate casts so that gcc shuts up, even if it doesn't
matter.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
This commit is contained in:
Daniel Stone 2010-12-23 13:33:00 +00:00 committed by Keith Packard
parent 469d5bf8b7
commit efcb63d0ce

View File

@ -1084,8 +1084,10 @@ ProcRenderAddGlyphs (ClientPtr client)
remain -= (sizeof (CARD32) + sizeof (xGlyphInfo)) * nglyphs;
/* protect against bad nglyphs */
if (gi < stuff || gi > ((CARD32 *)stuff + client->req_len) ||
bits < stuff || bits > ((CARD32 *)stuff + client->req_len)) {
if (gi < ((xGlyphInfo *)stuff) ||
gi > ((xGlyphInfo *)((CARD32 *)stuff + client->req_len)) ||
bits < ((CARD8 *)stuff) ||
bits > ((CARD8 *)((CARD32 *)stuff + client->req_len))) {
err = BadLength;
goto bail;
}