diff options
| author | Kent Mein <mein@cs.umn.edu> | 2005-04-28 18:37:15 +0400 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2005-04-28 18:37:15 +0400 |
| commit | b705434c72ec268e0a2c23124d679a7d1b8c0a69 (patch) | |
| tree | de5b55174c0493f7fa0dfca1ef679025444aec9c /source/blender/src/resources.c | |
| parent | 1d97a448cb2c6e67fa0fa2ceba311d141bed3951 (diff) | |
A couple more simple gcc4.X warnings fixed.
softbody.c I removed an unused var.
text.c added return values to 2 return statements that didn't have anything.
Makefile added $(FIX_STUBS_WARNINGS) to CFLAGS for the stub.
source/blender/src/editface.c fixed up int vs unsigned int stuff
source/blender/src/resources.c had two vars declared as unsigned char *
and then inputs to them were cast as char * so updated the casts.
Kent
Diffstat (limited to 'source/blender/src/resources.c')
| -rw-r--r-- | source/blender/src/resources.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/src/resources.c b/source/blender/src/resources.c index cd3d0990644..a8a5f05ad27 100644 --- a/source/blender/src/resources.c +++ b/source/blender/src/resources.c @@ -217,7 +217,7 @@ static void def_icon(ImBuf *bbuf, GLuint texid, BIFIconID icon, int xidx, int yi if (iconidx>=0 && iconidx<BIFNICONIDS) { int rowstride= bbuf->x*4; - unsigned char *start= ((char*) bbuf->rect) + (yidx*21 + 3 + offsy)*rowstride + (xidx*20 + 3 + offsx)*4; + unsigned char *start= ((unsigned char*) bbuf->rect) + (yidx*21 + 3 + offsy)*rowstride + (xidx*20 + 3 + offsx)*4; common_icons_arr[iconidx]= icon_from_data(start, texid, (xidx*20 + 3 + offsx), (yidx*21 + 3 + offsy), w, h, rowstride); @@ -275,7 +275,7 @@ void BIF_resources_init(void) for (y=0; y<12; y++) { for (x=0; x<21; x++) { int rowstride= bbuf->x*4; - unsigned char *start= ((char*) bbuf->rect) + (y*21 + 3)*rowstride + (x*20 + 3)*4; + unsigned char *start= ((unsigned char*) bbuf->rect) + (y*21 + 3)*rowstride + (x*20 + 3)*4; unsigned char transp[4]; /* this sets backdrop of icon to zero alpha */ transp[0]= start[0]; @@ -285,7 +285,7 @@ void BIF_resources_init(void) clear_transp_rect_soft(transp, start, 20, 21, rowstride); /* this sets outside of icon to zero alpha */ - start= ((char*) bbuf->rect) + (y*21)*rowstride + (x*20)*4; + start= ((unsigned char*) bbuf->rect) + (y*21)*rowstride + (x*20)*4; QUATCOPY(transp, start); clear_transp_rect(transp, start, 20, 21, rowstride); } |