macro formatting & remve some unused code.

2 files changed, 48 insertions, 44 deletions

diff --git a/source/blender/nodes/composite/node_composite_util.c b/source/blender/nodes/composite/node_composite_util.c
index b8282f2c452..929b87618d8 100644
--- a/source/blender/nodes/composite/node_composite_util.c
+++ b/source/blender/nodes/composite/node_composite_util.c
@@ -1358,24 +1358,24 @@ void IIR_gauss(CompBuf* src, float sigma, int chan, int xy)
 	tsM[7] = sc*(cf[1]*cf[2] + cf[3]*cf[2]*cf[2] - cf[1]*cf[3]*cf[3] - cf[3]*cf[3]*cf[3] - cf[3]*cf[2] + cf[3]);
 	tsM[8] = sc*(cf[3]*(cf[1] + cf[3]*cf[2]));
 
-#define YVV(L)\
-{\
-	W[0] = cf[0]*X[0] + cf[1]*X[0] + cf[2]*X[0] + cf[3]*X[0];\
-	W[1] = cf[0]*X[1] + cf[1]*W[0] + cf[2]*X[0] + cf[3]*X[0];\
-	W[2] = cf[0]*X[2] + cf[1]*W[1] + cf[2]*W[0] + cf[3]*X[0];\
-	for (i=3; i<L; i++)\
-		W[i] = cf[0]*X[i] + cf[1]*W[i-1] + cf[2]*W[i-2] + cf[3]*W[i-3];\
-	tsu[0] = W[L-1] - X[L-1];\
-	tsu[1] = W[L-2] - X[L-1];\
-	tsu[2] = W[L-3] - X[L-1];\
-	tsv[0] = tsM[0]*tsu[0] + tsM[1]*tsu[1] + tsM[2]*tsu[2] + X[L-1];\
-	tsv[1] = tsM[3]*tsu[0] + tsM[4]*tsu[1] + tsM[5]*tsu[2] + X[L-1];\
-	tsv[2] = tsM[6]*tsu[0] + tsM[7]*tsu[1] + tsM[8]*tsu[2] + X[L-1];\
-	Y[L-1] = cf[0]*W[L-1] + cf[1]*tsv[0] + cf[2]*tsv[1] + cf[3]*tsv[2];\
-	Y[L-2] = cf[0]*W[L-2] + cf[1]*Y[L-1] + cf[2]*tsv[0] + cf[3]*tsv[1];\
-	Y[L-3] = cf[0]*W[L-3] + cf[1]*Y[L-2] + cf[2]*Y[L-1] + cf[3]*tsv[0];\
-	for (i=L-4; i>=0; i--)\
-		Y[i] = cf[0]*W[i] + cf[1]*Y[i+1] + cf[2]*Y[i+2] + cf[3]*Y[i+3];\
+#define YVV(L)                                                                \
+{                                                                             \
+	W[0] = cf[0]*X[0] + cf[1]*X[0] + cf[2]*X[0] + cf[3]*X[0];                 \
+	W[1] = cf[0]*X[1] + cf[1]*W[0] + cf[2]*X[0] + cf[3]*X[0];                 \
+	W[2] = cf[0]*X[2] + cf[1]*W[1] + cf[2]*W[0] + cf[3]*X[0];                 \
+	for (i=3; i<L; i++)                                                       \
+		W[i] = cf[0]*X[i] + cf[1]*W[i-1] + cf[2]*W[i-2] + cf[3]*W[i-3];       \
+	tsu[0] = W[L-1] - X[L-1];                                                 \
+	tsu[1] = W[L-2] - X[L-1];                                                 \
+	tsu[2] = W[L-3] - X[L-1];                                                 \
+	tsv[0] = tsM[0]*tsu[0] + tsM[1]*tsu[1] + tsM[2]*tsu[2] + X[L-1];          \
+	tsv[1] = tsM[3]*tsu[0] + tsM[4]*tsu[1] + tsM[5]*tsu[2] + X[L-1];          \
+	tsv[2] = tsM[6]*tsu[0] + tsM[7]*tsu[1] + tsM[8]*tsu[2] + X[L-1];          \
+	Y[L-1] = cf[0]*W[L-1] + cf[1]*tsv[0] + cf[2]*tsv[1] + cf[3]*tsv[2];       \
+	Y[L-2] = cf[0]*W[L-2] + cf[1]*Y[L-1] + cf[2]*tsv[0] + cf[3]*tsv[1];       \
+	Y[L-3] = cf[0]*W[L-3] + cf[1]*Y[L-2] + cf[2]*Y[L-1] + cf[3]*tsv[0];       \
+	for (i=L-4; i>=0; i--)                                                    \
+		Y[i] = cf[0]*W[i] + cf[1]*Y[i+1] + cf[2]*Y[i+2] + cf[3]*Y[i+3];       \
 }
 
 	// intermediate buffers
diff --git a/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c b/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
index 166eae9d1bc..17038fd6780 100644
--- a/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
+++ b/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
@@ -43,43 +43,47 @@ static bNodeSocketTemplate cmp_node_bilateralblur_out[]= {
 	{ -1, 0, "" } 
 };
 
-#define INIT_C3\
-	mean0 = 1; mean1[0] = src[0];mean1[1] = src[1];mean1[2] = src[2];mean1[3] = src[3];
+#define INIT_C3                                                               \
+	mean0 = 1;                                                                \
+	mean1[0] = src[0];                                                        \
+	mean1[1] = src[1];                                                        \
+	mean1[2] = src[2];                                                        \
+	mean1[3] = src[3];
 
 /* finds color distances */
-#define COLOR_DISTANCE_C3(c1, c2)\
-	((c1[0] - c2[0])*(c1[0] - c2[0]) + \
-	(c1[1] - c2[1])*(c1[1] - c2[1]) + \
-	(c1[2] - c2[2])*(c1[2] - c2[2]) + \
-	(c1[3] - c2[3])*(c1[3] - c2[3]))
+#define COLOR_DISTANCE_C3(c1, c2)                                             \
+	((c1[0] - c2[0])*(c1[0] - c2[0]) +                                        \
+	 (c1[1] - c2[1])*(c1[1] - c2[1]) +                                        \
+	 (c1[2] - c2[2])*(c1[2] - c2[2]) +                                        \
+	 (c1[3] - c2[3])*(c1[3] - c2[3]))
 
 /* this is the main kernel function for comparing color distances
  and adding them weighted to the final color */
-#define KERNEL_ELEMENT_C3(k)\
-	temp_color = src + deltas[k];\
-	ref_color = ref + deltas[k];\
-	w = weight_tab[k] + COLOR_DISTANCE_C3(ref, ref_color )*i2sigma_color;\
-	w = 1./(w*w + 1); \
-	mean0 += w;\
-	mean1[0] += temp_color[0]*w; \
-	mean1[1] += temp_color[1]*w; \
-	mean1[2] += temp_color[2]*w; \
+#define KERNEL_ELEMENT_C3(k)                                                  \
+	temp_color = src + deltas[k];                                             \
+	ref_color = ref + deltas[k];                                              \
+	w = weight_tab[k] + COLOR_DISTANCE_C3(ref, ref_color )*i2sigma_color;     \
+	w = 1.0/(w*w + 1);                                                        \
+	mean0 += w;                                                               \
+	mean1[0] += temp_color[0]*w;                                              \
+	mean1[1] += temp_color[1]*w;                                              \
+	mean1[2] += temp_color[2]*w;                                              \
 	mean1[3] += temp_color[3]*w;
 
 /* write blurred values to image */
-#define UPDATE_OUTPUT_C3\
-	mean0 = 1./mean0;\
-	dest[x*pix + 0] = mean1[0]*mean0; \
-	dest[x*pix + 1] = mean1[1]*mean0; \
-	dest[x*pix + 2] = mean1[2]*mean0; \
+#define UPDATE_OUTPUT_C3                                                      \
+	mean0 = 1.0/mean0;                                                        \
+	dest[x*pix + 0] = mean1[0]*mean0;                                         \
+	dest[x*pix + 1] = mean1[1]*mean0;                                         \
+	dest[x*pix + 2] = mean1[2]*mean0;                                         \
 	dest[x*pix + 3] = mean1[3]*mean0;
 
 /* initializes deltas for fast access to neighbour pixels */
-#define INIT_3X3_DELTAS( deltas, step, nch )            \
-	((deltas)[0] =  (nch),  (deltas)[1] = -(step) + (nch),  \
-	(deltas)[2] = -(step), (deltas)[3] = -(step) - (nch),  \
-	(deltas)[4] = -(nch),  (deltas)[5] =  (step) - (nch),  \
-	(deltas)[6] =  (step), (deltas)[7] =  (step) + (nch));
+#define INIT_3X3_DELTAS( deltas, step, nch )                                  \
+	((deltas)[0] =  (nch),  (deltas)[1] = -(step) + (nch),                    \
+	 (deltas)[2] = -(step), (deltas)[3] = -(step) - (nch),                    \
+	 (deltas)[4] = -(nch),  (deltas)[5] =  (step) - (nch),                    \
+	 (deltas)[6] =  (step), (deltas)[7] =  (step) + (nch));
 
 
 /* code of this node was heavily inspired by the smooth function of opencv library.