From b340f930ec5639f24e7e2d47fab221fb752b61dd Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 28 Apr 2012 06:31:57 +0000 Subject: style cleanup: changes to brace placement / newlines - for/while/if/switch --- release/plugins/sequence/blur.c | 50 +++++++++++++++++++-------------------- release/plugins/texture/clouds2.c | 4 ++-- release/plugins/texture/tiles.c | 22 ++++++++--------- 3 files changed, 38 insertions(+), 38 deletions(-) (limited to 'release') diff --git a/release/plugins/sequence/blur.c b/release/plugins/sequence/blur.c index e95c243b558..b59d7fbd005 100644 --- a/release/plugins/sequence/blur.c +++ b/release/plugins/sequence/blur.c @@ -106,20 +106,20 @@ void blurbuf(struct ImBuf *ibuf, int nr, Cast *cast) x4= ibuf->x/4; /* This doesn't seem to work... paprmh */ - if(cast->gamma != 1.0) gamwarp(tbuf, cast->gamma); + if (cast->gamma != 1.0) gamwarp(tbuf, cast->gamma); /* reduce */ - for(i=0; ix<4 || tbuf->y<4) break; + if (tbuf->x<4 || tbuf->y<4) break; } /* enlarge */ - for(i=0; ix > x4) { + if (tbuf->x > x4) { scaleImBuf(tbuf, ibuf->x, ibuf->y); break; } } /* this doesn't seem to work...paprmh*/ - if(cast->gamma != 1.0) gamwarp(tbuf, 1.0 / cast->gamma); + 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) + if (ibuf->rect_float) memcpy(ibuf->rect_float, tbuf->rect_float, 4*ibuf->x*ibuf->y*sizeof(float)); freeImBuf(tbuf); @@ -161,13 +161,13 @@ 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; - while(pfac < fac) { + while (pfac < fac) { blurbuf(pbuf, n, cast); blurbuf(pbuf, n, cast); @@ -185,10 +185,10 @@ void doblur(struct ImBuf *mbuf, float fac, Cast *cast) 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) { + if (mbuf->rect_float){ + if (fac>=1) { memcpy(mbuf->rect_float, ibuf->rect_float, 4*n*sizeof(float)); } else if(fac<=0) { @@ -200,7 +200,7 @@ void doblur(struct ImBuf *mbuf, float fac, Cast *cast) irectf= (float *)ibuf->rect_float; prectf= (float *)pbuf->rect_float; mrectf= (float *)mbuf->rect_float; - while(n--) { + 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; @@ -213,10 +213,10 @@ void doblur(struct ImBuf *mbuf, float fac, Cast *cast) } else if(mbuf->rect){ b1= (int)fac*255.0; - if(b1>255) b1= 255; + if (b1>255) b1= 255; b2= 255-b1; - if(b1==255) { + if (b1==255) { memcpy(mbuf->rect, ibuf->rect, 4*n); } else if(b1==0) { @@ -226,7 +226,7 @@ void doblur(struct ImBuf *mbuf, float fac, Cast *cast) irect= (char *)ibuf->rect; prect= (char *)pbuf->rect; mrect= (char *)mbuf->rect; - while(n--) { + 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; @@ -247,7 +247,7 @@ void plugin_seq_doit(Cast *cast, float facf0, float facf1, int x, int y, ImBuf * { float bfacf0, bfacf1; - if(cast->use_ipo==0) { + if (cast->use_ipo==0) { bfacf0= bfacf1= cast->blur+1.0; } else { @@ -255,8 +255,8 @@ void plugin_seq_doit(Cast *cast, float facf0, float facf1, int x, int y, ImBuf * 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****************/ @@ -269,13 +269,13 @@ 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)out->rect += out->x * out->y; + if (out->rect_float)out->rect_float += out->x * out->y; 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; +/* if (out->rect)out->rect -= out->x * out->y; + if (out->rect_float)out->rect_float -= out->x * out->y; out->flags |= IB_fields; interlace(out);*/ diff --git a/release/plugins/texture/clouds2.c b/release/plugins/texture/clouds2.c index fc20f5769ef..8561d11dc3b 100644 --- a/release/plugins/texture/clouds2.c +++ b/release/plugins/texture/clouds2.c @@ -150,7 +150,7 @@ int plugin_tex_doit(int stype, Cast *cast, float *texvec, float *dxt, float *dyt /* always return this value */ result[0] = CLAMP (val+cast->offset, 0.0, 1.0) * pow (fabs(sqrt(tv[0]*tv[0]+tv[1]*tv[1]+tv[2]*tv[2])), cast->falloff); - if(stype==1) { + if (stype==1) { /* * this is r, g, b, a: */ @@ -161,7 +161,7 @@ int plugin_tex_doit(int stype, Cast *cast, float *texvec, float *dxt, float *dyt res |= TEX_RGB; } - if(stype==2) { + if (stype==2) { /* * This value is the displacement of the actual normal in * the Material calculation. diff --git a/release/plugins/texture/tiles.c b/release/plugins/texture/tiles.c index 151f64b6dab..11e1ed8f8af 100644 --- a/release/plugins/texture/tiles.c +++ b/release/plugins/texture/tiles.c @@ -124,7 +124,7 @@ float sample_wave(float freq, float coord, float pixsize) float fac, frac, retval; int part1, part2; - if(pixsize > freq) return 0.5; + if (pixsize > freq) return 0.5; pixsize/= freq; @@ -132,19 +132,19 @@ float sample_wave(float freq, float coord, float pixsize) part1= ffloor(fac); frac= fac - part1; - if(part1 & 1) retval= 0.0; - else retval= 1.0; + if (part1 & 1) retval= 0.0; + else retval = 1.0; - if(pixsize != 0.0) { + if (pixsize != 0.0) { /* is coord+pixsize another value? */ part2= ffloor(fac + pixsize); - if(part1==part2) return retval; + if (part1==part2) return retval; /* antialias */ - if(retval==1.0) retval= (1.0-frac)/pixsize; - else retval= 1.0-(1.0-frac)/pixsize; + if (retval == 1.0) retval= (1.0 - frac) / pixsize; + else retval= 1.0 - (1.0 - frac) / pixsize; } return retval; } @@ -153,23 +153,23 @@ int plugin_tex_doit(int stype, Cast *cast, float *texvec, float *dxt, float *dyt { float xwave, ywave; - if(stype==1) { + if (stype==1) { texvec[0]+= hnoise(cast->noise, texvec[0], texvec[1], texvec[2]); texvec[1]+= hnoise(cast->noise, texvec[1], texvec[2], texvec[0]); } - if(dxt && dyt) { + if (dxt && dyt) { xwave= sample_wave(cast->size, texvec[0], fabs(dxt[0]) + fabs(dyt[0]) ); ywave= sample_wave(cast->size, texvec[1], fabs(dxt[1]) + fabs(dyt[1]) ); - if(xwave > ywave) result[0]= xwave-ywave; + if (xwave > ywave) result[0]= xwave-ywave; else result[0]= ywave-xwave; } else { xwave= sample_wave(cast->size, texvec[0], 0.0 ); ywave= sample_wave(cast->size, texvec[1], 0.0 ); - if(xwave > ywave) result[0]= xwave-ywave; + if (xwave > ywave) result[0]= xwave-ywave; else result[0]= ywave-xwave; } -- cgit v1.2.3