[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13532] trunk/blender/source/blender/src/ sequence.c: Remove in-line variable declaration in color_balance_byte_float (), not ISO

Ken Hughes khughes at pacific.edu
Sun Feb 3 02:28:24 CET 2008


Revision: 13532
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13532
Author:   khughes
Date:     2008-02-03 02:28:23 +0100 (Sun, 03 Feb 2008)

Log Message:
-----------
Remove in-line variable declaration in color_balance_byte_float(), not ISO
C90 compliant.  Also fix warning about pointer parameter mismatch.

Modified Paths:
--------------
    trunk/blender/source/blender/src/sequence.c

Modified: trunk/blender/source/blender/src/sequence.c
===================================================================
--- trunk/blender/source/blender/src/sequence.c	2008-02-03 00:55:39 UTC (rev 13531)
+++ trunk/blender/source/blender/src/sequence.c	2008-02-03 01:28:23 UTC (rev 13532)
@@ -1118,12 +1118,13 @@
 	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 @@
 	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;





More information about the Bf-blender-cvs mailing list