diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-03-18 01:27:15 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-03-18 01:27:15 +0300 |
commit | aeb2225a287e68d8ee03861bec112ce3459a468a (patch) | |
tree | 2fa2f308e233fc89b6a93aeca57d3a9daf828ecc /source/blender/blenkernel | |
parent | d52400bfbd2a7e4d09b5a71bc461a554d232af15 (diff) |
2.50: some warning fixes.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_ipo.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/seqeffects.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/BKE_ipo.h b/source/blender/blenkernel/BKE_ipo.h index a3f451438bd..e12170b73c9 100644 --- a/source/blender/blenkernel/BKE_ipo.h +++ b/source/blender/blenkernel/BKE_ipo.h @@ -38,7 +38,7 @@ extern "C" { struct Main; struct Ipo; -void do_versions_ipo_to_animato(struct Main *main); +void do_versions_ipos_to_animato(struct Main *main); /* --------------------- xxx stuff ------------------------ */ diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c index 9ea115903b0..2ee95ed928e 100644 --- a/source/blender/blenkernel/intern/seqeffects.c +++ b/source/blender/blenkernel/intern/seqeffects.c @@ -1038,8 +1038,8 @@ static void do_gammacross_effect(Sequence * seq,int cfra, } else { do_gammacross_effect_byte( facf0, facf1, x, y, - (char*) ibuf1->rect, (char*) ibuf2->rect, - (char*) out->rect); + (unsigned char*) ibuf1->rect, (unsigned char*) ibuf2->rect, + (unsigned char*) out->rect); } } @@ -1996,7 +1996,7 @@ static void do_transform(Sequence * seq,float facf0, int x, int y, float xs,ys,factxScale,factyScale,tx,ty,rad,s,c,xaux,yaux,factRot,px,py; TransformVars *scale; - struct RenderData *rd = NULL; // XXX 2.5 global: &G.scene->r; + // XXX struct RenderData *rd = NULL; // 2.5 global: &G.scene->r; scale = (TransformVars *)seq->effectdata; |