316 |
|
if (id < 0) |
317 |
|
continue; /* not good enough */ |
318 |
|
/* convert color */ |
319 |
< |
tmCvColrs(&odS.brt[id], odS.chr[id], (COLR *)c, 1); |
319 |
> |
tmCvColrs(tmGlobal, &odS.brt[id], odS.chr[id], (COLR *)c, 1); |
320 |
|
if (imm_mode | needmapping) /* if immediate mode */ |
321 |
|
needmapping |= NEWRGB; /* map it later */ |
322 |
|
else /* else map it now */ |
323 |
< |
tmMapPixels(odS.rgb[id], &odS.brt[id], odS.chr[id], 1); |
323 |
> |
tmMapPixels(tmGlobal, odS.rgb[id], &odS.brt[id], |
324 |
> |
odS.chr[id], 1); |
325 |
|
SET4(odS.redraw, id); /* mark for redraw */ |
326 |
|
odView[i].n2redraw++; |
327 |
|
} |
485 |
|
if (needmapping & NEWRGB) { |
486 |
|
if (needmapping & NEWMAP) { |
487 |
|
if (needmapping & NEWHIST) |
488 |
< |
tmClearHisto(); |
488 |
> |
tmClearHisto(tmGlobal); |
489 |
|
needmapping &= ~NEWHIST; |
490 |
< |
if (tmAddHisto(odS.brt,odS.nsamp,1) != TM_E_OK) |
490 |
> |
if (tmAddHisto(tmGlobal, odS.brt,odS.nsamp,1) != TM_E_OK) |
491 |
|
return; |
492 |
< |
if (tmComputeMapping(0.,0.,0.) != TM_E_OK) |
492 |
> |
if (tmComputeMapping(tmGlobal, 0.,0.,0.) != TM_E_OK) |
493 |
|
return; |
494 |
|
needmapping &= ~NEWMAP; |
495 |
|
odRedrawAll(); /* redraw everything */ |
496 |
|
} |
497 |
< |
if (tmMapPixels((BYTE *)(odS.rgb), odS.brt, |
497 |
> |
if (tmMapPixels(tmGlobal, (BYTE *)(odS.rgb), odS.brt, |
498 |
|
(BYTE *)(odS.chr), odS.nsamp) != TM_E_OK) |
499 |
|
return; |
500 |
|
needmapping &= ~NEWRGB; |