diff options
author | Ken Hughes <khughes@pacific.edu> | 2008-02-03 04:28:23 +0300 |
---|---|---|
committer | Ken Hughes <khughes@pacific.edu> | 2008-02-03 04:28:23 +0300 |
commit | ae2619407b1a86ed693d97db85dfeca85941abeb (patch) | |
tree | c38bc37672c06e33164f063ec9be3ab3f8842175 /source/blender/src/sequence.c | |
parent | 28401db37b3b7929a7169147bab85db5fb488fe8 (diff) |
Remove in-line variable declaration in color_balance_byte_float(), not ISO
C90 compliant. Also fix warning about pointer parameter mismatch.
Diffstat (limited to 'source/blender/src/sequence.c')
-rw-r--r-- | source/blender/src/sequence.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/src/sequence.c b/source/blender/src/sequence.c index a570cc66cf0..6ddb68ef644 100644 --- a/source/blender/src/sequence.c +++ b/source/blender/src/sequence.c @@ -1118,12 +1118,13 @@ static void color_balance_byte_float(Sequence * seq, TStripElem* se, unsigned char * p = (unsigned char*) se->ibuf->rect; unsigned char * e = p + se->ibuf->x * 4 * se->ibuf->y; float * o; + StripColorBalance cb; imb_addrectfloatImBuf(se->ibuf); o = se->ibuf->rect_float; - StripColorBalance cb = calc_cb(seq->strip->color_balance); + cb = calc_cb(seq->strip->color_balance); for (c = 0; c < 3; c++) { make_cb_table_float(cb.lift[c], cb.gain[c], cb.gamma[c], @@ -1704,7 +1705,7 @@ static TStripElem* do_build_seq_array_recursively( int i; TStripElem* se = 0; - count = get_shown_sequences(seqbasep, cfra, chanshown, &seq_arr); + count = get_shown_sequences(seqbasep, cfra, chanshown, (Sequence **)&seq_arr); if (!count) { return 0; |