diff --git a/ChangeLog b/ChangeLog index b8d1157ca..fbb401f84 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-08-17 Stéphane Voltz + + * backend/umax_pp.c backend/umax_pp.h: revert change for UTA + 2003-08-15 Karl Heinz Kremer * backend/epson.[ch]: Added support for GT-30000, with support for the diff --git a/backend/umax_pp.c b/backend/umax_pp.c index 8ccc8e917..38b1af93f 100644 --- a/backend/umax_pp.c +++ b/backend/umax_pp.c @@ -484,7 +484,7 @@ init_options (Umax_PP_Device * dev) dev->opt[OPT_UTA_CONTROL].size = sizeof (SANE_Word); dev->opt[OPT_UTA_CONTROL].unit = SANE_UNIT_NONE; dev->val[OPT_UTA_CONTROL].w = SANE_TRUE; - dev->opt[OPT_UTA_CONTROL].cap |= SANE_CAP_ADVANCED; + dev->opt[OPT_UTA_CONTROL].cap |= SANE_CAP_ADVANCED | SANE_CAP_INACTIVE; /* custom-gamma table */ dev->opt[OPT_CUSTOM_GAMMA].name = SANE_NAME_CUSTOM_GAMMA; diff --git a/backend/umax_pp.h b/backend/umax_pp.h index 6247518ea..e2b586782 100644 --- a/backend/umax_pp.h +++ b/backend/umax_pp.h @@ -97,7 +97,6 @@ typedef union { SANE_Word w; SANE_Word *wa; /* word array */ - SANE_Int *ia; /* int array */ SANE_String s; } Option_Value;