| 21 |
|
int findframe = 0; /* find a specific frame? */ |
| 22 |
|
int frameno = 0; /* current frame number */ |
| 23 |
|
int fmterr = 0; /* got input format error */ |
| 24 |
< |
char *headlines; /* current header info. */ |
| 25 |
< |
int headlen; /* current header length */ |
| 24 |
> |
char *headlines = NULL; /* current header info. */ |
| 25 |
> |
int headlen1 = 0; /* length of initial frame header */ |
| 26 |
> |
int headlen = 0; /* current header length */ |
| 27 |
> |
char fmt[MAXFMTLEN]; /* input format */ |
| 28 |
|
|
| 29 |
|
char *progname; |
| 30 |
|
|
| 152 |
|
} |
| 153 |
|
} |
| 154 |
|
SET_FILE_BINARY(fp); |
| 155 |
< |
dumpheader(fp); /* put out header */ |
| 155 |
> |
newheader("RADIANCE", fp); /* put out header */ |
| 156 |
> |
dumpheader(fp); |
| 157 |
|
fputs(progname, fp); |
| 158 |
|
if (bradj) |
| 159 |
|
fprintf(fp, " -e %+d", bradj); |
| 162 |
|
fputc('\n', fp); |
| 163 |
|
if (bradj) |
| 164 |
|
fputexpos(pow(2.0, (double)bradj), fp); |
| 165 |
+ |
if (frameno) |
| 166 |
+ |
fprintf(fp, "FRAME=%d\n", frameno); |
| 167 |
+ |
if (fmt[0]) |
| 168 |
+ |
fputformat(fmt, fp); |
| 169 |
|
fputc('\n', fp); |
| 170 |
|
fputresolu(order, xmax, ymax, fp); |
| 171 |
|
/* transfer picture */ |
| 177 |
|
} |
| 178 |
|
if (bradj) |
| 179 |
|
shiftcolrs(scanin, xmax, bradj); |
| 180 |
< |
if (doflat) |
| 181 |
< |
putbinary((char *)scanin, sizeof(COLR), xmax, fp); |
| 182 |
< |
else |
| 176 |
< |
fwritecolrs(scanin, xmax, fp); |
| 177 |
< |
if (ferror(fp)) { |
| 178 |
< |
fprintf(stderr, "%s: error writing output to \"%s\"\n", |
| 179 |
< |
progname, oname); |
| 180 |
< |
exit(1); |
| 181 |
< |
} |
| 180 |
> |
if (doflat ? (putbinary(scanin, sizeof(COLR), xmax, fp) != xmax) : |
| 181 |
> |
(fwritecolrs(scanin, xmax, fp) < 0)) |
| 182 |
> |
goto writerr; |
| 183 |
|
} |
| 184 |
< |
/* clean up */ |
| 184 |
> |
if (fflush(fp) == EOF) /* clean up */ |
| 185 |
> |
goto writerr; |
| 186 |
|
if (oname[0] == '!') |
| 187 |
|
pclose(fp); |
| 188 |
|
else if (ospec != NULL) |
| 189 |
|
fclose(fp); |
| 190 |
|
return(1); |
| 191 |
+ |
writerr: |
| 192 |
+ |
fprintf(stderr, "%s: error writing output to \"%s\"\n", |
| 193 |
+ |
progname, oname); |
| 194 |
+ |
exit(1); |
| 195 |
|
} |
| 196 |
|
|
| 197 |
|
|
| 201 |
|
void *p |
| 202 |
|
) |
| 203 |
|
{ |
| 198 |
– |
char fmt[MAXFMTLEN]; |
| 204 |
|
int n; |
| 205 |
|
|
| 206 |
< |
if (formatval(fmt, s)) |
| 207 |
< |
fmterr += !globmatch(PICFMT, fmt); |
| 208 |
< |
else if (!strncmp(s, "FRAME=", 6)) |
| 206 |
> |
if (isheadid(s)) |
| 207 |
> |
return(0); |
| 208 |
> |
if (!strncmp(s, "FRAME=", 6)) { |
| 209 |
|
frameno = atoi(s+6); |
| 210 |
+ |
return(0); |
| 211 |
+ |
} |
| 212 |
+ |
if (formatval(fmt, s)) { |
| 213 |
+ |
fmterr += !globmatch(PICFMT, fmt); |
| 214 |
+ |
return(0); |
| 215 |
+ |
} |
| 216 |
|
n = strlen(s); |
| 217 |
|
if (headlen) |
| 218 |
|
headlines = (char *)realloc((void *)headlines, headlen+n+1); |
| 234 |
|
) |
| 235 |
|
{ |
| 236 |
|
fmterr = 0; frameno = 0; |
| 237 |
< |
if (headlen) { /* free old header */ |
| 238 |
< |
free(headlines); |
| 239 |
< |
headlen = 0; |
| 240 |
< |
} |
| 237 |
> |
/* revert to initial header length */ |
| 238 |
> |
if (!headlen1) headlen1 = headlen; |
| 239 |
> |
else headlen = headlen1; |
| 240 |
> |
|
| 241 |
|
if (getheader(fp, addhline, NULL) < 0) |
| 242 |
|
return(0); |
| 243 |
|
if (fmterr) |
