1 |
– |
/* Copyright (c) 1986 Regents of the University of California */ |
2 |
– |
|
1 |
|
#ifndef lint |
2 |
< |
static char SCCSid[] = "$SunId$ LBL"; |
2 |
> |
static const char RCSid[] = "$Id$"; |
3 |
|
#endif |
6 |
– |
|
4 |
|
/* |
5 |
|
* image.c - routines for image generation. |
6 |
|
* |
7 |
< |
* 10/17/85 |
7 |
> |
* External symbols declared in view.h |
8 |
|
*/ |
9 |
|
|
10 |
< |
#include "standard.h" |
10 |
> |
#include "copyright.h" |
11 |
|
|
12 |
+ |
#include "rtio.h" |
13 |
+ |
#include "paths.h" |
14 |
|
#include "view.h" |
15 |
|
|
16 |
+ |
|
17 |
+ |
#define FEQ(x,y) (fabs((x)-(y)) <= FTINY) |
18 |
+ |
#define VEQ(v,w) (FEQ((v)[0],(w)[0]) && FEQ((v)[1],(w)[1]) \ |
19 |
+ |
&& FEQ((v)[2],(w)[2])) |
20 |
+ |
|
21 |
|
VIEW stdview = STDVIEW; /* default view parameters */ |
22 |
|
|
23 |
+ |
static gethfunc gethview; |
24 |
|
|
25 |
+ |
|
26 |
|
char * |
27 |
|
setview(v) /* set hvec and vvec, return message on error */ |
28 |
|
register VIEW *v; |
30 |
|
static char ill_horiz[] = "illegal horizontal view size"; |
31 |
|
static char ill_vert[] = "illegal vertical view size"; |
32 |
|
|
33 |
+ |
if (v->vaft < -FTINY || (v->vaft > FTINY && v->vaft <= v->vfore)) |
34 |
+ |
return("illegal fore/aft clipping plane"); |
35 |
+ |
|
36 |
|
if (normalize(v->vdir) == 0.0) /* normalize direction */ |
37 |
|
return("zero view direction"); |
38 |
|
|
64 |
|
v->hn2 = 2.0 * tan(v->horiz*(PI/180.0/2.0)); |
65 |
|
v->vn2 = 2.0 * tan(v->vert*(PI/180.0/2.0)); |
66 |
|
break; |
67 |
+ |
case VT_CYL: /* cylindrical panorama */ |
68 |
+ |
if (v->horiz > 360.0+FTINY) |
69 |
+ |
return(ill_horiz); |
70 |
+ |
if (v->vert >= 180.0-FTINY) |
71 |
+ |
return(ill_vert); |
72 |
+ |
v->hn2 = v->horiz * (PI/180.0); |
73 |
+ |
v->vn2 = 2.0 * tan(v->vert*(PI/180.0/2.0)); |
74 |
+ |
break; |
75 |
|
case VT_ANG: /* angular fisheye */ |
76 |
|
if (v->horiz > 360.0+FTINY) |
77 |
|
return(ill_horiz); |
78 |
|
if (v->vert > 360.0+FTINY) |
79 |
|
return(ill_vert); |
80 |
< |
v->hn2 = v->horiz / 90.0; |
81 |
< |
v->vn2 = v->vert / 90.0; |
80 |
> |
v->hn2 = v->horiz * (PI/180.0); |
81 |
> |
v->vn2 = v->vert * (PI/180.0); |
82 |
|
break; |
83 |
|
case VT_HEM: /* hemispherical fisheye */ |
84 |
|
if (v->horiz > 180.0+FTINY) |
92 |
|
return("unknown view type"); |
93 |
|
} |
94 |
|
if (v->type != VT_ANG) { |
95 |
< |
v->hvec[0] *= v->hn2; |
96 |
< |
v->hvec[1] *= v->hn2; |
97 |
< |
v->hvec[2] *= v->hn2; |
95 |
> |
if (v->type != VT_CYL) { |
96 |
> |
v->hvec[0] *= v->hn2; |
97 |
> |
v->hvec[1] *= v->hn2; |
98 |
> |
v->hvec[2] *= v->hn2; |
99 |
> |
} |
100 |
|
v->vvec[0] *= v->vn2; |
101 |
|
v->vvec[1] *= v->vn2; |
102 |
|
v->vvec[2] *= v->vn2; |
108 |
|
} |
109 |
|
|
110 |
|
|
111 |
+ |
void |
112 |
|
normaspect(va, ap, xp, yp) /* fix pixel aspect or resolution */ |
113 |
|
double va; /* view aspect ratio */ |
114 |
|
double *ap; /* pixel aspect in (or out if 0) */ |
123 |
|
} |
124 |
|
|
125 |
|
|
126 |
+ |
double |
127 |
|
viewray(orig, direc, v, x, y) /* compute ray origin and direction */ |
128 |
|
FVECT orig, direc; |
129 |
|
register VIEW *v; |
136 |
|
|
137 |
|
switch(v->type) { |
138 |
|
case VT_PAR: /* parallel view */ |
139 |
< |
orig[0] = v->vp[0] + x*v->hvec[0] + y*v->vvec[0]; |
140 |
< |
orig[1] = v->vp[1] + x*v->hvec[1] + y*v->vvec[1]; |
141 |
< |
orig[2] = v->vp[2] + x*v->hvec[2] + y*v->vvec[2]; |
139 |
> |
orig[0] = v->vp[0] + v->vfore*v->vdir[0] |
140 |
> |
+ x*v->hvec[0] + y*v->vvec[0]; |
141 |
> |
orig[1] = v->vp[1] + v->vfore*v->vdir[1] |
142 |
> |
+ x*v->hvec[1] + y*v->vvec[1]; |
143 |
> |
orig[2] = v->vp[2] + v->vfore*v->vdir[2] |
144 |
> |
+ x*v->hvec[2] + y*v->vvec[2]; |
145 |
|
VCOPY(direc, v->vdir); |
146 |
< |
return(0); |
146 |
> |
return(v->vaft > FTINY ? v->vaft - v->vfore : 0.0); |
147 |
|
case VT_PER: /* perspective view */ |
124 |
– |
VCOPY(orig, v->vp); |
148 |
|
direc[0] = v->vdir[0] + x*v->hvec[0] + y*v->vvec[0]; |
149 |
|
direc[1] = v->vdir[1] + x*v->hvec[1] + y*v->vvec[1]; |
150 |
|
direc[2] = v->vdir[2] + x*v->hvec[2] + y*v->vvec[2]; |
151 |
< |
normalize(direc); |
152 |
< |
return(0); |
151 |
> |
orig[0] = v->vp[0] + v->vfore*direc[0]; |
152 |
> |
orig[1] = v->vp[1] + v->vfore*direc[1]; |
153 |
> |
orig[2] = v->vp[2] + v->vfore*direc[2]; |
154 |
> |
d = normalize(direc); |
155 |
> |
return(v->vaft > FTINY ? (v->vaft - v->vfore)*d : 0.0); |
156 |
|
case VT_HEM: /* hemispherical fisheye */ |
157 |
|
z = 1.0 - x*x*v->hn2 - y*y*v->vn2; |
158 |
|
if (z < 0.0) |
159 |
< |
return(-1); |
159 |
> |
return(-1.0); |
160 |
|
z = sqrt(z); |
135 |
– |
VCOPY(orig, v->vp); |
161 |
|
direc[0] = z*v->vdir[0] + x*v->hvec[0] + y*v->vvec[0]; |
162 |
|
direc[1] = z*v->vdir[1] + x*v->hvec[1] + y*v->vvec[1]; |
163 |
|
direc[2] = z*v->vdir[2] + x*v->hvec[2] + y*v->vvec[2]; |
164 |
< |
return(0); |
164 |
> |
orig[0] = v->vp[0] + v->vfore*direc[0]; |
165 |
> |
orig[1] = v->vp[1] + v->vfore*direc[1]; |
166 |
> |
orig[2] = v->vp[2] + v->vfore*direc[2]; |
167 |
> |
return(v->vaft > FTINY ? v->vaft - v->vfore : 0.0); |
168 |
> |
case VT_CYL: /* cylindrical panorama */ |
169 |
> |
d = x * v->horiz * (PI/180.0); |
170 |
> |
z = cos(d); |
171 |
> |
x = sin(d); |
172 |
> |
direc[0] = z*v->vdir[0] + x*v->hvec[0] + y*v->vvec[0]; |
173 |
> |
direc[1] = z*v->vdir[1] + x*v->hvec[1] + y*v->vvec[1]; |
174 |
> |
direc[2] = z*v->vdir[2] + x*v->hvec[2] + y*v->vvec[2]; |
175 |
> |
orig[0] = v->vp[0] + v->vfore*direc[0]; |
176 |
> |
orig[1] = v->vp[1] + v->vfore*direc[1]; |
177 |
> |
orig[2] = v->vp[2] + v->vfore*direc[2]; |
178 |
> |
d = normalize(direc); |
179 |
> |
return(v->vaft > FTINY ? (v->vaft - v->vfore)*d : 0.0); |
180 |
|
case VT_ANG: /* angular fisheye */ |
181 |
|
x *= v->horiz/180.0; |
182 |
|
y *= v->vert/180.0; |
183 |
|
d = x*x + y*y; |
184 |
|
if (d > 1.0) |
185 |
< |
return(-1); |
146 |
< |
VCOPY(orig, v->vp); |
147 |
< |
if (d <= FTINY) { |
148 |
< |
VCOPY(direc, v->vdir); |
149 |
< |
return(0); |
150 |
< |
} |
185 |
> |
return(-1.0); |
186 |
|
d = sqrt(d); |
187 |
|
z = cos(PI*d); |
188 |
< |
d = sqrt(1 - z*z)/d; |
188 |
> |
d = d <= FTINY ? PI : sqrt(1 - z*z)/d; |
189 |
|
x *= d; |
190 |
|
y *= d; |
191 |
|
direc[0] = z*v->vdir[0] + x*v->hvec[0] + y*v->vvec[0]; |
192 |
|
direc[1] = z*v->vdir[1] + x*v->hvec[1] + y*v->vvec[1]; |
193 |
|
direc[2] = z*v->vdir[2] + x*v->hvec[2] + y*v->vvec[2]; |
194 |
< |
return(0); |
194 |
> |
orig[0] = v->vp[0] + v->vfore*direc[0]; |
195 |
> |
orig[1] = v->vp[1] + v->vfore*direc[1]; |
196 |
> |
orig[2] = v->vp[2] + v->vfore*direc[2]; |
197 |
> |
return(v->vaft > FTINY ? v->vaft - v->vfore : 0.0); |
198 |
|
} |
199 |
< |
return(-1); |
199 |
> |
return(-1.0); |
200 |
|
} |
201 |
|
|
202 |
|
|
203 |
< |
viewpixel(xp, yp, zp, v, p) /* find image location for point */ |
204 |
< |
double *xp, *yp, *zp; |
203 |
> |
void |
204 |
> |
viewloc(ip, v, p) /* find image location for point */ |
205 |
> |
FVECT ip; |
206 |
|
register VIEW *v; |
207 |
|
FVECT p; |
208 |
|
{ |
209 |
< |
double d; |
209 |
> |
double d, d2; |
210 |
|
FVECT disp; |
211 |
|
|
212 |
|
disp[0] = p[0] - v->vp[0]; |
215 |
|
|
216 |
|
switch (v->type) { |
217 |
|
case VT_PAR: /* parallel view */ |
218 |
< |
if (zp != NULL) |
180 |
< |
*zp = DOT(disp,v->vdir); |
218 |
> |
ip[2] = DOT(disp,v->vdir) - v->vfore; |
219 |
|
break; |
220 |
|
case VT_PER: /* perspective view */ |
221 |
|
d = DOT(disp,v->vdir); |
222 |
< |
if (zp != NULL) { |
223 |
< |
*zp = sqrt(DOT(disp,disp)); |
224 |
< |
if (d < 0.0) |
187 |
< |
*zp = -*zp; |
188 |
< |
} |
189 |
< |
if (d < 0.0) /* fold pyramid */ |
222 |
> |
ip[2] = VLEN(disp); |
223 |
> |
if (d < 0.0) { /* fold pyramid */ |
224 |
> |
ip[2] = -ip[2]; |
225 |
|
d = -d; |
226 |
+ |
} |
227 |
|
if (d > FTINY) { |
228 |
|
d = 1.0/d; |
229 |
|
disp[0] *= d; |
230 |
|
disp[1] *= d; |
231 |
|
disp[2] *= d; |
232 |
|
} |
233 |
+ |
ip[2] *= (1.0 - v->vfore*d); |
234 |
|
break; |
235 |
|
case VT_HEM: /* hemispherical fisheye */ |
236 |
|
d = normalize(disp); |
237 |
< |
if (zp != NULL) { |
238 |
< |
if (DOT(disp,v->vdir) < 0.0) |
239 |
< |
*zp = -d; |
240 |
< |
else |
241 |
< |
*zp = d; |
205 |
< |
} |
237 |
> |
if (DOT(disp,v->vdir) < 0.0) |
238 |
> |
ip[2] = -d; |
239 |
> |
else |
240 |
> |
ip[2] = d; |
241 |
> |
ip[2] -= v->vfore; |
242 |
|
break; |
243 |
+ |
case VT_CYL: /* cylindrical panorama */ |
244 |
+ |
d = DOT(disp,v->hvec); |
245 |
+ |
d2 = DOT(disp,v->vdir); |
246 |
+ |
ip[0] = 180.0/PI * atan2(d,d2) / v->horiz + 0.5 - v->hoff; |
247 |
+ |
d = 1.0/sqrt(d*d + d2*d2); |
248 |
+ |
ip[1] = DOT(disp,v->vvec)*d/v->vn2 + 0.5 - v->voff; |
249 |
+ |
ip[2] = VLEN(disp); |
250 |
+ |
ip[2] *= (1.0 - v->vfore*d); |
251 |
+ |
return; |
252 |
|
case VT_ANG: /* angular fisheye */ |
253 |
< |
d = normalize(disp); |
254 |
< |
if (zp != NULL) |
255 |
< |
*zp = d; |
211 |
< |
*xp = 0.5 - v->hoff; |
212 |
< |
*yp = 0.5 - v->voff; |
253 |
> |
ip[0] = 0.5 - v->hoff; |
254 |
> |
ip[1] = 0.5 - v->voff; |
255 |
> |
ip[2] = normalize(disp) - v->vfore; |
256 |
|
d = DOT(disp,v->vdir); |
257 |
|
if (d >= 1.0-FTINY) |
258 |
|
return; |
259 |
|
if (d <= -(1.0-FTINY)) { |
260 |
< |
*xp += 180.0/v->horiz; |
218 |
< |
*yp += 180.0/v->vert; |
260 |
> |
ip[0] += 180.0/v->horiz; |
261 |
|
return; |
262 |
|
} |
263 |
|
d = acos(d)/PI / sqrt(1.0 - d*d); |
264 |
< |
*xp += DOT(disp,v->hvec)*d*180.0/v->horiz; |
265 |
< |
*yp += DOT(disp,v->vvec)*d*180.0/v->vert; |
264 |
> |
ip[0] += DOT(disp,v->hvec)*d*180.0/v->horiz; |
265 |
> |
ip[1] += DOT(disp,v->vvec)*d*180.0/v->vert; |
266 |
|
return; |
267 |
|
} |
268 |
< |
*xp = DOT(disp,v->hvec)/v->hn2 + 0.5 - v->hoff; |
269 |
< |
*yp = DOT(disp,v->vvec)/v->vn2 + 0.5 - v->voff; |
268 |
> |
ip[0] = DOT(disp,v->hvec)/v->hn2 + 0.5 - v->hoff; |
269 |
> |
ip[1] = DOT(disp,v->vvec)/v->vn2 + 0.5 - v->voff; |
270 |
|
} |
271 |
|
|
272 |
|
|
273 |
+ |
void |
274 |
+ |
pix2loc(loc, rp, px, py) /* compute image location from pixel pos. */ |
275 |
+ |
RREAL loc[2]; |
276 |
+ |
register RESOLU *rp; |
277 |
+ |
int px, py; |
278 |
+ |
{ |
279 |
+ |
register int x, y; |
280 |
+ |
|
281 |
+ |
if (rp->rt & YMAJOR) { |
282 |
+ |
x = px; |
283 |
+ |
y = py; |
284 |
+ |
} else { |
285 |
+ |
x = py; |
286 |
+ |
y = px; |
287 |
+ |
} |
288 |
+ |
if (rp->rt & XDECR) |
289 |
+ |
x = rp->xr-1 - x; |
290 |
+ |
if (rp->rt & YDECR) |
291 |
+ |
y = rp->yr-1 - y; |
292 |
+ |
loc[0] = (x+.5)/rp->xr; |
293 |
+ |
loc[1] = (y+.5)/rp->yr; |
294 |
+ |
} |
295 |
+ |
|
296 |
+ |
|
297 |
+ |
void |
298 |
+ |
loc2pix(pp, rp, lx, ly) /* compute pixel pos. from image location */ |
299 |
+ |
int pp[2]; |
300 |
+ |
register RESOLU *rp; |
301 |
+ |
double lx, ly; |
302 |
+ |
{ |
303 |
+ |
register int x, y; |
304 |
+ |
|
305 |
+ |
x = lx * rp->xr; |
306 |
+ |
y = ly * rp->yr; |
307 |
+ |
if (rp->rt & XDECR) |
308 |
+ |
x = rp->xr-1 - x; |
309 |
+ |
if (rp->rt & YDECR) |
310 |
+ |
y = rp->yr-1 - y; |
311 |
+ |
if (rp->rt & YMAJOR) { |
312 |
+ |
pp[0] = x; |
313 |
+ |
pp[1] = y; |
314 |
+ |
} else { |
315 |
+ |
pp[0] = y; |
316 |
+ |
pp[1] = x; |
317 |
+ |
} |
318 |
+ |
} |
319 |
+ |
|
320 |
+ |
|
321 |
|
int |
322 |
|
getviewopt(v, ac, av) /* process view argument */ |
323 |
|
register VIEW *v; |
326 |
|
{ |
327 |
|
#define check(c,l) if ((av[0][c]&&av[0][c]!=' ') || \ |
328 |
|
badarg(ac-1,av+1,l)) return(-1) |
239 |
– |
extern double atof(); |
329 |
|
|
330 |
|
if (ac <= 0 || av[0][0] != '-' || av[0][1] != 'v') |
331 |
|
return(-1); |
362 |
|
check(3,"f"); |
363 |
|
v->vert = atof(av[1]); |
364 |
|
return(1); |
365 |
+ |
case 'o': /* fore clipping plane */ |
366 |
+ |
check(3,"f"); |
367 |
+ |
v->vfore = atof(av[1]); |
368 |
+ |
return(1); |
369 |
+ |
case 'a': /* aft clipping plane */ |
370 |
+ |
check(3,"f"); |
371 |
+ |
v->vaft = atof(av[1]); |
372 |
+ |
return(1); |
373 |
|
case 's': /* shift */ |
374 |
|
check(3,"f"); |
375 |
|
v->hoff = atof(av[1]); |
397 |
|
|
398 |
|
while (*s == ' ') |
399 |
|
s++; |
400 |
+ |
if (*s != '-') |
401 |
+ |
s = sskip2(s,1); |
402 |
|
while (*s) { |
403 |
|
ac = 0; |
404 |
|
do { |
405 |
< |
av[ac++] = s; |
405 |
> |
if (ac || *s == '-') |
406 |
> |
av[ac++] = s; |
407 |
|
while (*s && *s != ' ') |
408 |
|
s++; |
409 |
|
while (*s == ' ') |
420 |
|
} |
421 |
|
|
422 |
|
|
423 |
+ |
void |
424 |
|
fprintview(vp, fp) /* write out view parameters */ |
425 |
|
register VIEW *vp; |
426 |
|
FILE *fp; |
430 |
|
fprintf(fp, " -vd %.6g %.6g %.6g", vp->vdir[0], vp->vdir[1], vp->vdir[2]); |
431 |
|
fprintf(fp, " -vu %.6g %.6g %.6g", vp->vup[0], vp->vup[1], vp->vup[2]); |
432 |
|
fprintf(fp, " -vh %.6g -vv %.6g", vp->horiz, vp->vert); |
433 |
+ |
fprintf(fp, " -vo %.6g -va %.6g", vp->vfore, vp->vaft); |
434 |
|
fprintf(fp, " -vs %.6g -vl %.6g", vp->hoff, vp->voff); |
435 |
|
} |
436 |
|
|
437 |
|
|
438 |
< |
static char *altname[] = {NULL,"rpict","rview","pinterp",VIEWSTR,NULL}; |
438 |
> |
char * |
439 |
> |
viewopt(vp) /* translate to minimal view string */ |
440 |
> |
register VIEW *vp; |
441 |
> |
{ |
442 |
> |
static char vwstr[128]; |
443 |
> |
register char *cp = vwstr; |
444 |
|
|
445 |
+ |
if (vp->type != stdview.type) { |
446 |
+ |
sprintf(cp, " -vt%c", vp->type); |
447 |
+ |
cp += strlen(cp); |
448 |
+ |
} |
449 |
+ |
if (!VEQ(vp->vp,stdview.vp)) { |
450 |
+ |
sprintf(cp, " -vp %.6g %.6g %.6g", |
451 |
+ |
vp->vp[0], vp->vp[1], vp->vp[2]); |
452 |
+ |
cp += strlen(cp); |
453 |
+ |
} |
454 |
+ |
if (!VEQ(vp->vdir,stdview.vdir)) { |
455 |
+ |
sprintf(cp, " -vd %.6g %.6g %.6g", |
456 |
+ |
vp->vdir[0], vp->vdir[1], vp->vdir[2]); |
457 |
+ |
cp += strlen(cp); |
458 |
+ |
} |
459 |
+ |
if (!VEQ(vp->vup,stdview.vup)) { |
460 |
+ |
sprintf(cp, " -vu %.6g %.6g %.6g", |
461 |
+ |
vp->vup[0], vp->vup[1], vp->vup[2]); |
462 |
+ |
cp += strlen(cp); |
463 |
+ |
} |
464 |
+ |
if (!FEQ(vp->horiz,stdview.horiz)) { |
465 |
+ |
sprintf(cp, " -vh %.6g", vp->horiz); |
466 |
+ |
cp += strlen(cp); |
467 |
+ |
} |
468 |
+ |
if (!FEQ(vp->vert,stdview.vert)) { |
469 |
+ |
sprintf(cp, " -vv %.6g", vp->vert); |
470 |
+ |
cp += strlen(cp); |
471 |
+ |
} |
472 |
+ |
if (!FEQ(vp->vfore,stdview.vfore)) { |
473 |
+ |
sprintf(cp, " -vo %.6g", vp->vfore); |
474 |
+ |
cp += strlen(cp); |
475 |
+ |
} |
476 |
+ |
if (!FEQ(vp->vaft,stdview.vaft)) { |
477 |
+ |
sprintf(cp, " -va %.6g", vp->vaft); |
478 |
+ |
cp += strlen(cp); |
479 |
+ |
} |
480 |
+ |
if (!FEQ(vp->hoff,stdview.hoff)) { |
481 |
+ |
sprintf(cp, " -vs %.6g", vp->hoff); |
482 |
+ |
cp += strlen(cp); |
483 |
+ |
} |
484 |
+ |
if (!FEQ(vp->voff,stdview.voff)) { |
485 |
+ |
sprintf(cp, " -vl %.6g", vp->voff); |
486 |
+ |
cp += strlen(cp); |
487 |
+ |
} |
488 |
+ |
return(vwstr); |
489 |
+ |
} |
490 |
+ |
|
491 |
+ |
|
492 |
+ |
int |
493 |
+ |
isview(s) /* is this a view string? */ |
494 |
+ |
char *s; |
495 |
+ |
{ |
496 |
+ |
static char *altname[]={NULL,VIEWSTR,"rpict","rview","rvu","rpiece","pinterp",NULL}; |
497 |
+ |
extern char *progname; |
498 |
+ |
register char *cp; |
499 |
+ |
register char **an; |
500 |
+ |
/* add program name to list */ |
501 |
+ |
if (altname[0] == NULL) { |
502 |
+ |
for (cp = progname; *cp; cp++) |
503 |
+ |
; |
504 |
+ |
while (cp > progname && !ISDIRSEP(cp[-1])) |
505 |
+ |
cp--; |
506 |
+ |
altname[0] = cp; |
507 |
+ |
} |
508 |
+ |
/* skip leading path */ |
509 |
+ |
cp = s; |
510 |
+ |
while (*cp && *cp != ' ') |
511 |
+ |
cp++; |
512 |
+ |
while (cp > s && !ISDIRSEP(cp[-1])) |
513 |
+ |
cp--; |
514 |
+ |
for (an = altname; *an != NULL; an++) |
515 |
+ |
if (!strncmp(*an, cp, strlen(*an))) |
516 |
+ |
return(1); |
517 |
+ |
return(0); |
518 |
+ |
} |
519 |
+ |
|
520 |
+ |
|
521 |
|
struct myview { |
522 |
|
VIEW *hv; |
523 |
|
int ok; |
524 |
|
}; |
525 |
|
|
526 |
|
|
527 |
< |
static |
528 |
< |
gethview(s, v) /* get view from header */ |
529 |
< |
char *s; |
530 |
< |
register struct myview *v; |
527 |
> |
static int |
528 |
> |
gethview( /* get view from header */ |
529 |
> |
char *s, |
530 |
> |
void *v |
531 |
> |
) |
532 |
|
{ |
533 |
< |
register char **an; |
534 |
< |
|
535 |
< |
for (an = altname; *an != NULL; an++) |
352 |
< |
if (!strncmp(*an, s, strlen(*an))) { |
353 |
< |
if (sscanview(v->hv, s+strlen(*an)) > 0) |
354 |
< |
v->ok++; |
355 |
< |
return; |
356 |
< |
} |
533 |
> |
if (isview(s) && sscanview(((struct myview*)v)->hv, s) > 0) |
534 |
> |
((struct myview*)v)->ok++; |
535 |
> |
return(0); |
536 |
|
} |
537 |
|
|
538 |
|
|
539 |
|
int |
540 |
< |
viewfile(fname, vp, xp, yp) /* get view from file */ |
540 |
> |
viewfile(fname, vp, rp) /* get view from file */ |
541 |
|
char *fname; |
542 |
|
VIEW *vp; |
543 |
< |
int *xp, *yp; |
543 |
> |
RESOLU *rp; |
544 |
|
{ |
366 |
– |
extern char *progname; |
545 |
|
struct myview mvs; |
546 |
|
FILE *fp; |
547 |
|
|
548 |
< |
if ((fp = fopen(fname, "r")) == NULL) |
548 |
> |
if (fname == NULL || !strcmp(fname, "-")) |
549 |
> |
fp = stdin; |
550 |
> |
else if ((fp = fopen(fname, "r")) == NULL) |
551 |
|
return(-1); |
552 |
|
|
373 |
– |
altname[0] = progname; |
553 |
|
mvs.hv = vp; |
554 |
|
mvs.ok = 0; |
555 |
|
|
556 |
|
getheader(fp, gethview, &mvs); |
557 |
|
|
558 |
< |
if (xp != NULL && yp != NULL |
380 |
< |
&& fgetresolu(xp, yp, fp) == -1) |
558 |
> |
if (rp != NULL && !fgetsresolu(rp, fp)) |
559 |
|
mvs.ok = 0; |
560 |
|
|
561 |
|
fclose(fp); |