correction removed dummy WHITE R, G and B slides for VM656A and VM6586.

merge-requests/1/head
Gerard Klaver 2004-08-04 20:58:10 +00:00
rodzic 463c83a091
commit 4f1709e51c
1 zmienionych plików z 19 dodań i 4 usunięć

Wyświetl plik

@ -2826,9 +2826,7 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
dev->opt[OPT_WHITE_LEVEL_B].cap &= ~SANE_CAP_INACTIVE;
break;
case TECO_VM3575:
case TECO_VM656A:
case TECO_VM6575:
case TECO_VM6586:
dev->opt[OPT_WHITE_LEVEL_R].cap &= ~SANE_CAP_INACTIVE;
dev->opt[OPT_WHITE_LEVEL_G].cap &= ~SANE_CAP_INACTIVE;
dev->opt[OPT_WHITE_LEVEL_B].cap &= ~SANE_CAP_INACTIVE;
@ -2839,6 +2837,15 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
~SANE_CAP_INACTIVE;
}
break;
case TECO_VM656A:
case TECO_VM6586:
dev->opt[OPT_CUSTOM_GAMMA].cap &= ~SANE_CAP_INACTIVE;
if (dev->val[OPT_CUSTOM_GAMMA].w)
{
dev->opt[OPT_GAMMA_VECTOR_GRAY].cap &=
~SANE_CAP_INACTIVE;
}
break;
}
dev->opt[OPT_FILTER_COLOR].cap &= ~SANE_CAP_INACTIVE;
}
@ -2856,9 +2863,7 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
dev->opt[OPT_WHITE_LEVEL_B].cap &= ~SANE_CAP_INACTIVE;
break;
case TECO_VM3575:
case TECO_VM656A:
case TECO_VM6575:
case TECO_VM6586:
dev->opt[OPT_WHITE_LEVEL_R].cap &= ~SANE_CAP_INACTIVE;
dev->opt[OPT_WHITE_LEVEL_G].cap &= ~SANE_CAP_INACTIVE;
dev->opt[OPT_WHITE_LEVEL_B].cap &= ~SANE_CAP_INACTIVE;
@ -2870,6 +2875,16 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
dev->opt[OPT_GAMMA_VECTOR_B].cap &= ~SANE_CAP_INACTIVE;
}
break;
case TECO_VM656A:
case TECO_VM6586:
dev->opt[OPT_CUSTOM_GAMMA].cap &= ~SANE_CAP_INACTIVE;
if (dev->val[OPT_CUSTOM_GAMMA].w)
{
dev->opt[OPT_GAMMA_VECTOR_R].cap &= ~SANE_CAP_INACTIVE;
dev->opt[OPT_GAMMA_VECTOR_G].cap &= ~SANE_CAP_INACTIVE;
dev->opt[OPT_GAMMA_VECTOR_B].cap &= ~SANE_CAP_INACTIVE;
}
break;
}
/* The VM3575, VM3564, VM356A and VM6586 supports only a handful of resolution. Do that here.
* Ugly! */