| 38 |
|
0 |
| 39 |
|
}; |
| 40 |
|
|
| 41 |
< |
extern FILE *openpicture(); |
| 41 |
> |
typedef struct { |
| 42 |
> |
FILE *fp; /* file pointer */ |
| 43 |
> |
char fmt[32]; /* picture format */ |
| 44 |
> |
double pa; /* pixel aspect ratio */ |
| 45 |
> |
RESOLU rs; /* picture resolution */ |
| 46 |
> |
} PICTURE; |
| 47 |
|
|
| 48 |
+ |
extern PICTURE *openpicture(); |
| 49 |
|
|
| 50 |
+ |
#define closepicture(p) (fclose((p)->fp),free((char *)(p))) |
| 51 |
+ |
|
| 52 |
+ |
|
| 53 |
|
main(argc, argv) |
| 54 |
|
int argc; |
| 55 |
|
char *argv[]; |
| 56 |
|
{ |
| 57 |
< |
FILE *fin = NULL; |
| 57 |
> |
PICTURE *pin = NULL; |
| 58 |
|
TIFF *tin = NULL; |
| 59 |
|
int i, rval; |
| 60 |
|
|
| 103 |
|
goto userr; |
| 104 |
|
} |
| 105 |
|
if (argc-i < 2) goto userr; |
| 106 |
< |
if ((fin = openpicture(argv[i])) == NULL && |
| 106 |
> |
if ((pin = openpicture(argv[i])) == NULL && |
| 107 |
|
(tin = TIFFOpen(argv[i], "r")) == NULL) { |
| 108 |
|
fprintf(stderr, "%s: cannot open or interpret file \"%s\"\n", |
| 109 |
|
argv[0], argv[i]); |
| 114 |
|
argv[0], argv[i+1]); |
| 115 |
|
exit(1); |
| 116 |
|
} |
| 117 |
< |
if (fin != NULL) { |
| 118 |
< |
rval = tmap_picture(argv[i], fin); |
| 119 |
< |
fclose(fin); |
| 117 |
> |
if (pin != NULL) { |
| 118 |
> |
rval = tmap_picture(argv[i], pin); |
| 119 |
> |
closepicture(pin); |
| 120 |
|
} else { |
| 121 |
|
rval = tmap_tiff(argv[i], tin); |
| 122 |
|
TIFFClose(tin); |
| 131 |
|
} |
| 132 |
|
|
| 133 |
|
|
| 134 |
< |
FILE * |
| 134 |
> |
int |
| 135 |
> |
headline(s, pp) /* process line from header */ |
| 136 |
> |
char *s; |
| 137 |
> |
register PICTURE *pp; |
| 138 |
> |
{ |
| 139 |
> |
register char *cp; |
| 140 |
> |
|
| 141 |
> |
for (cp = s; *cp; cp++) |
| 142 |
> |
if (*cp & 0x80) |
| 143 |
> |
return(-1); /* non-ascii in header */ |
| 144 |
> |
if (isaspect(s)) |
| 145 |
> |
pp->pa *= aspectval(s); |
| 146 |
> |
else |
| 147 |
> |
formatval(pp->fmt, s); |
| 148 |
> |
return(0); |
| 149 |
> |
} |
| 150 |
> |
|
| 151 |
> |
|
| 152 |
> |
PICTURE * |
| 153 |
|
openpicture(fname) /* open/check Radiance picture file */ |
| 154 |
|
char *fname; |
| 155 |
|
{ |
| 156 |
|
FILE *fp; |
| 157 |
< |
char inpfmt[32]; |
| 131 |
< |
int xsiz, ysiz; |
| 157 |
> |
register PICTURE *pp; |
| 158 |
|
register char *cp; |
| 159 |
|
/* check filename suffix */ |
| 160 |
|
if (fname == NULL) return(NULL); |
| 170 |
|
/* else try opening it */ |
| 171 |
|
if ((fp = fopen(fname, "r")) == NULL) |
| 172 |
|
return(NULL); |
| 173 |
< |
/* check format */ |
| 174 |
< |
strcpy(inpfmt, PICFMT); |
| 175 |
< |
if (checkheader(fp, inpfmt, NULL) < 0 || |
| 176 |
< |
fgetresolu(&xsiz, &ysiz, fp) < 0) { |
| 177 |
< |
fclose(fp); /* failed test -- close file */ |
| 173 |
> |
/* allocate struct */ |
| 174 |
> |
if ((pp = (PICTURE *)malloc(sizeof(PICTURE))) == NULL) |
| 175 |
> |
return(NULL); /* serious error -- should exit? */ |
| 176 |
> |
pp->fp = fp; pp->fmt[0] = '\0'; pp->pa = 1.; |
| 177 |
> |
/* load header */ |
| 178 |
> |
if (getheader(fp, headline, pp) < 0) { |
| 179 |
> |
closepicture(pp); |
| 180 |
|
return(NULL); |
| 181 |
|
} |
| 182 |
+ |
if (!pp->fmt[0]) /* assume RGBE if unspecified */ |
| 183 |
+ |
strcpy(pp->fmt, COLRFMT); |
| 184 |
+ |
if (!globmatch(PICFMT, pp->fmt) || !fgetsresolu(&pp->rs, fp)) { |
| 185 |
+ |
closepicture(pp); /* failed test -- close file */ |
| 186 |
+ |
return(NULL); |
| 187 |
+ |
} |
| 188 |
|
rewind(fp); /* passed test -- rewind file */ |
| 189 |
< |
return(fp); |
| 189 |
> |
return(pp); |
| 190 |
|
} |
| 191 |
|
|
| 192 |
|
|
| 159 |
– |
getpixrat(s, pr) /* get pixel aspect ratio */ |
| 160 |
– |
char *s; |
| 161 |
– |
double *pr; |
| 162 |
– |
{ |
| 163 |
– |
if (isaspect(s)) |
| 164 |
– |
*pr *= aspectval(s); |
| 165 |
– |
} |
| 166 |
– |
|
| 167 |
– |
|
| 193 |
|
int |
| 194 |
< |
tmap_picture(fname, fp) /* tone map Radiance picture */ |
| 194 |
> |
tmap_picture(fname, pp) /* tone map Radiance picture */ |
| 195 |
|
char *fname; |
| 196 |
< |
FILE *fp; |
| 196 |
> |
register PICTURE *pp; |
| 197 |
|
{ |
| 173 |
– |
double pixrat; |
| 174 |
– |
int ord; |
| 198 |
|
uint16 orient; |
| 199 |
|
int xsiz, ysiz; |
| 200 |
|
BYTE *pix; |
| 201 |
|
/* read and tone map picture */ |
| 202 |
|
if (tmMapPicture(&pix, &xsiz, &ysiz, flags, |
| 203 |
< |
rgbp, gamv, lddyn, ldmax, fname, fp) != TM_E_OK) |
| 203 |
> |
rgbp, gamv, lddyn, ldmax, fname, pp->fp) != TM_E_OK) |
| 204 |
|
return(-1); |
| 205 |
< |
/* get relevant header info. */ |
| 206 |
< |
rewind(fp); |
| 207 |
< |
pixrat = 1.; |
| 208 |
< |
getheader(fp, getpixrat, &pixrat); |
| 186 |
< |
if ((ord = fgetresolu(&xsiz, &ysiz, fp)) < 0) |
| 187 |
< |
orient = 0; |
| 188 |
< |
else |
| 189 |
< |
for (orient = 8; --orient; ) |
| 190 |
< |
if (ortab[orient] == ord) |
| 191 |
< |
break; |
| 205 |
> |
/* figure out TIFF orientation */ |
| 206 |
> |
for (orient = 8; --orient; ) |
| 207 |
> |
if (ortab[orient] == pp->rs.or) |
| 208 |
> |
break; |
| 209 |
|
orient++; |
| 210 |
|
/* put out our image */ |
| 211 |
|
if (putimage(orient, (uint32)xsiz, (uint32)ysiz, |
| 212 |
< |
72., 72./pixrat, 2, pix) != 0) |
| 212 |
> |
72., 72./pp->pa, 2, pix) != 0) |
| 213 |
|
return(-1); |
| 214 |
|
/* free data and we're done */ |
| 215 |
|
free((char *)pix); |
