427 |
|
e *= atof(cp); |
428 |
|
} |
429 |
|
if (p != NULL) { /* relative setting */ |
430 |
+ |
compavg(p); |
431 |
|
if (bright(p->v) < 1e-15) { |
432 |
|
error(COMMAND, "cannot normalize to zero"); |
433 |
|
return; |
534 |
|
char *s |
535 |
|
) |
536 |
|
{ |
537 |
+ |
int prev_newp = newparam; |
538 |
|
char buf[128]; |
539 |
|
|
540 |
|
if (s[0] == '\0') { |
541 |
|
(*dev->comout)( |
542 |
< |
"aa ab ad ar as av aw b bv dc dv dj ds dt i lr lw me ma mg ms ps pt sj st u: "); |
542 |
> |
"aa ab ad ar as av aw b bv dc dv dj ds dt i lr lw me ma mg ms ps pt ss st u: "); |
543 |
|
(*dev->comin)(buf, NULL); |
544 |
|
s = buf; |
545 |
|
} |
600 |
|
case 'n': case 'N': case 'f': case 'F': case '0': case '-': |
601 |
|
getparam(s+1, "black and white", 'b', |
602 |
|
(void *)&greyscale); |
603 |
+ |
newparam = prev_newp; |
604 |
|
break; |
605 |
|
default: |
606 |
|
goto badparam; |
683 |
|
default: |
684 |
|
goto badparam; |
685 |
|
} |
686 |
+ |
newparam = prev_newp; |
687 |
|
break; |
688 |
|
case 's': /* specular */ |
689 |
|
switch (s[1]) { |
690 |
< |
case 'j': /* jitter */ |
691 |
< |
getparam(s+2, "specular jitter", 'r', |
690 |
> |
case 's': /* sampling */ |
691 |
> |
getparam(s+2, "specular sampling", 'r', |
692 |
|
(void *)&specjitter); |
693 |
|
break; |
694 |
|
case 't': /* threshold */ |