226 |
|
sinp[i] = (COLORV)m->oargs.farg[i+2]; |
227 |
|
hstep = 0.5 * (m->oargs.farg[1] - m->oargs.farg[0]) / |
228 |
|
(m->oargs.nfargs-3.0); |
229 |
< |
convertscolor(scval, NCSAMP, WLPART[0], WLPART[3], |
230 |
< |
sinp, m->oargs.nfargs-2, |
229 |
> |
convertscolorcol(scval, sinp, m->oargs.nfargs-2, |
230 |
|
m->oargs.farg[0]-hstep, m->oargs.farg[1]+hstep); |
231 |
|
free(sinp); |
232 |
|
m->os = (void *)scval; |
264 |
|
double wl = dp->dim[0].org + i*step; |
265 |
|
sinp[i] = (COLORV)datavalue(dp, &wl); |
266 |
|
} |
267 |
< |
convertscolor(scval, NCSAMP, WLPART[0], WLPART[3], |
268 |
< |
sinp, dp->dim[0].ne, dp->dim[0].org-.5*step, |
267 |
> |
convertscolorcol(scval, sinp, dp->dim[0].ne, |
268 |
> |
dp->dim[0].org-.5*step, |
269 |
|
dp->dim[0].org+dp->dim[0].siz+.5*step); |
270 |
|
free(sinp); |
271 |
|
m->os = (void *)scval; |
317 |
|
if ((errno == EDOM) | (errno == ERANGE)) |
318 |
|
goto computerr; |
319 |
|
} |
320 |
< |
convertscolor(scval, NCSAMP, WLPART[0], WLPART[3], |
322 |
< |
scdat, dp->dim[dp->nd-1].ne, |
320 |
> |
convertscolorcol(scval, scdat, dp->dim[dp->nd-1].ne, |
321 |
|
dp->dim[dp->nd-1].org-.5*step, |
322 |
|
dp->dim[dp->nd-1].org+dp->dim[dp->nd-1].siz+.5*step); |
323 |
|
free(scdat); |
363 |
|
if ((errno == EDOM) | (errno == ERANGE)) |
364 |
|
goto computerr; |
365 |
|
} |
366 |
< |
convertscolor(scval, NCSAMP, WLPART[0], WLPART[3], |
369 |
< |
scdat, dp->dim[2].ne, |
366 |
> |
convertscolorcol(scval, scdat, dp->dim[2].ne, |
367 |
|
dp->dim[2].org-.5*step, |
368 |
|
dp->dim[2].org+dp->dim[2].siz+.5*step); |
369 |
|
smultscolor(r->pcol, scval); |