30 |
|
headline(char *s, void *p) |
31 |
|
{ |
32 |
|
NORMCODEC *ncp = (NORMCODEC *)p; |
33 |
+ |
int rv; |
34 |
|
|
35 |
|
if (formatval(ncp->inpfmt, s)) /* don't pass format */ |
36 |
|
return 0; |
37 |
|
|
38 |
+ |
if ((rv = isbigendian(s)) >= 0) { |
39 |
+ |
ncp->swapped = (nativebigendian() != rv); |
40 |
+ |
return 0; |
41 |
+ |
} |
42 |
|
if (ncp->hdrflags & HF_HEADOUT) |
43 |
|
fputs(s, stdout); /* copy to standard output */ |
44 |
|
return 1; |
57 |
|
} |
58 |
|
return 0; |
59 |
|
} |
60 |
+ |
/* get resolution string? */ |
61 |
+ |
if (ncp->hdrflags & HF_RESIN && !fgetsresolu(&ncp->res, ncp->finp)) { |
62 |
+ |
if (ncp->hdrflags & HF_STDERR) { |
63 |
+ |
fputs(ncp->inpname, stderr); |
64 |
+ |
fputs(": bad resolution string\n", stderr); |
65 |
+ |
} |
66 |
+ |
return 0; |
67 |
+ |
} |
68 |
|
if (ncp->hdrflags & HF_HEADOUT) { /* finish header */ |
69 |
|
if (!(ncp->hdrflags & HF_HEADIN)) |
70 |
|
newheader("RADIANCE", stdout); |
72 |
|
printargs(ac, av, stdout); |
73 |
|
if (ncp->hdrflags & HF_ENCODE) { |
74 |
|
fputformat(NORMAL32FMT, stdout); |
75 |
< |
} else |
75 |
> |
} else { |
76 |
> |
fputs("NCOMP=3\n", stdout); |
77 |
> |
if ((ncp->hdrflags & (HF_RESIN|HF_RESOUT)) == HF_RESIN) |
78 |
> |
printf("NCOLS=%d\nNROWS=%d\n", |
79 |
> |
scanlen(&ncp->res), |
80 |
> |
numscans(&ncp->res)); |
81 |
|
switch (ncp->format) { |
82 |
|
case 'a': |
83 |
|
fputformat("ascii", stdout); |
84 |
|
break; |
85 |
|
case 'f': |
86 |
+ |
fputendian(stdout); |
87 |
|
fputformat("float", stdout); |
88 |
|
break; |
89 |
|
case 'd': |
90 |
+ |
fputendian(stdout); |
91 |
|
fputformat("double", stdout); |
92 |
|
break; |
93 |
|
} |
94 |
+ |
} |
95 |
|
fputc('\n', stdout); |
96 |
|
} |
97 |
< |
/* get/put resolution string */ |
77 |
< |
if (ncp->hdrflags & HF_RESIN && !fgetsresolu(&ncp->res, ncp->finp)) { |
78 |
< |
if (ncp->hdrflags & HF_STDERR) { |
79 |
< |
fputs(ncp->inpname, stderr); |
80 |
< |
fputs(": bad resolution string\n", stderr); |
81 |
< |
} |
82 |
< |
return 0; |
83 |
< |
} |
84 |
< |
if (ncp->hdrflags & HF_RESOUT) |
97 |
> |
if (ncp->hdrflags & HF_RESOUT) /* put resolution string? */ |
98 |
|
fputsresolu(&ncp->res, stdout); |
99 |
|
|
100 |
|
ncp->dstart = ncp->curpos = ftell(ncp->finp); |
130 |
|
int |
131 |
|
decode_normal_next(FVECT nrm, NORMCODEC *ncp) |
132 |
|
{ |
133 |
< |
int32 c = getint(4, ncp->finp); |
133 |
> |
static int32 lastc; |
134 |
> |
static FVECT lastv; |
135 |
> |
int32 c = getint(4, ncp->finp); |
136 |
|
|
137 |
|
if (c == EOF && feof(ncp->finp)) |
138 |
|
return -1; |
139 |
|
|
140 |
|
ncp->curpos += 4; |
141 |
|
|
142 |
< |
decodedir(nrm, c); |
143 |
< |
|
142 |
> |
if (c == lastc) { /* optimization */ |
143 |
> |
VCOPY(nrm, lastv); |
144 |
> |
} else { |
145 |
> |
decodedir(nrm, c); |
146 |
> |
if (c) { |
147 |
> |
lastc = c; |
148 |
> |
VCOPY(lastv, nrm); |
149 |
> |
} |
150 |
> |
} |
151 |
|
return (c != 0); |
152 |
|
} |
153 |
|
|