star-sf

commit 84641d349e1251e1ff0ba9b89bffdf7ed42e298a
parent e7d8ae9ccff234538fd7b8f8de1637bb95798a69
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Mon,  4 Sep 2017 09:39:19 +0200

Fix GCC warnings and coding style

Diffstat:
M
src/test_ssf_thin_specular_dielectric.c
 | 
16
++++++++--------

1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/test_ssf_thin_specular_dielectric.c b/src/test_ssf_thin_specular_dielectric.c
@@ -129,22 +129,22 @@ main(int argc, char** argv)
     R = ssf_bxdf_sample(bsdf, rng, wo, N, wi, &type, &pdf);
     if (type & SSF_TRANSMISSION) {
       ST += R; ST2 += R*R;
-    }
-    else {
+    } else {
       SR += R; SR2 += R*R;
     }
   }
 
-#define MEAN(x, n) ((x) / (n))
-#define VAR(x, x2, n) (MEAN((x2), (n)) - MEAN((x), (n))*MEAN((x), (n)))
-#define STD(x, x2, n) (VAR((x), (x2), (n)) > 0 ? sqrt(VAR((x), (x2), (n)) / (n)) : 0)
+  #define MEAN(x, n) ((x) / (double)(n))
+  #define VAR(x, x2, n) (MEAN((x2), (n)) - MEAN((x), (n))*MEAN((x), (n)))
+  #define STD(x, x2, n) \
+    (VAR((x), (x2), (n)) > 0 ? sqrt(VAR((x), (x2), (n)) / (double)(n)) : 0)
   /* Check conservation of energy */
   CHECK(MEAN(SR+ST, NSTEPS), 1);
   /* Check T VS R proportion */
   CHECK(eq_eps(MEAN(SR, NSTEPS), 0.0540540540, 3 * STD(SR,SR2,NSTEPS)), 1);
-#undef MEAN
-#undef VAR
-#undef STD
+  #undef MEAN
+  #undef VAR
+  #undef STD
 
   wo[0] = ssp_rng_uniform_double(rng, -1, 1);
   wo[1] = ssp_rng_uniform_double(rng, -1, 1);