56 |
|
pixaspect = atof(argv[++i]); |
57 |
|
else if (argv[i][2] == 'e') { |
58 |
|
expval = atof(argv[++i]); |
59 |
< |
if (argv[i][0] == '-' | argv[i][0] == '+') |
59 |
> |
if ((argv[i][0] == '-') | (argv[i][0] == '+')) |
60 |
|
expval = pow(2., expval); |
61 |
|
} else |
62 |
|
goto userr; |
212 |
|
fputs(VIEWSTR, stdout); |
213 |
|
fprintview(&myview, stdout); |
214 |
|
fputc('\n', stdout); |
215 |
< |
if (pa < 0.99 | pa > 1.01) |
215 |
> |
if ((pa < 0.99) | (pa > 1.01)) |
216 |
|
fputaspect(pa, stdout); |
217 |
< |
if (expval < 0.99 | expval > 1.01) |
217 |
> |
if ((expval < 0.99) | (expval > 1.01)) |
218 |
|
fputexpos(expval, stdout); |
219 |
|
fputformat(COLRFMT, stdout); |
220 |
|
fputc('\n', stdout); |
237 |
|
/* compute final pixel values */ |
238 |
|
for (p = hres*vres; p--; ) { |
239 |
|
if (myweight[p] <= FTINY) { |
240 |
< |
if (lastr >= 0) |
240 |
> |
if (lastr >= 0) { |
241 |
|
if (p/hres == lastp/hres) |
242 |
|
copycolor(mypixel[p], mypixel[lastp]); |
243 |
|
else |
244 |
|
copycolor(mypixel[p], mypixel[lastrp]); |
245 |
+ |
} |
246 |
|
nunrend++; |
247 |
|
continue; |
248 |
|
} |
292 |
|
mypixel = (COLOR *)bmalloc(xres*yres*sizeof(COLOR)); |
293 |
|
myweight = (float *)bmalloc(xres*yres*sizeof(float)); |
294 |
|
mydepth = (float *)bmalloc(xres*yres*sizeof(float)); |
295 |
< |
if (mypixel == NULL | myweight == NULL | mydepth == NULL) |
295 |
> |
if ((mypixel == NULL) | (myweight == NULL) | (mydepth == NULL)) |
296 |
|
error(SYSTEM, "out of memory in initialize"); |
297 |
|
} |
298 |
|
|