From 0ac779724c6cfa529507a2486f5af5ebe48c1356 Mon Sep 17 00:00:00 2001 From: havoc Date: Wed, 28 Nov 2007 04:05:33 +0000 Subject: [PATCH] fix warnings git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7724 d7cf8633-e32d-0410-b094-e92efae38249 --- cl_dyntexture.h | 3 ++- cl_gecko.h | 3 ++- cl_video.c | 3 ++- gl_textures.c | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cl_dyntexture.h b/cl_dyntexture.h index be3f8e14..3b0a6834 100644 --- a/cl_dyntexture.h +++ b/cl_dyntexture.h @@ -17,4 +17,5 @@ void CL_LinkDynTexture( const char *name, rtexture_t *texture ); // unlink a texture handle from its name void CL_UnlinkDynTexture( const char *name ); -#endif \ No newline at end of file +#endif + diff --git a/cl_gecko.h b/cl_gecko.h index d73f7059..ce380743 100644 --- a/cl_gecko.h +++ b/cl_gecko.h @@ -37,4 +37,5 @@ qboolean CL_Gecko_Event_Key( clgecko_t *instance, int key, clgecko_buttoneventty #endif -#endif \ No newline at end of file +#endif + diff --git a/cl_video.c b/cl_video.c index d1285408..9c753de2 100644 --- a/cl_video.c +++ b/cl_video.c @@ -35,7 +35,8 @@ static qboolean OpenStream( clvideo_t * video ) return true; } -static void VideoUpdateCallback(rtexture_t *rt, clvideo_t *video) { +static void VideoUpdateCallback(rtexture_t *rt, void *data) { + clvideo_t *video = data; R_UpdateTexture( video->cpif.tex, (unsigned char *)video->imagedata, 0, 0, video->cpif.width, video->cpif.height ); } diff --git a/gl_textures.c b/gl_textures.c index a57fe012..b8b904a5 100644 --- a/gl_textures.c +++ b/gl_textures.c @@ -899,7 +899,7 @@ static void R_Upload(gltexture_t *glt, const unsigned char *data, int fragx, int case GLTEXTURETYPE_CUBEMAP: // convert and upload each side in turn, // from a continuous block of input texels - texturebuffer = prevbuffer; + texturebuffer = (unsigned char *)prevbuffer; for (i = 0;i < 6;i++) { prevbuffer = texturebuffer; -- 2.39.2