diff options
author | Ken Hughes <khughes@pacific.edu> | 2007-03-19 08:40:42 +0300 |
---|---|---|
committer | Ken Hughes <khughes@pacific.edu> | 2007-03-19 08:40:42 +0300 |
commit | 819fc06a80269012dcf920b5dc2f79bf4b417149 (patch) | |
tree | 5404bb56ddc3b7ec81dd1f36833b1dad8434684a | |
parent | 4f5065ac98bc135c20dfc04cf596d6dd19cb214e (diff) |
Fixing a few more gcc warnings by adding pointer casts.
-rw-r--r-- | source/blender/src/ghostwinlay.c | 4 | ||||
-rw-r--r-- | source/blender/src/renderwin.c | 6 | ||||
-rw-r--r-- | source/blender/src/writeimage.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/src/ghostwinlay.c b/source/blender/src/ghostwinlay.c index d63574e79f9..ff0e3727370 100644 --- a/source/blender/src/ghostwinlay.c +++ b/source/blender/src/ghostwinlay.c @@ -435,13 +435,13 @@ void window_set_custom_cursor(Window *win, unsigned char mask[16][2], void window_set_custom_cursor_ex(Window *win, BCursor *cursor, int useBig) { if (useBig) { GHOST_SetCustomCursorShapeEx(win->ghostwin, - cursor->big_bm, cursor->big_mask, + (GHOST_TUns8 *)cursor->big_bm, (GHOST_TUns8 *)cursor->big_mask, cursor->big_sizex,cursor->big_sizey, cursor->big_hotx,cursor->big_hoty, cursor->fg_color, cursor->bg_color); } else { GHOST_SetCustomCursorShapeEx(win->ghostwin, - cursor->small_bm, cursor->small_mask, + (GHOST_TUns8 *)cursor->small_bm, (GHOST_TUns8 *)cursor->small_mask, cursor->small_sizex,cursor->small_sizey, cursor->small_hotx,cursor->small_hoty, cursor->fg_color, cursor->bg_color); diff --git a/source/blender/src/renderwin.c b/source/blender/src/renderwin.c index 8ca96f89936..41a600d0eb4 100644 --- a/source/blender/src/renderwin.c +++ b/source/blender/src/renderwin.c @@ -343,7 +343,7 @@ static void renderwin_draw(RenderWin *rw, int just_clear) if(rw->showspare) { rres.rectx= rw->sparex; rres.recty= rw->sparey; - rres.rect32= rw->rectspare; + rres.rect32= (int *)rw->rectspare; rres.rectf= rw->rectsparef; } else @@ -823,7 +823,7 @@ static void renderwin_progress(RenderWin *rw, RenderResult *rr, volatile rcti *r rectf= rr->rectf; else { if(rr->rect32) - rect32= rr->rect32; + rect32= (unsigned int *)rr->rect32; else { if(rr->renlay==NULL || rr->renlay->rectf==NULL) return; rectf= rr->renlay->rectf; @@ -1294,7 +1294,7 @@ void BIF_do_ogl_render(View3D *v3d, int anim) BKE_makepicstring(name, G.scene->r.pic, G.scene->r.cfra, G.scene->r.imtype); - ibuf->rect= rr->rect32; + ibuf->rect= (unsigned int *)rr->rect32; ok= BKE_write_ibuf(ibuf, name, G.scene->r.imtype, G.scene->r.subimtype, G.scene->r.quality); if(ok==0) { diff --git a/source/blender/src/writeimage.c b/source/blender/src/writeimage.c index 3ef29169b54..ca3a312f98b 100644 --- a/source/blender/src/writeimage.c +++ b/source/blender/src/writeimage.c @@ -124,7 +124,7 @@ static void save_rendered_image_cb_real(char *name, int confirm) waitcursor(1); /* from screen.c */ ibuf= IMB_allocImBuf(rres.rectx, rres.recty, G.scene->r.planes, 0, 0); - ibuf->rect= rres.rect32; + ibuf->rect= (unsigned int *)rres.rect32; ibuf->rect_float= rres.rectf; ibuf->zbuf_float= rres.rectz; |