style cleanup (mostly whitespace)

6 files changed, 159 insertions, 159 deletions

diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c
index f36db61f27a..ca2c4719917 100644
--- a/source/blender/imbuf/intern/indexer.c
+++ b/source/blender/imbuf/intern/indexer.c
@@ -649,7 +649,7 @@ static void free_proxy_output_ffmpeg(struct proxy_output_ctx * ctx,
 	}
 
 	if (!rollback) {
-		while (add_to_proxy_output_ffmpeg(ctx, NULL)) ;
+		while (add_to_proxy_output_ffmpeg(ctx, NULL)) {}
 	}
 
 	avcodec_flush_buffers(ctx->c);
diff --git a/source/blender/imbuf/intern/jp2.c b/source/blender/imbuf/intern/jp2.c
index f8082c95f84..3d88a24ba37 100644
--- a/source/blender/imbuf/intern/jp2.c
+++ b/source/blender/imbuf/intern/jp2.c
@@ -403,7 +403,7 @@ static void cinema_setup_encoder(opj_cparameters_t *parameters,opj_image_t *imag
 	case CINEMA2K_24:
 	case CINEMA4K_24:
 		for(i=0 ; i<parameters->tcp_numlayers ; i++){
-			temp_rate = 0 ;
+			temp_rate = 0;
 			if (img_fol->rates[i]== 0){
 				parameters->tcp_rates[0]= ((float) (image->numcomps * image->comps[0].w * image->comps[0].h * image->comps[0].prec))/ 
 					(CINEMA_24_CS * 8 * image->comps[0].dx * image->comps[0].dy);
@@ -423,7 +423,7 @@ static void cinema_setup_encoder(opj_cparameters_t *parameters,opj_image_t *imag
 		
 	case CINEMA2K_48:
 		for(i=0 ; i<parameters->tcp_numlayers ; i++){
-			temp_rate = 0 ;
+			temp_rate = 0;
 			if (img_fol->rates[i]== 0){
 				parameters->tcp_rates[0]= ((float) (image->numcomps * image->comps[0].w * image->comps[0].h * image->comps[0].prec))/ 
 					(CINEMA_48_CS * 8 * image->comps[0].dx * image->comps[0].dy);
diff --git a/source/blender/imbuf/intern/jpeg.c b/source/blender/imbuf/intern/jpeg.c
index a43a8672651..6c3b7594264 100644
--- a/source/blender/imbuf/intern/jpeg.c
+++ b/source/blender/imbuf/intern/jpeg.c
@@ -66,7 +66,7 @@ static ImBuf * ibJpegImageFromCinfo(struct jpeg_decompress_struct * cinfo, int f
 
 /*
  * In principle there are 4 jpeg formats.
- * 
+ *
  * 1. jpeg - standard printing, u & v at quarter of resulution
  * 2. jvid - standaard video, u & v half resolution, frame not interlaced
 
@@ -187,7 +187,7 @@ static void memory_source(j_decompress_ptr cinfo, unsigned char *buffer, size_t
 	src->pub.init_source		= init_source;
 	src->pub.fill_input_buffer	= fill_input_buffer;
 	src->pub.skip_input_data	= skip_input_data;
-	src->pub.resync_to_restart	= jpeg_resync_to_restart; 
+	src->pub.resync_to_restart	= jpeg_resync_to_restart;
 	src->pub.term_source		= term_source;
 
 	src->pub.bytes_in_buffer	= size;
@@ -329,7 +329,7 @@ static ImBuf * ibJpegImageFromCinfo(struct jpeg_decompress_struct * cinfo, int f
 							rect[0] = rect[1] = rect[2] = *buffer++;
 							rect += 4;
 						}
-							break;
+						break;
 					case 3:
 						for (x=ibuf->x; x >0; x--) {
 							rect[3] = 255;
@@ -338,7 +338,7 @@ static ImBuf * ibJpegImageFromCinfo(struct jpeg_decompress_struct * cinfo, int f
 							rect[2] = *buffer++;
 							rect += 4;
 						}
-							break;
+						break;
 					case 4:
 						for (x=ibuf->x; x >0; x--) {
 							r = *buffer++;
@@ -361,7 +361,7 @@ static ImBuf * ibJpegImageFromCinfo(struct jpeg_decompress_struct * cinfo, int f
 							if (b & 0xffffff00) {
 								if (b < 0) b = 0;
 								else b = 255;
-							}							
+							}
 							
 							rect[3] = 255 - k;
 							rect[2] = b;
@@ -526,26 +526,26 @@ next_stamp_info:
 		buffer = row_pointer[0];
 
 		switch(cinfo->in_color_space){
-		case JCS_RGB:
-			for (x = 0; x < ibuf->x; x++) {
-				*buffer++ = rect[0];
-				*buffer++ = rect[1];
-				*buffer++ = rect[2];
-				rect += 4;
-			}
-			break;
-		case JCS_GRAYSCALE:
-			for (x = 0; x < ibuf->x; x++) {
-				*buffer++ = rect[0];
-				rect += 4;
-			}
-			break;
-		case JCS_UNKNOWN:
-			memcpy(buffer, rect, 4 * ibuf->x);
-			break;
-			/* default was missing... intentional ? */
-		default:
-			; /* do nothing */
+			case JCS_RGB:
+				for (x = 0; x < ibuf->x; x++) {
+					*buffer++ = rect[0];
+					*buffer++ = rect[1];
+					*buffer++ = rect[2];
+					rect += 4;
+				}
+				break;
+			case JCS_GRAYSCALE:
+				for (x = 0; x < ibuf->x; x++) {
+					*buffer++ = rect[0];
+					rect += 4;
+				}
+				break;
+			case JCS_UNKNOWN:
+				memcpy(buffer, rect, 4 * ibuf->x);
+				break;
+				/* default was missing... intentional ? */
+			default:
+				; /* do nothing */
 		}
 
 		jpeg_write_scanlines(cinfo, row_pointer, 1);
@@ -579,18 +579,18 @@ static int init_jpeg(FILE * outfile, struct jpeg_compress_struct * cinfo, struct
 	if (ibuf->planes == 32) cinfo->in_color_space = JCS_UNKNOWN;
 #endif
 	switch(cinfo->in_color_space){
-	case JCS_RGB:
-		cinfo->input_components = 3;
-		break;
-	case JCS_GRAYSCALE:
-		cinfo->input_components = 1;
-		break;
-	case JCS_UNKNOWN:
-		cinfo->input_components = 4;
-		break;
-		/* default was missing... intentional ? */
-	default:
-		; /* do nothing */
+		case JCS_RGB:
+			cinfo->input_components = 3;
+			break;
+		case JCS_GRAYSCALE:
+			cinfo->input_components = 1;
+			break;
+		case JCS_UNKNOWN:
+			cinfo->input_components = 4;
+			break;
+			/* default was missing... intentional ? */
+		default:
+			; /* do nothing */
 	}
 	jpeg_set_defaults(cinfo);
 	
@@ -693,8 +693,8 @@ static int save_jstjpeg(const char *name, struct ImBuf *ibuf)
 	IMB_rectcpy(tbuf, ibuf, 0, 0, 0, 0, ibuf->x, ibuf->y);
 	sprintf(fieldname, "%s.jf0", name);
 
-	returnval = save_vidjpeg(fieldname, tbuf) ;
-		if (returnval == 1) {
+	returnval = save_vidjpeg(fieldname, tbuf);
+	if (returnval == 1) {
 		IMB_rectcpy(tbuf, ibuf, 0, 0, tbuf->x, 0, ibuf->x, ibuf->y);
 		sprintf(fieldname, "%s.jf1", name);
 		returnval = save_vidjpeg(fieldname, tbuf);
diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp
index a5a9427ea89..ad729b34d31 100644
--- a/source/blender/imbuf/intern/openexr/openexr_api.cpp
+++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp
@@ -98,7 +98,7 @@ class Mem_IStream: public IStream
 public:
 	
 	Mem_IStream (unsigned char *exrbuf, size_t exrsize):
-	    IStream("dummy"), _exrpos (0), _exrsize(exrsize)  { _exrbuf = exrbuf; }
+	    IStream("dummy"), _exrpos (0), _exrsize(exrsize) { _exrbuf = exrbuf; }
 	
 	virtual bool	read (char c[], int n);
 	virtual Int64	tellg ();
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;
 			}
diff --git a/source/blender/imbuf/intern/thumbs_blend.c b/source/blender/imbuf/intern/thumbs_blend.c
index 149b5fb9096..037b4ab63c0 100644
--- a/source/blender/imbuf/intern/thumbs_blend.c
+++ b/source/blender/imbuf/intern/thumbs_blend.c
@@ -49,7 +49,7 @@ static ImBuf *loadblend_thumb(gzFile gzfile)
 	int bhead[24/sizeof(int)]; /* max size on 64bit */
 	char endian, pointer_size;
 	char endian_switch;
-	int sizeof_bhead ;
+	int sizeof_bhead;
 
 	/* read the blend file header */
 	if(gzread(gzfile, buf, 12) != 12)