| 66 |
|
quiterr(errmsg); |
| 67 |
|
} |
| 68 |
|
/* put header */ |
| 69 |
< |
printargs(argc, argv, rafp); |
| 69 |
> |
printargs(i, argv, rafp); |
| 70 |
|
putc('\n', rafp); |
| 71 |
< |
fprintf(rafp, "-Y %d +X %d\n", ymax, xmax); |
| 71 |
> |
fputresolu(YMAJOR|YDECR, xmax, ymax, rafp); |
| 72 |
|
/* convert file */ |
| 73 |
|
bn2ra(); |
| 74 |
|
} else { |
| 83 |
|
} |
| 84 |
|
/* get header */ |
| 85 |
|
getheader(rafp, NULL); |
| 86 |
< |
if (fscanf(rafp, "-Y %d +X %d\n", &ymax, &xmax) != 2) |
| 86 |
> |
if (fgetresolu(&xmax, &ymax, rafp) != (YMAJOR|YDECR)) |
| 87 |
|
quiterr("bad RADIANCE format"); |
| 88 |
|
if (openbarney(argv[i+1], "w") < 0) { |
| 89 |
|
sprintf(errmsg, "cannot open output \"%s\"", argv[i+1]); |
| 167 |
|
{ |
| 168 |
|
unsigned char gmap[1024]; |
| 169 |
|
register int i,k,c; |
| 170 |
< |
register COLOR *inline; |
| 170 |
> |
register COLOR *inl; |
| 171 |
|
int j; |
| 172 |
|
|
| 173 |
< |
if ((inline = (COLOR *)malloc(xmax*sizeof(COLOR))) == NULL) |
| 173 |
> |
if ((inl = (COLOR *)malloc(xmax*sizeof(COLOR))) == NULL) |
| 174 |
|
quiterr("out of memory"); |
| 175 |
|
for (i = 0; i < 1024; i++) |
| 176 |
|
gmap[i] = 256.*pow((i+.5)/1024., 1./gamma); |
| 177 |
|
for (j = 0; j < ymax; j++) { |
| 178 |
< |
if (freadscan(inline, xmax, rafp) < 0) |
| 178 |
> |
if (freadscan(inl, xmax, rafp) < 0) |
| 179 |
|
quiterr("error reading RADIANCE file"); |
| 180 |
|
for (i = 0; i < xmax; i++) |
| 181 |
|
for (k = 0; k < 3; k++) { |
| 182 |
< |
c = 1024.*colval(inline[i],k); |
| 182 |
> |
c = 1024.*colval(inl[i],k); |
| 183 |
|
if (c >= 1024) |
| 184 |
|
c = 1023; |
| 185 |
|
putc(gmap[c], bnfp[k]); |
| 186 |
|
} |
| 187 |
|
} |
| 188 |
< |
free((char *)inline); |
| 188 |
> |
free((char *)inl); |
| 189 |
|
} |
| 190 |
|
|
| 191 |
|
|
