85 |
|
double f; |
86 |
|
int a; |
87 |
|
|
88 |
< |
funset(vcolin[RED], 1, l_redin); |
89 |
< |
funset(vcolin[GRN], 1, l_grnin); |
90 |
< |
funset(vcolin[BLU], 1, l_bluin); |
91 |
< |
funset(vbrtin, 1, l_brtin); |
88 |
> |
funset(vcolin[RED], 1, '=', l_redin); |
89 |
> |
funset(vcolin[GRN], 1, '=', l_grnin); |
90 |
> |
funset(vcolin[BLU], 1, '=', l_bluin); |
91 |
> |
funset(vbrtin, 1, '=', l_brtin); |
92 |
|
|
93 |
|
for (a = 1; a < argc; a++) |
94 |
|
if (argv[a][0] == '-') |
241 |
|
} else { |
242 |
|
for (j = 0; j < 3; j++) { |
243 |
|
if (coldef[j] != NULL) { |
244 |
< |
colval(scanout[xpos],j) = evalue(coldef[j]); |
244 |
> |
d = evalue(coldef[j]); |
245 |
|
} else { |
246 |
< |
colval(scanout[xpos],j) = 0.0; |
246 |
> |
d = 0.0; |
247 |
|
for (i = 0; i < nfiles; i++) |
248 |
< |
colval(scanout[xpos],j) += |
249 |
< |
colval(input[i].scan[xpos],j); |
248 |
> |
d += colval(input[i].scan[xpos],j); |
249 |
|
} |
250 |
< |
if (colval(scanout[xpos],j) < 0.0) |
251 |
< |
colval(scanout[xpos],j) = 0.0; |
250 |
> |
if (d < 0.0) |
251 |
> |
d = 0.0; |
252 |
> |
colval(scanout[xpos],j) = d; |
253 |
|
} |
254 |
|
} |
255 |
|
} |