| 7 |
|
|
| 8 |
|
#include "copyright.h" |
| 9 |
|
|
| 10 |
< |
#include "standard.h" |
| 10 |
> |
#include <time.h> |
| 11 |
|
|
| 12 |
+ |
#include "standard.h" |
| 13 |
+ |
#include "platform.h" |
| 14 |
|
#include "color.h" |
| 13 |
– |
|
| 15 |
|
#include "resolu.h" |
| 15 |
– |
|
| 16 |
|
#include "data.h" |
| 17 |
|
|
| 18 |
|
/* picture memory usage before warning */ |
| 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; |
| 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); |
