diff --git a/ChangeLog b/ChangeLog index 95e1fe261..16125929c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-08-08 m. allan noah + * frontend/scanimage.c: bugfix: dont round up negative user values + * doc/descriptions/fujitsu.desc: add/consolidate new models + 2007-08-03 Julien Blache * doc/descriptions/epson.desc: add the Epson Stylus Photo RX-700 (04b8:0810), based on user report. Add the Epson Stylus CX-6600 diff --git a/doc/descriptions/fujitsu.desc b/doc/descriptions/fujitsu.desc index 5b1183b14..c2c589d7c 100644 --- a/doc/descriptions/fujitsu.desc +++ b/doc/descriptions/fujitsu.desc @@ -1,7 +1,7 @@ ; ; SANE Backend specification file ; -; It's goodally emacs-lisp --- so ";" indicates comment to end of line. +; It's basically emacs-lisp --- so ";" indicates comment to end of line. ; All syntactic elements are keyword tokens, followed by a string or ; keyword argument, as specified. ; @@ -11,7 +11,7 @@ :backend "fujitsu" ; name of backend :url "http://www.thebility.com/fujitsu/" -:version "1.0.50" ; version of backend +:version "1.0.52" ; version of backend :manpage "sane-fujitsu" ; name of manpage (if it exists) :comment "Backend re-written for SANE release 1.0.18, see sane-fujitsu manpage" :devicetype :scanner ; start of a list of devices.... @@ -23,11 +23,6 @@ ;================================================== ; DISCONTINUED OLDER MODELS, PERSONAL -:model "ScanPartner 93GX" -:interface "SCSI" -:status :good -:comment "workgroup, old, discontinued" - :model "M3091DC" :interface "SCSI" :url "http://www.remote.org/frederik/projects/software/sane/" @@ -39,12 +34,7 @@ :status :good :comment "workgroup, old, discontinued" -:model "ScanPartner Jr/10/15/300/600" -:interface "SCSI" -:status :unsupported -:comment "workgroup, old, discontinued, Avision OEM" - -:model "ScanPartner 15C/620C" +:model "ScanPartner Jr/10C/15C/93GX/300/600/620C" :interface "SCSI" :status :unsupported :comment "workgroup, old, discontinued, Avision OEM" @@ -57,22 +47,17 @@ :usbid "0x04c5" "0x1029" :comment "workgroup, recent, discontinued, maybe Avision OEM?" -:model "fi-4110CU" +:model "fi-4110CU/SSF" :interface "USB" :status :untested :usbid "0x04c5" "0x1033" :comment "workgroup, recent, discontinued, maybe Avision OEM?" -:model "fi-4110EOX" +:model "fi-4110EOX/2/3" :interface "USB" :status :untested :comment "workgroup, recent, discontinued, maybe MA1509 chipset?" -:model "fi-4110EOX2" -:interface "USB" -:status :unsupported -:comment "workgroup, recent, discontinued, MA1509 chipset" - :model "fi-4120C" :interface "SCSI USB" :usbid "0x04c5" "0x1041" diff --git a/frontend/scanimage.c b/frontend/scanimage.c index cb4fc4b1c..99280d282 100644 --- a/frontend/scanimage.c +++ b/frontend/scanimage.c @@ -715,7 +715,14 @@ parse_scalar (const SANE_Option_Descriptor * opt, const char *str, str += sizeof ("us") - 1; break; } - *value = v + 0.5; + + if(v < 0){ + *value = v - 0.5; + } + else{ + *value = v + 0.5; + } + return str; }