19 |
|
/* picture memory usage before warning */ |
20 |
|
#ifndef PSIZWARN |
21 |
|
#ifdef BIGMEM |
22 |
< |
#define PSIZWARN 3000000 |
22 |
> |
#define PSIZWARN 5000000 |
23 |
|
#else |
24 |
< |
#define PSIZWARN 1000000 |
24 |
> |
#define PSIZWARN 1500000 |
25 |
|
#endif |
26 |
|
#endif |
27 |
|
|
145 |
|
char *s; |
146 |
|
double *iap; |
147 |
|
{ |
148 |
+ |
char fmt[32]; |
149 |
+ |
|
150 |
|
if (isaspect(s)) |
151 |
|
*iap *= aspectval(s); |
152 |
+ |
else if (formatval(fmt, s) && strcmp(fmt, COLRFMT)) |
153 |
+ |
*iap = 0.0; |
154 |
+ |
return(0); |
155 |
|
} |
156 |
|
|
157 |
|
|
193 |
|
/* get dimensions */ |
194 |
|
inpaspect = 1.0; |
195 |
|
getheader(fp, headaspect, &inpaspect); |
196 |
< |
if (!fgetsresolu(&inpres, fp)) |
196 |
> |
if (inpaspect <= FTINY || !fgetsresolu(&inpres, fp)) |
197 |
|
goto readerr; |
198 |
|
pp[0].nd = 2; |
199 |
|
pp[0].dim[0].ne = inpres.yr; |