55 |
|
* For irregularly spaced points, the following can be |
56 |
|
* substituted for begi endi ni: |
57 |
|
* |
58 |
< |
* @ ni p0i p1i .. pni |
58 |
> |
* 0 0 ni p0i p1i .. pni |
59 |
|
*/ |
60 |
|
|
61 |
|
if ((dfname = getpath(dname, libpath, R_OK)) == NULL) { |
82 |
|
for (i = 0; i < dp->nd; i++) { |
83 |
|
if (fscanf(fp, "%lf %lf %d", |
84 |
|
&dp->dim[i].org, &dp->dim[i].siz, |
85 |
< |
&dp->dim[i].ne) == 3) { |
86 |
< |
dp->dim[i].siz -= dp->dim[i].org; |
87 |
< |
dp->dim[i].p = NULL; |
88 |
< |
} else if (fscanf(fp, "@ %d", &dp->dim[i].ne) == 1) { |
85 |
> |
&dp->dim[i].ne) != 3) |
86 |
> |
goto scanerr; |
87 |
> |
if (dp->dim[i].ne < 2) |
88 |
> |
goto scanerr; |
89 |
> |
asize *= dp->dim[i].ne; |
90 |
> |
if ((dp->dim[i].siz -= dp->dim[i].org) == 0) { |
91 |
|
dp->dim[i].p = (double *)malloc(dp->dim[i].ne*sizeof(double)); |
92 |
|
if (dp->dim[i].p == NULL) |
93 |
|
goto memerr; |
102 |
|
dp->dim[i].siz = dp->dim[i].p[dp->dim[i].ne-1] |
103 |
|
- dp->dim[i].p[0]; |
104 |
|
} else |
105 |
< |
goto scanerr; |
104 |
< |
if (dp->dim[i].siz == 0.0 || dp->dim[i].ne < 2) |
105 |
< |
goto scanerr; |
106 |
< |
asize *= dp->dim[i].ne; |
105 |
> |
dp->dim[i].p = NULL; |
106 |
|
} |
107 |
|
if ((dp->arr = (DATATYPE *)malloc(asize*sizeof(DATATYPE))) == NULL) |
108 |
|
goto memerr; |
124 |
|
} |
125 |
|
|
126 |
|
|
127 |
+ |
static double inpaspect; /* aspect ratio of input picture */ |
128 |
+ |
|
129 |
+ |
static |
130 |
+ |
headaspect(s) /* check string for aspect ratio */ |
131 |
+ |
char *s; |
132 |
+ |
{ |
133 |
+ |
if (isaspect(s)) |
134 |
+ |
inpaspect *= aspectval(s); |
135 |
+ |
} |
136 |
+ |
|
137 |
+ |
|
138 |
|
DATARRAY * |
139 |
|
getpict(pname) /* get picture pname */ |
140 |
|
char *pname; |
168 |
|
error(SYSTEM, errmsg); |
169 |
|
} |
170 |
|
/* get dimensions */ |
171 |
< |
getheader(fp, NULL); |
171 |
> |
inpaspect = 1.0; |
172 |
> |
getheader(fp, headaspect); |
173 |
|
if (fgetresolu(&width, &height, fp) != (YMAJOR|YDECR)) |
174 |
|
goto readerr; |
175 |
|
for (i = 0; i < 3; i++) { |
176 |
|
pp[i].nd = 2; |
177 |
< |
pp[i].dim[0].ne = width; |
178 |
< |
pp[i].dim[1].ne = height; |
177 |
> |
pp[i].dim[0].ne = height; |
178 |
> |
pp[i].dim[1].ne = width; |
179 |
|
pp[i].dim[0].org = |
180 |
|
pp[i].dim[1].org = 0.0; |
181 |
< |
if (width <= height) { |
182 |
< |
pp[i].dim[0].siz = 1.0; |
172 |
< |
pp[i].dim[1].siz = (double)height/width; |
173 |
< |
} else { |
174 |
< |
pp[i].dim[0].siz = (double)width/height; |
181 |
> |
if (width <= height*inpaspect) { |
182 |
> |
pp[i].dim[0].siz = inpaspect*(double)height/width; |
183 |
|
pp[i].dim[1].siz = 1.0; |
184 |
+ |
} else { |
185 |
+ |
pp[i].dim[0].siz = 1.0; |
186 |
+ |
pp[i].dim[1].siz = (double)width/height/inpaspect; |
187 |
|
} |
188 |
+ |
pp[i].dim[0].p = pp[i].dim[1].p = NULL; |
189 |
|
pp[i].arr = (DATATYPE *)malloc(width*height*sizeof(DATATYPE)); |
190 |
|
if (pp[i].arr == NULL) |
191 |
|
goto memerr; |
198 |
|
goto readerr; |
199 |
|
for (x = 0; x < width; x++) |
200 |
|
for (i = 0; i < 3; i++) |
201 |
< |
pp[i].arr[x*height+y] = colval(scanin[x],i); |
201 |
> |
pp[i].arr[y*width+x] = colval(scanin[x],i); |
202 |
|
} |
203 |
|
free((char *)scanin); |
204 |
|
fclose(fp); |
266 |
|
{ |
267 |
|
DATARRAY sd; |
268 |
|
int asize; |
269 |
+ |
int lower, upper; |
270 |
|
register int i; |
271 |
|
double x, y, y0, y1; |
272 |
|
/* set up dimensions for recursion */ |
288 |
|
else if (i > dp->dim[0].ne - 2) |
289 |
|
i = dp->dim[0].ne - 2; |
290 |
|
} else { /* unevenly spaced points */ |
291 |
< |
if (dp->dim[0].siz > 0.0) |
292 |
< |
for (i = 0; i < dp->dim[0].ne; i++) |
293 |
< |
if (pt[0] < dp->dim[0].p[i]) |
294 |
< |
break; |
295 |
< |
else |
296 |
< |
for (i = 0; i < dp->dim[0].ne; i++) |
297 |
< |
if (pt[0] >= dp->dim[0].p[i]) |
298 |
< |
break; |
299 |
< |
if (i <= 0) |
291 |
> |
if (dp->dim[0].siz > 0.0) { |
292 |
> |
lower = 0; |
293 |
> |
upper = dp->dim[0].ne; |
294 |
> |
} else { |
295 |
> |
lower = dp->dim[0].ne; |
296 |
> |
upper = 0; |
297 |
> |
} |
298 |
> |
do { |
299 |
> |
i = (lower + upper) >> 1; |
300 |
> |
if (pt[0] >= dp->dim[0].p[i]) |
301 |
> |
lower = i; |
302 |
> |
else if (pt[0] < dp->dim[0].p[i]) |
303 |
> |
upper = i; |
304 |
> |
} while (i != (lower + upper) >> 1); |
305 |
> |
if (i < 0) |
306 |
|
i = 0; |
307 |
< |
else if (i >= dp->dim[0].ne) |
307 |
> |
else if (i > dp->dim[0].ne - 2) |
308 |
|
i = dp->dim[0].ne - 2; |
290 |
– |
else |
291 |
– |
i--; |
309 |
|
x = i + (pt[0] - dp->dim[0].p[i]) / |
310 |
|
(dp->dim[0].p[i+1] - dp->dim[0].p[i]); |
311 |
|
} |