[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50239] trunk/blender/source/blender/ editors/space_sequencer/sequencer_scopes.c: Style cleanup: spaces in sequencer scopes

Sergey Sharybin sergey.vfx at gmail.com
Mon Aug 27 11:01:35 CEST 2012


Revision: 50239
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50239
Author:   nazgul
Date:     2012-08-27 09:01:35 +0000 (Mon, 27 Aug 2012)
Log Message:
-----------
Style cleanup: spaces in sequencer scopes

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_sequencer/sequencer_scopes.c

Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_scopes.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_scopes.c	2012-08-27 09:01:34 UTC (rev 50238)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_scopes.c	2012-08-27 09:01:35 UTC (rev 50239)
@@ -60,16 +60,14 @@
 	pos[3] = 255;
 }
 
-static void scope_put_pixel_single(unsigned char *table, unsigned char *pos,
-                                   int col)
+static void scope_put_pixel_single(unsigned char *table, unsigned char *pos, int col)
 {
 	char newval = table[pos[col]];
 	pos[col] = newval;
 	pos[3] = 255;
 }
 
-static void wform_put_line(int w,
-                           unsigned char *last_pos, unsigned char *new_pos)
+static void wform_put_line(int w, unsigned char *last_pos, unsigned char *new_pos)
 {
 	if (last_pos > new_pos) {
 		unsigned char *temp = new_pos;
@@ -86,8 +84,7 @@
 	}
 }
 
-static void wform_put_line_single(
-        int w, unsigned char *last_pos, unsigned char *new_pos, int col)
+static void wform_put_line_single(int w, unsigned char *last_pos, unsigned char *new_pos, int col)
 {
 	if (last_pos > new_pos) {
 		unsigned char *temp = new_pos;
@@ -161,8 +158,7 @@
 	wform_put_grid(tgt, w, h);
 
 	for (x = 0; x < 256; x++) {
-		wtable[x] = (unsigned char) (pow(((float) x + 1) / 256,
-		                                 waveform_gamma) * 255);
+		wtable[x] = (unsigned char) (pow(((float) x + 1) / 256, waveform_gamma) * 255);
 	}
 
 	for (y = 0; y < ibuf->y; y++) {
@@ -204,8 +200,7 @@
 	wform_put_grid(tgt, w, h);
 
 	for (x = 0; x < 256; x++) {
-		wtable[x] = (unsigned char) (pow(((float) x + 1) / 256,
-		                                 waveform_gamma) * 255);
+		wtable[x] = (unsigned char) (pow(((float) x + 1) / 256, waveform_gamma) * 255);
 	}
 
 	for (y = 0; y < ibuf->y; y++) {
@@ -249,8 +244,7 @@
 
 static ImBuf *make_sep_waveform_view_from_ibuf_byte(ImBuf *ibuf)
 {
-	ImBuf *rval = IMB_allocImBuf(
-	    ibuf->x + 3, 515, 32, IB_rect);
+	ImBuf *rval = IMB_allocImBuf(ibuf->x + 3, 515, 32, IB_rect);
 	int x, y;
 	unsigned char *src = (unsigned char *) ibuf->rect;
 	unsigned char *tgt = (unsigned char *) rval->rect;
@@ -263,8 +257,7 @@
 	wform_put_grid(tgt, w, h);
 
 	for (x = 0; x < 256; x++) {
-		wtable[x] = (unsigned char) (pow(((float) x + 1) / 256,
-		                                 waveform_gamma) * 255);
+		wtable[x] = (unsigned char) (pow(((float) x + 1) / 256, waveform_gamma) * 255);
 	}
 
 	for (y = 0; y < ibuf->y; y++) {
@@ -275,16 +268,14 @@
 			unsigned char *rgb = src + 4 * (ibuf->x * y + x);
 			for (c = 0; c < 3; c++) {
 				unsigned char *p = tgt;
-				p += 4 * (w * ((rgb[c] * (h - 3)) / 255 + 1) +
-				          c * sw + x / 3 + 1);
+				p += 4 * (w * ((rgb[c] * (h - 3)) / 255 + 1) + c * sw + x / 3 + 1);
 
 				scope_put_pixel_single(wtable, p, c);
 				p += 4 * w;
 				scope_put_pixel_single(wtable, p, c);
 
 				if (last_p[c] != NULL) {
-					wform_put_line_single(
-					    w, last_p[c], p, c);
+					wform_put_line_single(w, last_p[c], p, c);
 				}
 				last_p[c] = p;
 			}
@@ -311,8 +302,7 @@
 	wform_put_grid(tgt, w, h);
 
 	for (x = 0; x < 256; x++) {
-		wtable[x] = (unsigned char) (pow(((float) x + 1) / 256,
-		                                 waveform_gamma) * 255);
+		wtable[x] = (unsigned char) (pow(((float) x + 1) / 256, waveform_gamma) * 255);
 	}
 
 	for (y = 0; y < ibuf->y; y++) {
@@ -327,16 +317,14 @@
 
 				CLAMP(v, 0.0f, 1.0f);
 
-				p += 4 * (w * ((int) (v * (h - 3)) + 1) +
-				          c * sw + x / 3 + 1);
+				p += 4 * (w * ((int) (v * (h - 3)) + 1) + c * sw + x / 3 + 1);
 
 				scope_put_pixel_single(wtable, p, c);
 				p += 4 * w;
 				scope_put_pixel_single(wtable, p, c);
 
 				if (last_p[c] != NULL) {
-					wform_put_line_single(
-					    w, last_p[c], p, c);
+					wform_put_line_single(w, last_p[c], p, c);
 				}
 				last_p[c] = p;
 			}
@@ -492,10 +480,8 @@
 
 	for (c = 0; c < 3; c++) {
 		for (x = 0; x < 256; x++) {
-			draw_histogram_bar(rval, x * 2 + 1,
-			                   ((float) bins[c][x]) / n, c);
-			draw_histogram_bar(rval, x * 2 + 2,
-			                   ((float) bins[c][x]) / n, c);
+			draw_histogram_bar(rval, x * 2 + 1, ((float) bins[c][x]) / n, c);
+			draw_histogram_bar(rval, x * 2 + 2, ((float) bins[c][x]) / n, c);
 		}
 	}
 
@@ -567,9 +553,7 @@
 	}
 }
 
-static void vectorscope_put_cross(unsigned char r, unsigned char g, 
-                                  unsigned char b,
-                                  char *tgt, int w, int h, int size)
+static void vectorscope_put_cross(unsigned char r, unsigned char g,  unsigned char b, char *tgt, int w, int h, int size)
 {
 	float rgb[3], yuv[3];
 	char *p;
@@ -609,8 +593,7 @@
 	unsigned char wtable[256];
 
 	for (x = 0; x < 256; x++) {
-		wtable[x] = (unsigned char) (pow(((float) x + 1) / 256,
-		                                 scope_gamma) * 255);
+		wtable[x] = (unsigned char) (pow(((float) x + 1) / 256, scope_gamma) * 255);
 	}
 
 	for (x = 0; x <= 255; x++) {
@@ -656,8 +639,7 @@
 	unsigned char wtable[256];
 
 	for (x = 0; x < 256; x++) {
-		wtable[x] = (unsigned char) (pow(((float) x + 1) / 256,
-		                                 scope_gamma) * 255);
+		wtable[x] = (unsigned char) (pow(((float) x + 1) / 256, scope_gamma) * 255);
 	}
 
 	for (x = 0; x <= 255; x++) {




More information about the Bf-blender-cvs mailing list