75 |
|
} |
76 |
|
if (argv[i][2] != 'f') |
77 |
|
goto userr; |
78 |
< |
rval = viewfile(argv[++i], &ourview, 0, 0); |
78 |
> |
rval = viewfile(argv[++i], &ourview, NULL); |
79 |
|
if (rval < 0) { |
80 |
|
fprintf(stderr, |
81 |
|
"%s: cannot open view file \"%s\"\n", |
105 |
|
combine = !combine; |
106 |
|
break; |
107 |
|
case 'd': |
108 |
+ |
if (argv[i][2] == 'v') { |
109 |
+ |
rtargv[rtargc++] = argv[i]; |
110 |
+ |
break; |
111 |
+ |
} |
112 |
+ |
/* FALL THROUGH */ |
113 |
|
case 'l': |
114 |
|
case 's': |
115 |
+ |
case 'P': |
116 |
|
rtargv[rtargc++] = argv[i]; |
117 |
|
rtargv[rtargc++] = argv[++i]; |
118 |
|
break; |
119 |
+ |
case 'w': |
120 |
+ |
rtargv[rtargc++] = argv[i]; |
121 |
+ |
break; |
122 |
|
case 'a': |
123 |
|
rtargv[rtargc++] = argv[i]; |
124 |
|
if (argv[i][2] == 'v') { |
140 |
|
} |
141 |
|
/* get view */ |
142 |
|
if (picture != NULL) { |
143 |
< |
rval = viewfile(picture, &pictview, 0, 0); |
143 |
> |
rval = viewfile(picture, &pictview, NULL); |
144 |
|
if (rval < 0) { |
145 |
|
fprintf(stderr, "%s: cannot open picture file \"%s\"\n", |
146 |
|
progname, picture); |
315 |
|
if (octree != NULL) |
316 |
|
done_rtrace(); |
317 |
|
if (npixinvw < 100*npixmiss) |
318 |
< |
fprintf(stderr, "%s: warning -- missing %ld%% of samples\n", |
319 |
< |
progname, 100L*npixmiss/npixinvw); |
318 |
> |
fprintf(stderr, "%s: warning -- missing %d%% of samples\n", |
319 |
> |
progname, (int)(100L*npixmiss/npixinvw)); |
320 |
|
} |
321 |
|
|
322 |
|
|
364 |
|
xo = x-hl; |
365 |
|
else |
366 |
|
xo = 0; |
367 |
< |
disc = 1. - (double)(xo*xo + y*y)/(sampdens*sampdens); |
368 |
< |
if (disc <= FTINY) |
367 |
> |
disc = 1. - (double)((long)xo*xo + (long)y*y)/((long)sampdens*sampdens); |
368 |
> |
if (disc <= FTINY*FTINY) |
369 |
|
return(0.); |
370 |
|
return(1./(sampdens*sampdens*sqrt(disc))); |
371 |
|
} |