From 0559d06f61cd3f30b5925fe062654eca83eb6dd6 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Fri, 11 Jun 2010 15:42:45 -0700 Subject: Tidy up switch statements --- src/render_hkl.c | 61 +++++++++++++++++++++++--------------------------------- 1 file changed, 25 insertions(+), 36 deletions(-) (limited to 'src/render_hkl.c') diff --git a/src/render_hkl.c b/src/render_hkl.c index e18ae90d..4e17e307 100644 --- a/src/render_hkl.c +++ b/src/render_hkl.c @@ -330,34 +330,27 @@ static void povray_render_animation(UnitCell *cell, double *ref, s = 6; } switch ( s ) { - case 0 : { /* Black to blue */ - r = 0.0; g = 0.0; b = p; - break; - } - case 1 : { /* Blue to green */ - r = 0.0; g = p; b = 1.0-p; - break; - } - case 2 : { /* Green to red */ - r =p; g = 1.0-p; b = 0.0; - break; - } - case 3 : { /* Red to Orange */ - r = 1.0; g = 0.5*p; b = 0.0; - break; - } - case 4 : { /* Orange to Yellow */ - r = 1.0; g = 0.5 + 0.5*p; b = 0.0; - break; - } - case 5 : { /* Yellow to White */ - r = 1.0; g = 1.0; b = 1.0*p; - break; - } - case 6 : { /* Pixel has hit the maximum value */ - r = 1.0; g = 1.0; b = 1.0; - break; - } + case 0 : /* Black to blue */ + r = 0.0; g = 0.0; b = p; + break; + case 1 : /* Blue to green */ + r = 0.0; g = p; b = 1.0-p; + break; + case 2 : /* Green to red */ + r =p; g = 1.0-p; b = 0.0; + break; + case 3 : /* Red to Orange */ + r = 1.0; g = 0.5*p; b = 0.0; + break; + case 4 : /* Orange to Yellow */ + r = 1.0; g = 0.5 + 0.5*p; b = 0.0; + break; + case 5 : /* Yellow to White */ + r = 1.0; g = 1.0; b = 1.0*p; + break; + case 6 : /* Pixel has hit the maximum value */ + r = 1.0; g = 1.0; b = 1.0; + break; } val = max-val; @@ -448,24 +441,20 @@ int main(int argc, char *argv[]) while ((c = getopt_long(argc, argv, "hj:", longopts, NULL)) != -1) { switch (c) { - case 'h' : { + case 'h' : show_help(argv[0]); return 0; - } - case 'j' : { + case 'j' : nproc = atoi(optarg); break; - } - case 0 : { + case 0 : break; - } - default : { + default : return 1; } - } } -- cgit v1.2.3