diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-02-27 14:35:39 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-27 14:35:39 +0400 |
commit | 47c373c7a970fa4bd26453a6e35a4b066f2b77e4 (patch) | |
tree | 43d916fb86bcf797afa834649706669694225fe8 /source/blender/imbuf/intern/scaling.c | |
parent | 120297734b4a01d93e5223e02f255b5aef01e281 (diff) |
style cleanup (mostly whitespace)
Diffstat (limited to 'source/blender/imbuf/intern/scaling.c')
-rw-r--r-- | source/blender/imbuf/intern/scaling.c | 230 |
1 files changed, 115 insertions, 115 deletions
diff --git a/source/blender/imbuf/intern/scaling.c b/source/blender/imbuf/intern/scaling.c index a7188248d58..c131d385874 100644 --- a/source/blender/imbuf/intern/scaling.c +++ b/source/blender/imbuf/intern/scaling.c @@ -76,18 +76,18 @@ struct ImBuf *IMB_half_x(struct ImBuf *ibuf1) _p1f = ibuf1->rect_float; destf= ibuf2->rect_float; - for(y=ibuf2->y;y>0;y--){ + for(y=ibuf2->y;y>0;y--) { p1 = _p1; p1f = _p1f; - for(x = ibuf2->x ; x>0 ; x--){ + for(x = ibuf2->x; x>0; x--) { if (do_rect) { - a = *(p1++) ; - b = *(p1++) ; - g = *(p1++) ; + a = *(p1++); + b = *(p1++); + g = *(p1++); r = *(p1++); - a += *(p1++) ; - b += *(p1++) ; - g += *(p1++) ; + a += *(p1++); + b += *(p1++); + g += *(p1++); r += *(p1++); *(dest++) = a >> 1; *(dest++) = b >> 1; @@ -136,7 +136,7 @@ struct ImBuf *IMB_double_fast_x(struct ImBuf *ibuf1) p1f = (float *)ibuf1->rect_float; destf = (float *)ibuf2->rect_float; - for(i = ibuf1->y * ibuf1->x ; i>0 ; i--) { + for(i = ibuf1->y * ibuf1->x; i > 0; i--) { if (do_rect) { col = *p1++; *dest++ = col; @@ -195,7 +195,7 @@ struct ImBuf *IMB_half_y(struct ImBuf *ibuf1) _p1f = (float *) ibuf1->rect_float; destf= (float *) ibuf2->rect_float; - for(y=ibuf2->y ; y>0 ; y--){ + for(y=ibuf2->y; y>0; y--) { if (do_rect) { p1 = _p1; p2 = _p1 + (ibuf1->x << 2); @@ -204,15 +204,15 @@ struct ImBuf *IMB_half_y(struct ImBuf *ibuf1) p1f = _p1f; p2f = _p1f + (ibuf1->x << 2); } - for(x = ibuf2->x ; x>0 ; x--){ + for(x = ibuf2->x; x > 0; x--) { if (do_rect) { - a = *(p1++) ; - b = *(p1++) ; - g = *(p1++) ; + a = *(p1++); + b = *(p1++); + g = *(p1++); r = *(p1++); - a += *(p2++) ; - b += *(p2++) ; - g += *(p2++) ; + a += *(p2++); + b += *(p2++); + g += *(p2++); r += *(p2++); *(dest++) = a >> 1; *(dest++) = b >> 1; @@ -220,13 +220,13 @@ struct ImBuf *IMB_half_y(struct ImBuf *ibuf1) *(dest++) = r >> 1; } if (do_float) { - af = *(p1f++) ; - bf = *(p1f++) ; - gf = *(p1f++) ; + af = *(p1f++); + bf = *(p1f++); + gf = *(p1f++); rf = *(p1f++); - af += *(p2f++) ; - bf += *(p2f++) ; - gf += *(p2f++) ; + af += *(p2f++); + bf += *(p2f++); + gf += *(p2f++); rf += *(p2f++); *(destf++) = 0.5f*af; *(destf++) = 0.5f*bf; @@ -263,15 +263,15 @@ struct ImBuf *IMB_double_fast_y(struct ImBuf *ibuf1) p1f = (float *) ibuf1->rect_float; dest1f= (float *) ibuf2->rect_float; - for(y = ibuf1->y ; y>0 ; y--){ + for(y = ibuf1->y; y > 0; y--) { if (do_rect) { dest2 = dest1 + ibuf2->x; - for(x = ibuf2->x ; x>0 ; x--) *dest1++ = *dest2++ = *p1++; + for(x = ibuf2->x; x > 0; x--) *dest1++ = *dest2++ = *p1++; dest1 = dest2; } if (do_float) { dest2f = dest1f + (4*ibuf2->x); - for(x = ibuf2->x*4 ; x>0 ; x--) *dest1f++ = *dest2f++ = *p1f++; + for(x = ibuf2->x * 4; x > 0; x--) *dest1f++ = *dest2f++ = *p1f++; dest1f = dest2f; } } @@ -310,10 +310,10 @@ void imb_onehalf_no_alloc(struct ImBuf *ibuf2, struct ImBuf *ibuf1) p1 = (uchar *) ibuf1->rect; dest=(uchar *) ibuf2->rect; - for(y=ibuf2->y;y>0;y--){ + for(y=ibuf2->y;y>0;y--) { if (do_rect) p2 = p1 + (ibuf1->x << 2); if (do_float) p2f = p1f + (ibuf1->x << 2); - for(x=ibuf2->x;x>0;x--){ + for(x=ibuf2->x;x>0;x--) { if (do_rect) { dest[0] = (p1[0] + p2[0] + p1[4] + p2[4]) >> 2; dest[1] = (p1[1] + p2[1] + p1[5] + p2[5]) >> 2; @@ -323,7 +323,7 @@ void imb_onehalf_no_alloc(struct ImBuf *ibuf2, struct ImBuf *ibuf1) p2 += 8; dest += 4; } - if (do_float){ + if (do_float) { destf[0] = 0.25f*(p1f[0] + p2f[0] + p1f[4] + p2f[4]); destf[1] = 0.25f*(p1f[1] + p2f[1] + p1f[5] + p2f[5]); destf[2] = 0.25f*(p1f[2] + p2f[2] + p1f[6] + p2f[6]); @@ -869,12 +869,12 @@ static struct ImBuf *scaledownx(struct ImBuf *ibuf, int newx) newrectf = _newrectf; } - for (y = ibuf->y; y>0 ; y--) { + for (y = ibuf->y; y > 0; y--) { sample = 0.0f; val[0]= val[1]= val[2]= val[3]= 0.0f; valf[0]=valf[1]=valf[2]=valf[3]= 0.0f; - for (x = newx ; x>0 ; x--) { + for (x = newx; x > 0; x--) { if (do_rect) { nval[0] = - val[0] * sample; nval[1] = - val[1] * sample; @@ -890,7 +890,7 @@ static struct ImBuf *scaledownx(struct ImBuf *ibuf, int newx) sample += add; - while (sample >= 1.0f){ + while (sample >= 1.0f) { sample -= 1.0f; if (do_rect) { @@ -991,7 +991,7 @@ static struct ImBuf *scaledowny(struct ImBuf *ibuf, int newy) add = (ibuf->y - 0.01) / newy; skipx = 4 * ibuf->x; - for (x = skipx - 4; x>=0 ; x-= 4) { + for (x = skipx - 4; x >= 0; x -= 4) { if (do_rect) { rect = ((uchar *) ibuf->rect) + x; newrect = _newrect + x; @@ -1005,7 +1005,7 @@ static struct ImBuf *scaledowny(struct ImBuf *ibuf, int newy) val[0]= val[1]= val[2]= val[3]= 0.0f; valf[0]=valf[1]=valf[2]=valf[3]= 0.0f; - for (y = newy ; y>0 ; y--) { + for (y = newy; y > 0; y--) { if (do_rect) { nval[0] = - val[0] * sample; nval[1] = - val[1] * sample; @@ -1132,93 +1132,93 @@ static struct ImBuf *scaleupx(struct ImBuf *ibuf, int newx) newrect = _newrect; newrectf = _newrectf; - for (y = ibuf->y; y>0 ; y--){ + for (y = ibuf->y; y > 0; y--) { sample = 0; if (do_rect) { - val_a = rect[0] ; + val_a = rect[0]; nval_a = rect[4]; - diff_a = nval_a - val_a ; + diff_a = nval_a - val_a; val_a += 0.5f; - val_b = rect[1] ; + val_b = rect[1]; nval_b = rect[5]; - diff_b = nval_b - val_b ; + diff_b = nval_b - val_b; val_b += 0.5f; - val_g = rect[2] ; + val_g = rect[2]; nval_g = rect[6]; - diff_g = nval_g - val_g ; + diff_g = nval_g - val_g; val_g += 0.5f; - val_r = rect[3] ; + val_r = rect[3]; nval_r = rect[7]; - diff_r = nval_r - val_r ; + diff_r = nval_r - val_r; val_r += 0.5f; rect += 8; } if (do_float) { - val_af = rectf[0] ; + val_af = rectf[0]; nval_af = rectf[4]; diff_af = nval_af - val_af; - val_bf = rectf[1] ; + val_bf = rectf[1]; nval_bf = rectf[5]; diff_bf = nval_bf - val_bf; - val_gf = rectf[2] ; + val_gf = rectf[2]; nval_gf = rectf[6]; diff_gf = nval_gf - val_gf; - val_rf = rectf[3] ; + val_rf = rectf[3]; nval_rf = rectf[7]; diff_rf = nval_rf - val_rf; rectf += 8; } - for (x = newx ; x>0 ; x--){ - if (sample >= 1.0f){ + for (x = newx; x > 0; x--) { + if (sample >= 1.0f) { sample -= 1.0f; if (do_rect) { - val_a = nval_a ; - nval_a = rect[0] ; - diff_a = nval_a - val_a ; + val_a = nval_a; + nval_a = rect[0]; + diff_a = nval_a - val_a; val_a += 0.5f; - val_b = nval_b ; - nval_b = rect[1] ; - diff_b = nval_b - val_b ; + val_b = nval_b; + nval_b = rect[1]; + diff_b = nval_b - val_b; val_b += 0.5f; - val_g = nval_g ; - nval_g = rect[2] ; - diff_g = nval_g - val_g ; + val_g = nval_g; + nval_g = rect[2]; + diff_g = nval_g - val_g; val_g += 0.5f; - val_r = nval_r ; - nval_r = rect[3] ; - diff_r = nval_r - val_r ; + val_r = nval_r; + nval_r = rect[3]; + diff_r = nval_r - val_r; val_r += 0.5f; rect += 4; } if (do_float) { - val_af = nval_af ; - nval_af = rectf[0] ; - diff_af = nval_af - val_af ; + val_af = nval_af; + nval_af = rectf[0]; + diff_af = nval_af - val_af; - val_bf = nval_bf ; - nval_bf = rectf[1] ; - diff_bf = nval_bf - val_bf ; + val_bf = nval_bf; + nval_bf = rectf[1]; + diff_bf = nval_bf - val_bf; - val_gf = nval_gf ; - nval_gf = rectf[2] ; - diff_gf = nval_gf - val_gf ; + val_gf = nval_gf; + nval_gf = rectf[2]; + diff_gf = nval_gf - val_gf; - val_rf = nval_rf ; - nval_rf = rectf[3] ; + val_rf = nval_rf; + nval_rf = rectf[3]; diff_rf = nval_rf - val_rf; rectf += 4; } @@ -1300,31 +1300,31 @@ static struct ImBuf *scaleupy(struct ImBuf *ibuf, int newy) newrect = _newrect; newrectf = _newrectf; - for (x = ibuf->x; x>0 ; x--){ + for (x = ibuf->x; x > 0; x--) { sample = 0; if (do_rect) { rect = ((uchar *)ibuf->rect) + 4*(x-1); newrect = _newrect + 4*(x-1); - val_a = rect[0] ; + val_a = rect[0]; nval_a = rect[skipx]; - diff_a = nval_a - val_a ; + diff_a = nval_a - val_a; val_a += 0.5f; - val_b = rect[1] ; + val_b = rect[1]; nval_b = rect[skipx+1]; - diff_b = nval_b - val_b ; + diff_b = nval_b - val_b; val_b += 0.5f; - val_g = rect[2] ; + val_g = rect[2]; nval_g = rect[skipx+2]; - diff_g = nval_g - val_g ; + diff_g = nval_g - val_g; val_g += 0.5f; - val_r = rect[3] ; + val_r = rect[3]; nval_r = rect[skipx+4]; - diff_r = nval_r - val_r ; + diff_r = nval_r - val_r; val_r += 0.5f; rect += 2*skipx; @@ -1333,66 +1333,66 @@ static struct ImBuf *scaleupy(struct ImBuf *ibuf, int newy) rectf = ((float *)ibuf->rect_float) + 4*(x-1); newrectf = _newrectf + 4*(x-1); - val_af = rectf[0] ; + val_af = rectf[0]; nval_af = rectf[skipx]; diff_af = nval_af - val_af; - val_bf = rectf[1] ; + val_bf = rectf[1]; nval_bf = rectf[skipx+1]; diff_bf = nval_bf - val_bf; - val_gf = rectf[2] ; + val_gf = rectf[2]; nval_gf = rectf[skipx+2]; diff_gf = nval_gf - val_gf; - val_rf = rectf[3] ; + val_rf = rectf[3]; nval_rf = rectf[skipx+3]; diff_rf = nval_rf - val_rf; rectf += 2*skipx; } - for (y = newy ; y>0 ; y--){ - if (sample >= 1.0f){ + for (y = newy; y > 0; y--) { + if (sample >= 1.0f) { sample -= 1.0f; if (do_rect) { - val_a = nval_a ; - nval_a = rect[0] ; - diff_a = nval_a - val_a ; + val_a = nval_a; + nval_a = rect[0]; + diff_a = nval_a - val_a; val_a += 0.5f; - val_b = nval_b ; - nval_b = rect[1] ; - diff_b = nval_b - val_b ; + val_b = nval_b; + nval_b = rect[1]; + diff_b = nval_b - val_b; val_b += 0.5f; - val_g = nval_g ; - nval_g = rect[2] ; - diff_g = nval_g - val_g ; + val_g = nval_g; + nval_g = rect[2]; + diff_g = nval_g - val_g; val_g += 0.5f; - val_r = nval_r ; - nval_r = rect[3] ; - diff_r = nval_r - val_r ; + val_r = nval_r; + nval_r = rect[3]; + diff_r = nval_r - val_r; val_r += 0.5f; rect += skipx; } if (do_float) { - val_af = nval_af ; - nval_af = rectf[0] ; - diff_af = nval_af - val_af ; + val_af = nval_af; + nval_af = rectf[0]; + diff_af = nval_af - val_af; - val_bf = nval_bf ; - nval_bf = rectf[1] ; - diff_bf = nval_bf - val_bf ; + val_bf = nval_bf; + nval_bf = rectf[1]; + diff_bf = nval_bf - val_bf; - val_gf = nval_gf ; - nval_gf = rectf[2] ; - diff_gf = nval_gf - val_gf ; + val_gf = nval_gf; + nval_gf = rectf[2]; + diff_gf = nval_gf - val_gf; - val_rf = nval_rf ; - nval_rf = rectf[3] ; + val_rf = nval_rf; + nval_rf = rectf[3]; diff_rf = nval_rf - val_rf; rectf += skipx; } @@ -1448,12 +1448,12 @@ static void scalefast_Z_ImBuf(ImBuf *ibuf, int newx, int newy) newrect = _newrect; - for (y = newy; y > 0 ; y--){ + for (y = newy; y > 0; y--) { rect = (unsigned int*) ibuf->zbuf; rect += (ofsy >> 16) * ibuf->x; ofsy += stepy; ofsx = 32768; - for (x = newx ; x > 0 ; x--){ + for (x = newx; x > 0; x--) { *newrect++ = rect[ofsx >> 16]; ofsx += stepx; } @@ -1530,7 +1530,7 @@ struct ImBuf *IMB_scalefastImBuf(struct ImBuf *ibuf, unsigned int newx, unsigned stepy = (65536.0 * (ibuf->y - 1.0) / (newy - 1.0)) + 0.5; ofsy = 32768; - for (y = newy; y > 0 ; y--){ + for (y = newy; y > 0; y--) { if(do_rect) { rect = ibuf->rect; rect += (ofsy >> 16) * ibuf->x; @@ -1543,7 +1543,7 @@ struct ImBuf *IMB_scalefastImBuf(struct ImBuf *ibuf, unsigned int newx, unsigned ofsx = 32768; if (do_rect) { - for (x = newx ; x>0 ; x--){ + for (x = newx; x>0; x--) { *newrect++ = rect[ofsx >> 16]; ofsx += stepx; } @@ -1551,7 +1551,7 @@ struct ImBuf *IMB_scalefastImBuf(struct ImBuf *ibuf, unsigned int newx, unsigned if (do_float) { ofsx = 32768; - for (x = newx ; x>0 ; x--){ + for (x = newx; x>0; x--) { *newrectf++ = rectf[ofsx >> 16]; ofsx += stepx; } |