14 |
|
|
15 |
|
#include "color.h" |
16 |
|
|
17 |
+ |
#include "resolu.h" |
18 |
|
|
19 |
|
#define MAXFILE 32 |
20 |
|
|
70 |
|
int argc; |
71 |
|
char *argv[]; |
72 |
|
{ |
72 |
– |
double atof(); |
73 |
|
int ncolumns = 0; |
74 |
|
int autolabel = 0; |
75 |
|
int curcol = 0, curx = 0, cury = 0; |
146 |
|
case 'l': |
147 |
|
if (strcmp(argv[an], "-l")) |
148 |
|
goto userr; |
149 |
< |
thislabel = argv[++an]; |
149 |
> |
thislabel = argv[an+1]; |
150 |
> |
an += 2; |
151 |
|
break; |
152 |
|
case '\0': |
153 |
|
if (argv[an][0] == '-') |
182 |
|
} |
183 |
|
/* get picture size */ |
184 |
|
if (fgetresolu(&input[nfile].xres, &input[nfile].yres, |
185 |
< |
input[nfile].fp) != (YMAJOR|YDECR)) { |
185 |
> |
input[nfile].fp) < 0) { |
186 |
|
fprintf(stderr, "%s: bad picture size\n", |
187 |
|
input[nfile].name); |
188 |
|
quit(1); |
230 |
|
/* add new header info. */ |
231 |
|
printargs(argc, argv, stdout); |
232 |
|
fputformat(COLRFMT, stdout); |
233 |
< |
printf("\n-Y %d +X %d\n", ysiz, xsiz); |
233 |
> |
putchar('\n'); |
234 |
> |
fprtresolu(xsiz, ysiz, stdout); |
235 |
|
|
236 |
|
compos(); |
237 |
|
|
340 |
|
return(NULL); |
341 |
|
if (checkheader(fp, COLRFMT, NULL) < 0) |
342 |
|
goto err; |
343 |
< |
if (fgetresolu(xp, yp, fp) != (YMAJOR|YDECR)) |
343 |
> |
if (fgetresolu(xp, yp, fp) < 0) |
344 |
|
goto err; |
345 |
|
return(fp); |
346 |
|
err: |