7 |
|
|
8 |
|
#include "copyright.h" |
9 |
|
|
10 |
< |
#include "standard.h" |
10 |
> |
#include <time.h> |
11 |
|
|
12 |
+ |
#include "platform.h" |
13 |
+ |
#include "standard.h" |
14 |
|
#include "color.h" |
13 |
– |
|
15 |
|
#include "resolu.h" |
15 |
– |
|
16 |
|
#include "data.h" |
17 |
|
|
18 |
|
/* picture memory usage before warning */ |
19 |
|
#ifndef PSIZWARN |
20 |
< |
#ifdef BIGMEM |
21 |
< |
#define PSIZWARN 5000000 |
22 |
< |
#else |
20 |
> |
#ifdef SMLMEM |
21 |
|
#define PSIZWARN 1500000 |
22 |
+ |
#else |
23 |
+ |
#define PSIZWARN 5000000 |
24 |
|
#endif |
25 |
|
#endif |
26 |
|
|
67 |
|
* 0 0 ni p0i p1i .. pni |
68 |
|
*/ |
69 |
|
|
70 |
< |
if ((dfname = getpath(dname, getlibpath(), R_OK)) == NULL) { |
70 |
> |
if ((dfname = getpath(dname, getrlibpath(), R_OK)) == NULL) { |
71 |
|
sprintf(errmsg, "cannot find data file \"%s\"", dname); |
72 |
|
error(USER, errmsg); |
73 |
|
} |
78 |
|
/* get dimensions */ |
79 |
|
if (fgetval(fp, 'i', (char *)&asize) <= 0) |
80 |
|
goto scanerr; |
81 |
< |
if (asize <= 0 | asize > MAXDDIM) { |
81 |
> |
if ((asize <= 0) | (asize > MAXDDIM)) { |
82 |
|
sprintf(errmsg, "bad number of dimensions for \"%s\"", dname); |
83 |
|
error(USER, errmsg); |
84 |
|
} |
162 |
|
COLR *scanin; |
163 |
|
int sl, ns; |
164 |
|
RESOLU inpres; |
165 |
< |
FLOAT loc[2]; |
165 |
> |
RREAL loc[2]; |
166 |
|
int y; |
167 |
|
register int x, i; |
168 |
|
register DATARRAY *pp; |
171 |
|
if (!strcmp(pname, pp->name)) |
172 |
|
return(pp); /* found! */ |
173 |
|
|
174 |
< |
if ((pfname = getpath(pname, getlibpath(), R_OK)) == NULL) { |
174 |
> |
if ((pfname = getpath(pname, getrlibpath(), R_OK)) == NULL) { |
175 |
|
sprintf(errmsg, "cannot find picture file \"%s\"", pname); |
176 |
|
error(USER, errmsg); |
177 |
|
} |
184 |
|
sprintf(errmsg, "cannot open picture file \"%s\"", pfname); |
185 |
|
error(SYSTEM, errmsg); |
186 |
|
} |
187 |
< |
#ifdef MSDOS |
188 |
< |
setmode(fileno(fp), O_BINARY); |
189 |
< |
#endif |
187 |
> |
SET_FILE_BINARY(fp); |
188 |
|
/* get dimensions */ |
189 |
|
inpaspect = 1.0; |
190 |
|
getheader(fp, headaspect, (char *)&inpaspect); |
234 |
|
fclose(fp); |
235 |
|
i = hash(pname); |
236 |
|
pp[0].next = dtab[i]; /* link into picture list */ |
237 |
< |
copystruct(&pp[1], &pp[0]); |
238 |
< |
copystruct(&pp[2], &pp[0]); |
237 |
> |
pp[1] = pp[0]; |
238 |
> |
pp[2] = pp[0]; |
239 |
|
pp[0].type = RED; /* differentiate RGB records */ |
240 |
|
pp[1].type = GRN; |
241 |
|
pp[2].type = BLU; |
267 |
|
head.next = dtab[hval]; |
268 |
|
dpl = &head; |
269 |
|
while ((dp = dpl->next) != NULL) |
270 |
< |
if ((dta == NULL | dta == dp)) { |
270 |
> |
if ((dta == NULL) | (dta == dp)) { |
271 |
|
dpl->next = dp->next; |
272 |
|
if (dp->type == DATATY) |
273 |
|
free((void *)dp->arr.d); |