313 |
|
case 'c': /* output spectral results */ |
314 |
|
if (argv[i][2] != 'o') |
315 |
|
goto badopt; |
316 |
< |
rval = (out_prims == NULL); |
316 |
> |
rval = (out_prims == NULL) & (sens_curve == NULL); |
317 |
|
check_bool(3,rval); |
318 |
< |
if (rval) out_prims = NULL; |
319 |
< |
else if (out_prims == NULL) out_prims = stdprims; |
318 |
> |
if (rval) { |
319 |
> |
out_prims = NULL; |
320 |
> |
sens_curve = NULL; |
321 |
> |
} else if (out_prims == NULL) |
322 |
> |
out_prims = stdprims; |
323 |
|
break; |
324 |
|
#endif |
325 |
|
#ifdef PERSIST |
568 |
|
{ |
569 |
|
char *cp; |
570 |
|
|
571 |
+ |
printf(erract[WARNING].pf != NULL ? |
572 |
+ |
"-w+\t\t\t\t# warning messages on\n" : |
573 |
+ |
"-w-\t\t\t\t# warning messages off\n"); |
574 |
|
if (imm_irrad) |
575 |
|
printf("-I+\t\t\t\t# immediate irradiance on\n"); |
576 |
|
printf("-n %-2d\t\t\t\t# number of rendering processes\n", nproc); |
608 |
|
case '~': printf(" tilde"); break; |
609 |
|
} |
610 |
|
fputc('\n', stdout); |
605 |
– |
if (NCSAMP > 3) |
606 |
– |
printf(out_prims != NULL ? "-co-\t\t\t\t# output tristimulus colors\n" : |
607 |
– |
"-co+\t\t\t\t# output spectral values\n"); |
611 |
|
if (sens_curve == scolor_photopic) |
612 |
|
printf("-pY\t\t\t\t# photopic output\n"); |
613 |
|
else if (sens_curve == scolor_scotopic) |
624 |
|
out_prims[GRN][0], out_prims[GRN][1], |
625 |
|
out_prims[BLU][0], out_prims[BLU][1], |
626 |
|
out_prims[WHT][0], out_prims[WHT][1]); |
627 |
< |
printf(erract[WARNING].pf != NULL ? |
628 |
< |
"-w+\t\t\t\t# warning messages on\n" : |
629 |
< |
"-w-\t\t\t\t# warning messages off\n"); |
627 |
> |
if (NCSAMP > 3) |
628 |
> |
printf(out_prims != NULL ? "-co-\t\t\t\t# output tristimulus colors\n" : |
629 |
> |
"-co+\t\t\t\t# output spectral values\n"); |
630 |
|
print_rdefaults(); |
631 |
|
} |