style cleanup

2 files changed, 132 insertions, 128 deletions

diff --git a/release/plugins/sequence/blur.c b/release/plugins/sequence/blur.c
index b59d7fbd005..d33feb0bb68 100644
--- a/release/plugins/sequence/blur.c
+++ b/release/plugins/sequence/blur.c
@@ -32,19 +32,19 @@
 /* ******************** GLOBAL VARIABLES ***************** */
 
 
-char name[24]= "Blur";	
+char name[24] = "Blur";
 
 /* structure for buttons, 
  *  butcode      name           default  min  max  0
  */
 
-VarStruct varstr[]= {
-	LABEL,			"Input: 1 strip", 0.0, 0.0, 0.0, "", 
-	NUMSLI|FLO,		"Blur",		0.5,	0.0,	10.0, "Maximum filtersize",
-	NUMSLI|FLO,		"Gamma",	1.0,	0.4,	2.0, "Gamma correction", 
-	TOG|INT,		"Animated",	0.0,	0.0,	1.0, "For (Ipo) animated blur", 
-	NUM|INT,        	"debug",        0.0,    0.0,    2.0,
-		"0:off 1: show primary blur buffer 2: show 2nd blur buffer", 
+VarStruct varstr[] = {
+	LABEL,          "Input: 1 strip", 0.0, 0.0, 0.0, "",
+	NUMSLI | FLO,     "Blur",     0.5,    0.0,    10.0, "Maximum filtersize",
+	NUMSLI | FLO,     "Gamma",    1.0,    0.4,    2.0, "Gamma correction",
+	TOG | INT,        "Animated", 0.0,    0.0,    1.0, "For (Ipo) animated blur",
+	NUM | INT,            "debug",        0.0,    0.0,    2.0,
+	"0:off 1: show primary blur buffer 2: show 2nd blur buffer",
 
 };
 
@@ -52,7 +52,7 @@ VarStruct varstr[]= {
    Varstr and Cast must have the same variables in the same order */ 
 
 typedef struct Cast {
-	int dummy;			/* because of the 'label' button */
+	int dummy;          /* because of the 'label' button */
 	float blur;
 	float gamma;
 	float use_ipo;
@@ -83,15 +83,15 @@ void plugin_init(void)
 
 void plugin_getinfo(PluginInfo *info)
 {
-	info->name= name;
-	info->nvars= sizeof(varstr)/sizeof(VarStruct);
-	info->cfra= &cfra;
+	info->name = name;
+	info->nvars = sizeof(varstr) / sizeof(VarStruct);
+	info->cfra = &cfra;
 
-	info->varstr= varstr;
+	info->varstr = varstr;
 
-	info->init= plugin_init;
-	info->seq_doit= (SeqDoit) plugin_seq_doit;
-	info->callback= plugin_but_changed;
+	info->init = plugin_init;
+	info->seq_doit = (SeqDoit) plugin_seq_doit;
+	info->callback = plugin_but_changed;
 }
 
 
@@ -102,24 +102,24 @@ void blurbuf(struct ImBuf *ibuf, int nr, Cast *cast)
 	struct ImBuf *tbuf, *ttbuf;
 	int i, x4;
 	
-	tbuf= dupImBuf(ibuf);
-	x4= ibuf->x/4;
+	tbuf = dupImBuf(ibuf);
+	x4 = ibuf->x / 4;
 	
 	/* This doesn't seem to work... paprmh */
 	if (cast->gamma != 1.0) gamwarp(tbuf, cast->gamma);
 
 	/* reduce */
-	for (i=0; i<nr; i++) {
+	for (i = 0; i < nr; i++) {
 		ttbuf = onehalf(tbuf);
 		if (ttbuf) {
 			freeImBuf(tbuf);
 			tbuf = ttbuf;
 		}
-		if (tbuf->x<4 || tbuf->y<4) break;
+		if (tbuf->x < 4 || tbuf->y < 4) break;
 	}
 
 	/* enlarge */
-	for (i=0; i<nr; i++) {
+	for (i = 0; i < nr; i++) {
 		ttbuf = double_x(tbuf);
 		if (ttbuf) {
 			freeImBuf(tbuf);
@@ -139,10 +139,10 @@ void blurbuf(struct ImBuf *ibuf, int nr, Cast *cast)
 	/* this doesn't seem to work...paprmh*/
 	if (cast->gamma != 1.0) gamwarp(tbuf, 1.0 / cast->gamma);
 
-	if (ibuf->rect)memcpy(ibuf->rect, tbuf->rect, 4*ibuf->x*ibuf->y);
+	if (ibuf->rect) memcpy(ibuf->rect, tbuf->rect, 4 * ibuf->x * ibuf->y);
 
 	if (ibuf->rect_float)
-		memcpy(ibuf->rect_float, tbuf->rect_float, 4*ibuf->x*ibuf->y*sizeof(float));
+		memcpy(ibuf->rect_float, tbuf->rect_float, 4 * ibuf->x * ibuf->y * sizeof(float));
 
 	freeImBuf(tbuf);
 	
@@ -161,79 +161,79 @@ void doblur(struct ImBuf *mbuf, float fac, Cast *cast)
 	
 	/* which buffers ? */
 				
-	if (fac>7.0) fac= 7.0;
-	if (fac<=1.0) return;
+	if (fac > 7.0) fac = 7.0;
+	if (fac <= 1.0) return;
 	
-	pfac= 2.0;
-	pbuf= dupImBuf(mbuf);
-	n= 1;
+	pfac = 2.0;
+	pbuf = dupImBuf(mbuf);
+	n = 1;
 	while (pfac < fac) {
 		blurbuf(pbuf, n, cast);
 		blurbuf(pbuf, n, cast);
 		
 		n++;
-		pfac+= 1.0;
+		pfac += 1.0;
 	}
 
-	ifac= pfac;
-	pfac-= 1.0;
+	ifac = pfac;
+	pfac -= 1.0;
 
-	ibuf= dupImBuf(pbuf);
+	ibuf = dupImBuf(pbuf);
 	blurbuf(ibuf, n, cast);
 	blurbuf(ibuf, n, cast);
 	
-	fac= (fac-pfac)/(ifac-pfac);
-	n= mbuf->x*mbuf->y;
+	fac = (fac - pfac) / (ifac - pfac);
+	n = mbuf->x * mbuf->y;
 	
-	if (cast->show) fac=cast->show-1;
+	if (cast->show) fac = cast->show - 1;
 	
-	if (mbuf->rect_float){
-		if (fac>=1) {
-			memcpy(mbuf->rect_float, ibuf->rect_float, 4*n*sizeof(float));
+	if (mbuf->rect_float) {
+		if (fac >= 1) {
+			memcpy(mbuf->rect_float, ibuf->rect_float, 4 * n * sizeof(float));
 		}
-		else if(fac<=0) {
-			memcpy(mbuf->rect_float, pbuf->rect_float, 4*n*sizeof(float));
+		else if (fac <= 0) {
+			memcpy(mbuf->rect_float, pbuf->rect_float, 4 * n * sizeof(float));
 		}
-		else {	/* interpolate */
-			infac= 1-fac;
+		else {  /* interpolate */
+			infac = 1 - fac;
 			
-			irectf= (float *)ibuf->rect_float;
-			prectf= (float *)pbuf->rect_float;
-			mrectf= (float *)mbuf->rect_float;
+			irectf = (float *)ibuf->rect_float;
+			prectf = (float *)pbuf->rect_float;
+			mrectf = (float *)mbuf->rect_float;
 			while (n--) {
-				mrectf[0]= irectf[0]*fac+ prectf[0]*infac;
-				mrectf[1]= irectf[1]*fac+ prectf[1]*infac;
-				mrectf[2]= irectf[2]*fac+ prectf[2]*infac;
-				mrectf[3]= irectf[3]*fac+ prectf[3]*infac;
-				mrectf+= 4;
-				irectf+= 4;
-				prectf+= 4;
+				mrectf[0] = irectf[0] * fac + prectf[0] * infac;
+				mrectf[1] = irectf[1] * fac + prectf[1] * infac;
+				mrectf[2] = irectf[2] * fac + prectf[2] * infac;
+				mrectf[3] = irectf[3] * fac + prectf[3] * infac;
+				mrectf += 4;
+				irectf += 4;
+				prectf += 4;
 			}
 		}
 	}	
-	else if(mbuf->rect){
-		b1= (int)fac*255.0;
-		if (b1>255) b1= 255;
-		b2= 255-b1;
-	
-		if (b1==255) {
-			memcpy(mbuf->rect, ibuf->rect, 4*n);
+	else if (mbuf->rect) {
+		b1 = (int)fac * 255.0;
+		if (b1 > 255) b1 = 255;
+		b2 = 255 - b1;
+
+		if (b1 == 255) {
+			memcpy(mbuf->rect, ibuf->rect, 4 * n);
 		}
-		else if(b1==0) {
-			memcpy(mbuf->rect, pbuf->rect, 4*n);
+		else if (b1 == 0) {
+			memcpy(mbuf->rect, pbuf->rect, 4 * n);
 		}
-		else {	/* interpolate */
-			irect= (char *)ibuf->rect;
-			prect= (char *)pbuf->rect;
-			mrect= (char *)mbuf->rect;
+		else {  /* interpolate */
+			irect = (char *)ibuf->rect;
+			prect = (char *)pbuf->rect;
+			mrect = (char *)mbuf->rect;
 			while (n--) {
-				mrect[0]= (irect[0]*b1+ prect[0]*b2)>>8;
-				mrect[1]= (irect[1]*b1+ prect[1]*b2)>>8;
-				mrect[2]= (irect[2]*b1+ prect[2]*b2)>>8;
-				mrect[3]= (irect[3]*b1+ prect[3]*b2)>>8;
-				mrect+= 4;
-				irect+= 4;
-				prect+= 4;
+				mrect[0] = (irect[0] * b1 + prect[0] * b2) >> 8;
+				mrect[1] = (irect[1] * b1 + prect[1] * b2) >> 8;
+				mrect[2] = (irect[2] * b1 + prect[2] * b2) >> 8;
+				mrect[3] = (irect[3] * b1 + prect[3] * b2) >> 8;
+				mrect += 4;
+				irect += 4;
+				prect += 4;
 			}
 		}
 	}
@@ -245,18 +245,18 @@ void doblur(struct ImBuf *mbuf, float fac, Cast *cast)
 
 void plugin_seq_doit(Cast *cast, float facf0, float facf1, int x, int y, ImBuf *ibuf1, ImBuf *ibuf2, ImBuf *out, ImBuf *use)
 {
-	float  bfacf0, bfacf1;
+	float bfacf0, bfacf1;
 	
-	if (cast->use_ipo==0) {
-		bfacf0= bfacf1= cast->blur+1.0;
+	if (cast->use_ipo == 0) {
+		bfacf0 = bfacf1 = cast->blur + 1.0;
 	}
 	else {
 		bfacf0 = (facf0 * 6.0) + 1.0;
 		bfacf1 = (facf1 * 6.0) + 1.0;
 	}
 
-	if (out->rect) memcpy(out->rect, ibuf1->rect, 4*out->x*out->y);
-	if (out->rect_float) memcpy(out->rect_float, ibuf1->rect_float, 4*out->x*out->y*sizeof(float));
+	if (out->rect) memcpy(out->rect, ibuf1->rect, 4 * out->x * out->y);
+	if (out->rect_float) memcpy(out->rect_float, ibuf1->rect_float, 4 * out->x * out->y * sizeof(float));
 	
 /****************I can't get this field code to work... works ok without...paprmh****************/
 
@@ -270,15 +270,15 @@ void plugin_seq_doit(Cast *cast, float facf0, float facf1, int x, int y, ImBuf *
 	doblur(out, bfacf0, cast); /*fieldA*/
 
 /*	if (out->rect)out->rect += out->x * out->y;
-	if (out->rect_float)out->rect_float += out->x * out->y;
+    if (out->rect_float)out->rect_float += out->x * out->y;
 		
-	doblur(out, bfacf1, cast);*/ /*fieldB*/
+    doblur(out, bfacf1, cast);*/ /*fieldB*/
 
 /*	if (out->rect)out->rect -= out->x * out->y;
-	if (out->rect_float)out->rect_float -= out->x * out->y;
-	out->flags |= IB_fields;
+    if (out->rect_float)out->rect_float -= out->x * out->y;
+    out->flags |= IB_fields;
 
-	interlace(out);*/
+    interlace(out);*/
 	
 }
 
diff --git a/release/plugins/sequence/scatter.c b/release/plugins/sequence/scatter.c
index 73e97e165ca..a480f194bea 100644
--- a/release/plugins/sequence/scatter.c
+++ b/release/plugins/sequence/scatter.c
@@ -31,25 +31,25 @@
 /* ******************** GLOBAL VARIABLES ***************** */
 
 
-char name[24]= "scatter";
+char name[24] = "scatter";
 
 /* structure for buttons, 
  *  butcode      name           default  min  max  0
  */
 
-VarStruct varstr[]= {
-	LABEL,		"Input: 1 strip", 0.0, 0.0, 0.0, "", 
-	NUM|INT,	"seed: ",		1.0,	0.0, 10.0, "Offset in random table", 
-	NUMSLI|FLO,	"swing: ",		1.0,	0.0, 3.0, "The amplitude, width of the effect", 
-	TOG|INT,	"wrap",			0.0,	0.0, 1.0, "Cyclic wrap around the left/right edges", 
-	NUM|INT,	"type: ",		1.0,	0.0, 1.0, "Type 1 is random for each frame", 
+VarStruct varstr[] = {
+	LABEL,      "Input: 1 strip", 0.0, 0.0, 0.0, "",
+	NUM | INT,    "seed: ",       1.0,    0.0, 10.0, "Offset in random table",
+	NUMSLI | FLO, "swing: ",      1.0,    0.0, 3.0, "The amplitude, width of the effect",
+	TOG | INT,    "wrap",         0.0,    0.0, 1.0, "Cyclic wrap around the left/right edges",
+	NUM | INT,    "type: ",       1.0,    0.0, 1.0, "Type 1 is random for each frame",
 };
 
 /* The cast struct is for input in the main doit function
    Varstr and Cast must have the same variables in the same order */ 
 
 typedef struct Cast {
-	int dummy;			/* because of the 'label' button */
+	int dummy;          /* because of the 'label' button */
 	int seed;
 	float swing;
 	int wrap;
@@ -80,57 +80,57 @@ void plugin_init()
 
 void plugin_getinfo(PluginInfo *info)
 {
-	info->name= name;
-	info->nvars= sizeof(varstr)/sizeof(VarStruct);
-	info->cfra= &cfra;
+	info->name = name;
+	info->nvars = sizeof(varstr) / sizeof(VarStruct);
+	info->cfra = &cfra;
 
-	info->varstr= varstr;
+	info->varstr = varstr;
 
-	info->init= plugin_init;
-	info->seq_doit= (SeqDoit) plugin_seq_doit;
-	info->callback= plugin_but_changed;
+	info->init = plugin_init;
+	info->seq_doit = (SeqDoit) plugin_seq_doit;
+	info->callback = plugin_but_changed;
 }
 
 
 /* ************************************************************
-	Scatter
+    Scatter
 	
-   ************************************************************ */
+************************************************************ */
 
 static void rectcpy(ImBuf *dbuf, ImBuf *sbuf,	
-				int destx, int desty, 
-				int srcx, int srcy, int width, int height)
+                    int destx, int desty,
+                    int srcx, int srcy, int width, int height)
 {
-	uint *drect,*srect;
+	uint *drect, *srect;
 	float *dfrect, *sfrect;
 	int tmp;
 
 	if (dbuf == 0) return;
 
-	if (destx < 0){
-		srcx -= destx ;
-		width += destx ;
+	if (destx < 0) {
+		srcx -= destx;
+		width += destx;
 		destx = 0;
 	}
-	if (srcx < 0){
-		destx -= srcx ;
-		width += destx ;
+	if (srcx < 0) {
+		destx -= srcx;
+		width += destx;
 		srcx = 0;
 	}
-	if (desty < 0){
-		srcy -= desty ;
-		height += desty ;
+	if (desty < 0) {
+		srcy -= desty;
+		height += desty;
 		desty = 0;
 	}
-	if (srcy < 0){
-		desty -= srcy ;
-		height += desty ;
+	if (srcy < 0) {
+		desty -= srcy;
+		height += desty;
 		srcy = 0;
 	}
 
 	if (width > dbuf->x - destx) width = dbuf->x - destx;
 	if (height > dbuf->y - desty) height = dbuf->y - desty;
-	if (sbuf){
+	if (sbuf) {
 		if (width > sbuf->x - srcx) width = sbuf->x - srcx;
 		if (height > sbuf->y - srcy) height = sbuf->y - srcy;
 		srect = sbuf->rect;
@@ -151,23 +151,25 @@ static void rectcpy(ImBuf *dbuf, ImBuf *sbuf,
 	destx = dbuf->x;
 
 	if (sbuf) {
-		tmp = (srcy * sbuf->x + srcx );
+		tmp = (srcy * sbuf->x + srcx);
 		if (dbuf->rect_float) sfrect += 4 * tmp; 
 		else srect += tmp;
 		srcx = sbuf->x;
-	} else{
+	}
+	else {
 		if (dbuf->rect_float) sfrect = dfrect;
 		else srect = drect;
 		srcx = destx;
 	}
 
-	for (;height > 0; height--){
+	for (; height > 0; height--) {
 		if (dbuf->rect_float) {
-			memcpy(dfrect,sfrect, 4 * width * sizeof(float));
+			memcpy(dfrect, sfrect, 4 * width * sizeof(float));
 			dfrect += destx;
 			sfrect += srcx;
-		} else {
-			memcpy(drect,srect, width * sizeof(int));
+		}
+		else {
+			memcpy(drect, srect, width * sizeof(int));
 			drect += destx;
 			srect += srcx;
 		}
@@ -176,21 +178,22 @@ static void rectcpy(ImBuf *dbuf, ImBuf *sbuf,
 
 static void fill_out(ImBuf *out, float r, float g, float b, float a)
 {
-	int tot,x;
+	int tot, x;
 	float *rectf = out->rect_float;
 	unsigned char *rect = (unsigned char *)out->rect;
 
 	tot = out->x * out->y;
 	if (out->rect_float) {
-		for (x = 0;x < tot; x++) {
+		for (x = 0; x < tot; x++) {
 			rectf[0] = r;
 			rectf[1] = g;
 			rectf[2] = b;
 			rectf[3] = a;
 			rectf += 4;
 		}
-	} else {
-		for (x=0;x < tot;x++) {
+	}
+	else {
+		for (x = 0; x < tot; x++) {
 			rect[0] = (int)(r * 255);
 			rect[1] = (int)(g * 255);
 			rect[2] = (int)(b * 255);
@@ -207,7 +210,7 @@ void plugin_seq_doit(Cast *cast, float facf0, float facf1, int sx, int sy, ImBuf
 	int x, y, lr;
 	
 	/* fill imbuf 'out' with black */
-	fill_out(out, 0,0,0,0);
+	fill_out(out, 0, 0, 0, 0);
 
 
 	switch (cast->type) {
@@ -228,9 +231,10 @@ void plugin_seq_doit(Cast *cast, float facf0, float facf1, int sx, int sy, ImBuf
 					f1 = cast->swing * f1;
 					f2 = cast->swing * f2;
 					if (cast->wrap) f2 += 1.0;
-					lr = drand48()>0.5;
+					lr = drand48() > 0.5;
 					t1 = facf0;
-				} else t1 = facf1;
+				}
+				else t1 = facf1;
 				
 				t2 = 1.0 - t1;
 				t3 = 3.0 * (f1 * t1 * t1 * t2 + f2 * t1 * t2 * t2);