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] == '-') |
163 |
|
input[nfile].name = "<stdin>"; |
164 |
|
input[nfile].fp = stdin; |
165 |
|
} else { |
166 |
< |
input[nfile].name = argv[an]; |
167 |
< |
if ((input[nfile].fp = argv[an][0] == '!' ? |
168 |
< |
popen(argv[an]+1, "r") : |
169 |
< |
fopen(argv[an], "r")) == NULL) { |
166 |
> |
if (argv[an][0] == '!') { |
167 |
> |
input[nfile].name = "<Command>"; |
168 |
> |
input[nfile].fp = popen(argv[an]+1, "r"); |
169 |
> |
} else { |
170 |
> |
input[nfile].name = argv[an]; |
171 |
> |
input[nfile].fp = fopen(argv[an], "r"); |
172 |
> |
} |
173 |
> |
if (input[nfile].fp == NULL) { |
174 |
|
perror(argv[an]); |
175 |
|
quit(1); |
176 |
|
} |
186 |
|
} |
187 |
|
/* get picture size */ |
188 |
|
if (fgetresolu(&input[nfile].xres, &input[nfile].yres, |
189 |
< |
input[nfile].fp) != (YMAJOR|YDECR)) { |
189 |
> |
input[nfile].fp) < 0) { |
190 |
|
fprintf(stderr, "%s: bad picture size\n", |
191 |
|
input[nfile].name); |
192 |
|
quit(1); |
234 |
|
/* add new header info. */ |
235 |
|
printargs(argc, argv, stdout); |
236 |
|
fputformat(COLRFMT, stdout); |
237 |
< |
printf("\n-Y %d +X %d\n", ysiz, xsiz); |
237 |
> |
putchar('\n'); |
238 |
> |
fprtresolu(xsiz, ysiz, stdout); |
239 |
|
|
240 |
|
compos(); |
241 |
|
|
338 |
|
char com[128]; |
339 |
|
FILE *fp; |
340 |
|
|
341 |
< |
sprintf(com, "psign -h %d '%.30s' | pfilt -1 -x /2 -y /2", |
336 |
< |
2*labelht, s); |
341 |
> |
sprintf(com, "psign -s -.2 -h %d '%.30s'", labelht, s); |
342 |
|
if ((fp = popen(com, "r")) == NULL) |
343 |
|
return(NULL); |
344 |
|
if (checkheader(fp, COLRFMT, NULL) < 0) |
345 |
|
goto err; |
346 |
< |
if (fgetresolu(xp, yp, fp) != (YMAJOR|YDECR)) |
346 |
> |
if (fgetresolu(xp, yp, fp) < 0) |
347 |
|
goto err; |
348 |
|
return(fp); |
349 |
|
err: |