18 |
|
|
19 |
|
#include "calcomp.h" |
20 |
|
|
21 |
< |
#define MAXINP 16 /* maximum number of input files */ |
21 |
> |
#define MAXINP 32 /* maximum number of input files */ |
22 |
|
|
23 |
|
struct { |
24 |
|
char *name; /* file name */ |
121 |
|
input[nfiles].name = argv[a]; |
122 |
|
input[nfiles].fp = fopen(argv[a], "r"); |
123 |
|
if (input[nfiles].fp == NULL) { |
124 |
< |
eputs(argv[a]); |
125 |
< |
eputs(": cannot open\n"); |
124 |
> |
perror(argv[a]); |
125 |
|
quit(1); |
126 |
|
} |
127 |
|
} |
128 |
|
fputs(input[nfiles].name, stdout); |
129 |
|
fputs(":\n", stdout); |
130 |
|
getheader(input[nfiles].fp, tputs); |
131 |
< |
if (fscanf(input[nfiles].fp, "-Y %d +X %d\n", &ypos, &xpos) != 2) { |
131 |
> |
if (fgetresolu(&xpos, &ypos, input[nfiles].fp) != |
132 |
> |
(YMAJOR|YDECR)) { |
133 |
|
eputs(input[nfiles].name); |
134 |
|
eputs(": bad picture size\n"); |
135 |
|
quit(1); |
147 |
|
} |
148 |
|
printargs(argc, argv, stdout); |
149 |
|
putchar('\n'); |
150 |
< |
printf("-Y %d +X %d\n", yres, xres); |
150 |
> |
fputresolu(YMAJOR|YDECR, xres, yres, stdout); |
151 |
|
combine(); |
152 |
|
quit(0); |
153 |
|
usage: |
160 |
|
|
161 |
|
combine() /* combine pictures */ |
162 |
|
{ |
163 |
< |
int coldef[3]; |
163 |
> |
EPNODE *coldef[3]; |
164 |
|
COLOR *scanout; |
165 |
|
register int i, j; |
166 |
|
/* check defined variables */ |
167 |
< |
for (j = 0; j < 3; j++) |
168 |
< |
coldef[j] = vardefined(vcolout[j]); |
167 |
> |
for (j = 0; j < 3; j++) { |
168 |
> |
if (vardefined(vcolout[j])) |
169 |
> |
coldef[j] = eparse(vcolout[j]); |
170 |
> |
else |
171 |
> |
coldef[j] = NULL; |
172 |
> |
} |
173 |
|
/* allocate scanline */ |
174 |
|
scanout = (COLOR *)emalloc(xres*sizeof(COLOR)); |
175 |
|
/* combine files */ |
184 |
|
for (xpos = 0; xpos < xres; xpos++) { |
185 |
|
varset(vxpos, (double)xpos); |
186 |
|
eclock++; |
187 |
< |
for (j = 0; j < 3; j++) |
188 |
< |
if (coldef[j]) { |
187 |
> |
for (j = 0; j < 3; j++) { |
188 |
> |
if (coldef[j] != NULL) { |
189 |
|
colval(scanout[xpos],j) = |
190 |
< |
varvalue(vcolout[j]); |
187 |
< |
if (colval(scanout[xpos],j) < 0.0) |
188 |
< |
colval(scanout[xpos],j) = 0.0; |
190 |
> |
evalue(coldef[j]); |
191 |
|
} else { |
192 |
|
colval(scanout[xpos],j) = 0.0; |
193 |
|
for (i = 0; i < nfiles; i++) |
195 |
|
colval(input[i].coef,j) * |
196 |
|
colval(input[i].scan[xpos],j); |
197 |
|
} |
198 |
+ |
if (colval(scanout[xpos],j) < 0.0) |
199 |
+ |
colval(scanout[xpos],j) = 0.0; |
200 |
+ |
} |
201 |
|
} |
202 |
|
if (fwritescan(scanout, xres, stdout) < 0) { |
203 |
< |
eputs("write error\n"); |
203 |
> |
perror("write error"); |
204 |
|
quit(1); |
205 |
|
} |
206 |
|
} |