diff --git a/ChangeLog b/ChangeLog index 5662a3edd..1dc5443c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2004-05-21 Ulrich Deiters + + * backend/canon.c, canon-sane.c, canon.h: removed an option + (OPT_PAGE) that conflicted with some frontends + +2004-05-18 Ulrich Deiters + + * backend/canon.c, canon-sane.c: memory leak and bug fixed + in slide scanner code + 2004-05-18 Henning Meier-Geinitz * doc/descriptions/unsupported.desc: Added more Canon cartridge diff --git a/ChangeLog-1.0.14 b/ChangeLog-1.0.14 index 6934bfbe0..d8150a9e8 100644 --- a/ChangeLog-1.0.14 +++ b/ChangeLog-1.0.14 @@ -1,8 +1,3 @@ -2004-05-17 Ulrich Deiters - - * backend/canon.c, canon-sane.c: memory leak and bug fixed - in slide scanner code - ****** Release of sane-backends 1.0.14. End of code freeze ****** 2004-04-30 Henning Meier-Geinitz diff --git a/backend/canon-sane.c b/backend/canon-sane.c index 1f3640473..112a4439b 100644 --- a/backend/canon-sane.c +++ b/backend/canon-sane.c @@ -447,14 +447,6 @@ sane_control_option (SANE_Handle handle, SANE_Int option, s->val[option].s); return (SANE_STATUS_GOOD); - case OPT_PAGE: - strcpy (val, s->val[option].s); - if (info) - *info |= SANE_INFO_RELOAD_PARAMS | SANE_INFO_RELOAD_OPTIONS; - DBG (21, "value for option %s: %s\n", option_name[option], - s->val[option].s); - return (SANE_STATUS_GOOD); - case OPT_NEGATIVE: strcpy (val, s->val[option].s); if (info) @@ -871,58 +863,6 @@ sane_control_option (SANE_Handle handle, SANE_Int option, s->scanning_speed = i; return (SANE_STATUS_GOOD); - case OPT_PAGE: - if (info && strcmp (s->val[option].s, (SANE_String) val)) - *info |= SANE_INFO_RELOAD_OPTIONS | SANE_INFO_RELOAD_PARAMS; - if (s->val[option].s) - free (s->val[option].s); - s->val[option].s = strdup (val); - if (info) - *info |= SANE_INFO_RELOAD_PARAMS | SANE_INFO_RELOAD_OPTIONS; - DBG (21, "value for option %s: %s\n", option_name[option], - s->val[option].s); - if (!strcmp (val, "Show normal options")) - { - DBG (21, "setting OPT_PAGE to 'Normal options'\n"); - s->opt[OPT_MODE_GROUP].cap &= ~SANE_CAP_ADVANCED; - s->opt[OPT_RESOLUTION_GROUP].cap &= ~SANE_CAP_ADVANCED; - s->opt[OPT_ENHANCEMENT_GROUP].cap &= ~SANE_CAP_ADVANCED; - s->opt[OPT_CALIBRATION_GROUP].cap &= ~SANE_CAP_ADVANCED; - s->opt[OPT_EJECT_GROUP].cap &= ~SANE_CAP_ADVANCED; - s->opt[OPT_ADF_GROUP].cap &= ~SANE_CAP_ADVANCED; - - s->opt[OPT_FOCUS_GROUP].cap |= SANE_CAP_ADVANCED; - s->opt[OPT_MARGINS_GROUP].cap |= SANE_CAP_ADVANCED; - s->opt[OPT_COLORS_GROUP].cap |= SANE_CAP_ADVANCED; - } - else if (!strcmp (val, "Show advanced options")) - { - DBG (21, "setting OPT_PAGE to 'Advanced options'\n"); - s->opt[OPT_MODE_GROUP].cap |= SANE_CAP_ADVANCED; - s->opt[OPT_RESOLUTION_GROUP].cap |= SANE_CAP_ADVANCED; - s->opt[OPT_ENHANCEMENT_GROUP].cap |= SANE_CAP_ADVANCED; - s->opt[OPT_CALIBRATION_GROUP].cap |= SANE_CAP_ADVANCED; - s->opt[OPT_EJECT_GROUP].cap |= SANE_CAP_ADVANCED; - s->opt[OPT_ADF_GROUP].cap |= SANE_CAP_ADVANCED; - - s->opt[OPT_FOCUS_GROUP].cap &= ~SANE_CAP_ADVANCED; - s->opt[OPT_MARGINS_GROUP].cap &= ~SANE_CAP_ADVANCED; - s->opt[OPT_COLORS_GROUP].cap &= ~SANE_CAP_ADVANCED; - } - else - { - s->opt[OPT_MODE_GROUP].cap &= ~SANE_CAP_ADVANCED; - s->opt[OPT_RESOLUTION_GROUP].cap &= ~SANE_CAP_ADVANCED; - s->opt[OPT_ENHANCEMENT_GROUP].cap &= ~SANE_CAP_ADVANCED; - s->opt[OPT_CALIBRATION_GROUP].cap &= ~SANE_CAP_ADVANCED; - s->opt[OPT_EJECT_GROUP].cap &= ~SANE_CAP_ADVANCED; - s->opt[OPT_ADF_GROUP].cap &= ~SANE_CAP_ADVANCED; - s->opt[OPT_FOCUS_GROUP].cap &= ~SANE_CAP_ADVANCED; - s->opt[OPT_MARGINS_GROUP].cap &= ~SANE_CAP_ADVANCED; - s->opt[OPT_COLORS_GROUP].cap &= ~SANE_CAP_ADVANCED; - } - return (SANE_STATUS_GOOD); - /* modification for FB620S */ case OPT_CALIBRATION_NOW: sanei_scsi_open (s->hw->sane.name, &s->fd, sense_handler, s->hw); diff --git a/backend/canon.c b/backend/canon.c index 3b5d75494..99a8c6107 100644 --- a/backend/canon.c +++ b/backend/canon.c @@ -1135,15 +1135,6 @@ init_options (CANON_Scanner * s) s->opt[OPT_NUM_OPTS].cap = SANE_CAP_SOFT_DETECT; s->val[OPT_NUM_OPTS].w = NUM_OPTIONS; - s->opt[OPT_PAGE].name = "options-page"; - s->opt[OPT_PAGE].title = ""; - s->opt[OPT_PAGE].desc = "Selects the options page to show"; - s->opt[OPT_PAGE].type = SANE_TYPE_STRING; - s->opt[OPT_PAGE].size = max_string_size (page_list); - s->opt[OPT_PAGE].constraint_type = SANE_CONSTRAINT_STRING_LIST; - s->opt[OPT_PAGE].constraint.string_list = page_list; - s->val[OPT_PAGE].s = strdup (page_list[0]); - /* "Mode" group: */ s->opt[OPT_MODE_GROUP].title = "Scan Mode"; s->opt[OPT_MODE_GROUP].desc = ""; diff --git a/backend/canon.h b/backend/canon.h index 4d2f5876a..8891b1b38 100644 --- a/backend/canon.h +++ b/backend/canon.h @@ -135,8 +135,6 @@ typedef enum { OPT_NUM_OPTS = 0, - OPT_PAGE, - OPT_MODE_GROUP, OPT_MODE, OPT_NEGATIVE, /* Reverse image format */ @@ -329,8 +327,6 @@ CANON_Scanner; static char *option_name[] = { "OPT_NUM_OPTS", - "OPT_PAGE", - "OPT_MODE_GROUP", "OPT_MODE", "OPT_NEGATIVE", diff --git a/doc/descriptions/canon.desc b/doc/descriptions/canon.desc index c0f2a3227..7323565ed 100644 --- a/doc/descriptions/canon.desc +++ b/doc/descriptions/canon.desc @@ -11,7 +11,7 @@ :backend "canon" ; name of backend :manpage "sane-canon" :version "1.12" ; version of backend -;:status :beta ; :alpha, :beta, :stable, :new +;:status :good ; :alpha, :beta, :stable, :new :url "http://www.rzg.mpg.de/~mpd/sane/" ; backend home page @@ -43,12 +43,12 @@ :model "CanoScan 2700F" ; name models for above-specified mfg. :interface "SCSI" :comment "1 pass; film scanner" -:status :alpha +:status :good :model "CanoScan 2710S" ; name models for above-specified mfg. :interface "SCSI" :comment "1 pass; 36bit film scanner" -:status :beta +:status :good ; :comment and :url specifiers are optional after :mfg, :model, :desc, ; and at the top-level.