# | Line 145 | Line 145 | headaspect(s, iap) /* check string for aspect ratio | |
---|---|---|
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 | ||
# | Line 188 | Line 193 | char *pname; | |
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; |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |