--- ray/src/gen/gendaymtx.c 2014/06/17 21:01:21 2.16 +++ ray/src/gen/gendaymtx.c 2015/09/02 22:52:04 2.21 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: gendaymtx.c,v 2.16 2014/06/17 21:01:21 greg Exp $"; +static const char RCSid[] = "$Id: gendaymtx.c,v 2.21 2015/09/02 22:52:04 greg Exp $"; #endif /* * gendaymtx.c @@ -86,8 +86,10 @@ static const char RCSid[] = "$Id: gendaymtx.c,v 2.16 2 #include #include #include "rtmath.h" +#include "resolu.h" #include "platform.h" #include "color.h" +#include "resolu.h" char *progname; /* Program name */ char errmsg[128]; /* Error message buffer */ @@ -392,7 +394,13 @@ main(int argc, char *argv[]) break; case '5': /* 5-phase calculation */ nsuns = 1; - fixed_sun_sa = 6.797e-05; + fixed_sun_sa = PI/360.*atof(argv[++i]); + if (fixed_sun_sa <= 0) { + fprintf(stderr, "%s: missing solar disk size argument for '-5' option\n", + argv[0]); + exit(1); + } + fixed_sun_sa *= fixed_sun_sa*PI; break; default: goto userr; @@ -519,7 +527,7 @@ main(int argc, char *argv[]) printf("NROWS=%d\n", nskypatch); printf("NCOLS=%d\n", ntsteps); printf("NCOMP=3\n"); - fputformat(getfmtname(outfmt), stdout); + fputformat((char *)getfmtname(outfmt), stdout); putchar('\n'); } /* patches are rows (outer sort) */