mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Ulrich Deiters: memory leak plugged, option settings for FS2700 corrected

merge-requests/1/head
Ulrich Deiters 2004-05-17 15:09:57 +00:00
rodzic a28bd84350
commit 6be161afe4
4 zmienionych plików z 13 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
ChangeLog-1.0.14
Wyświetl plik

@ -1,3 +1,8 @@
2004-05-17 Ulrich Deiters <ukd@xenon.pc.uni-koeln.de>
* 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 <henning@meier-geinitz.de>

2
backend/canon-sane.c
Wyświetl plik

@ -270,6 +270,8 @@ sane_close (SANE_Handle handle)
free (s->inbuffer); /* modification for FB620S */
if (s->outbuffer)
free (s->outbuffer); /* modification for FB620S */
if (s->auxbuf_len > 0)
free (s->auxbuf); /* modification for FS2710S */
free (s);

6
backend/canon.c
Wyświetl plik

@ -1216,15 +1216,15 @@ init_options (CANON_Scanner * s)
s->opt[OPT_SCANNING_SPEED].constraint.string_list = scanning_speed_list;
s->opt[OPT_SCANNING_SPEED].cap |=
(s->hw->info.model == CS2700) ? 0 : SANE_CAP_INACTIVE;
s->opt[OPT_SCANNING_SPEED].cap &=
(s->hw->info.model == CS2700) ? SANE_TRUE : ~SANE_CAP_SOFT_SELECT;
if (s->hw->info.model != CS2700)
s->opt[OPT_SCANNING_SPEED].cap &= ~SANE_CAP_SOFT_SELECT;
s->val[OPT_SCANNING_SPEED].s = strdup (scanning_speed_list[0]);
/* "Resolution" group: */
s->opt[OPT_RESOLUTION_GROUP].title = "Scan Resolution";
s->opt[OPT_RESOLUTION_GROUP].desc = "";
s->opt[OPT_RESOLUTION_GROUP].type = SANE_TYPE_GROUP;
s->opt[OPT_RESOLUTION_GROUP].cap = 0;;
s->opt[OPT_RESOLUTION_GROUP].cap = 0;
s->opt[OPT_RESOLUTION_GROUP].constraint_type = SANE_CONSTRAINT_NONE;
/* bind resolution */

5
doc/descriptions/canon.desc
Wyświetl plik

@ -27,6 +27,7 @@
:model "CanoScan 600" ; name models for above-specified mfg.
:interface "SCSI"
:comment "1 pass; flatbed scanner"
:status :good
:model "CanoScan 620S" ; name models for above-specified mfg.
@ -42,12 +43,12 @@
:model "CanoScan 2700F" ; name models for above-specified mfg.
:interface "SCSI"
:comment "1 pass; film scanner"
:status :good
:status :alpha
:model "CanoScan 2710S" ; name models for above-specified mfg.
:interface "SCSI"
:comment "1 pass; 36bit film scanner"
:status :good
:status :beta
; :comment and :url specifiers are optional after :mfg, :model, :desc,
; and at the top-level.