kopia lustrzana https://gitlab.com/sane-project/backends
Genius ColorPage Vivid 1200 X is reported to work. Genius ColorPage Vivid 4 XE
seems to be the same as 4 X, it just doesn't have buttons. Cleanup of .desc file. Fixed gain setting. Mustek ScanExpress A3 USB 600 dpi color scanning works now.merge-requests/1/head
Henning Geinitz
rodzic
5c4b3d9a0e
commit
aa209997b7
10
ChangeLog
10
ChangeLog
|
|
@ -1,3 +1,13 @@
|
|||
2005-09-01 Henning Meier-Geinitz <henning@meier-geinitz.de>
|
||||
|
||||
* backend/gt68xx.c backend/gt68xx_devices.c
|
||||
backend/gt68xx_generic.c backend/gt68xx_high.c
|
||||
doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES: Genius
|
||||
ColorPage Vivid 1200 X is reported to work. Genius ColorPage Vivid
|
||||
4 XE seems to be the same as 4 X, it just doesn't have
|
||||
buttons. Cleanup of .desc file. Fixed gain setting. Mustek
|
||||
ScanExpress A3 USB 600 dpi color scanning works now.
|
||||
|
||||
2005-08-31 Henning Meier-Geinitz <henning@meier-geinitz.de>
|
||||
|
||||
* doc/descriptions/unsupported.desc: Removed Mustek 1800 A3 Pro
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@
|
|||
|
||||
#include "../include/sane/config.h"
|
||||
|
||||
#define BUILD 74
|
||||
#define BUILD 75
|
||||
#define MAX_DEBUG
|
||||
#define WARMUP_TIME 60
|
||||
#define CALIBRATION_HEIGHT 2.5
|
||||
|
|
|
|||
|
|
@ -867,7 +867,7 @@ static GT68xx_Model mustek_a3usb_model = {
|
|||
300, /* base x-res used to calculate geometry */
|
||||
300, /* base y-res used to calculate geometry */
|
||||
1200, /* if ydpi is equal or higher, disable backtracking */
|
||||
SANE_FALSE, /* Use base_ydpi for all resolutions */
|
||||
SANE_TRUE, /* Use base_ydpi for all resolutions */
|
||||
|
||||
{300, 150, 75, 50, 0}, /* possible x-resolutions */
|
||||
{600, 300, 150, 75, 50, 0}, /* possible y-resolutions */
|
||||
|
|
@ -1351,9 +1351,9 @@ static GT68xx_Model genius_vivid1200x_model = {
|
|||
SANE_FIX (2.0), /* Default gamma value */
|
||||
|
||||
SANE_FALSE, /* Is this a CIS scanner? */
|
||||
GT68XX_FLAG_OFFSET_INV | GT68XX_FLAG_ALWAYS_LINEMODE |
|
||||
GT68XX_FLAG_UNTESTED /* Which flags are needed for this scanner? */
|
||||
/* Untested, but is reported to be the same as 1200 XE with additional buttons */
|
||||
GT68XX_FLAG_OFFSET_INV | GT68XX_FLAG_ALWAYS_LINEMODE
|
||||
/* Which flags are needed for this scanner? */
|
||||
/* Tested. */
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -110,11 +110,10 @@ gt68xx_generic_fix_gain (SANE_Int gain)
|
|||
if (gain < 0)
|
||||
gain = 0;
|
||||
else if (gain > 31)
|
||||
{
|
||||
gain = gain / 2 + 32;
|
||||
if (gain > 63)
|
||||
gain = 63;
|
||||
}
|
||||
gain += 12;
|
||||
else if (gain > 51)
|
||||
gain = 63;
|
||||
|
||||
return gain;
|
||||
}
|
||||
|
||||
|
|
@ -465,7 +464,7 @@ gt68xx_generic_setup_scan (GT68xx_Device * dev,
|
|||
DBG (6,
|
||||
"gt68xx_generic_setup_scan: using pixel mode (GT68XX_FLAG_NO_LINEMODE)\n");
|
||||
}
|
||||
else if (model->is_cis)
|
||||
else if (model->is_cis && !(model->flags & GT68XX_FLAG_CIS_LAMP))
|
||||
{
|
||||
line_mode = SANE_TRUE;
|
||||
DBG (6, "gt68xx_generic_setup_scan: using line mode (CIS)\n");
|
||||
|
|
@ -581,7 +580,7 @@ gt68xx_generic_setup_scan (GT68xx_Device * dev,
|
|||
req[0x08] = LOBYTE (abs_xs);
|
||||
req[0x09] = HIBYTE (abs_xs);
|
||||
req[0x0a] = color_mode_code;
|
||||
if (model->is_cis)
|
||||
if (model->is_cis && !(model->flags & GT68XX_FLAG_CIS_LAMP))
|
||||
req[0x0b] = 0x60;
|
||||
else
|
||||
req[0x0b] = 0x20;
|
||||
|
|
|
|||
|
|
@ -681,7 +681,7 @@ gt68xx_scanner_calibrate (GT68xx_Scanner * scanner,
|
|||
req.mds = SANE_TRUE;
|
||||
req.mas = SANE_FALSE;
|
||||
|
||||
if (scanner->dev->model->is_cis)
|
||||
if (scanner->dev->model->is_cis && !(scanner->dev->model->flags & GT68XX_FLAG_CIS_LAMP))
|
||||
req.color = SANE_TRUE;
|
||||
|
||||
if (req.use_ta)
|
||||
|
|
@ -897,7 +897,7 @@ gt68xx_scanner_read_line (GT68xx_Scanner * scanner,
|
|||
}
|
||||
else
|
||||
{
|
||||
if (scanner->dev->model->is_cis)
|
||||
if (scanner->dev->model->is_cis && !(scanner->dev->model->flags & GT68XX_FLAG_CIS_LAMP))
|
||||
{
|
||||
if (strcmp
|
||||
(scanner->val[OPT_GRAY_MODE_COLOR].s,
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
:backend "gt68xx"
|
||||
:version "1.0-74"
|
||||
:version "1.0-75"
|
||||
:manpage "sane-gt68xx"
|
||||
:url "http://www.meier-geinitz.de/sane/gt68xx-backend/"
|
||||
:comment "Only the USB scanners mentioned below are supported. For other Mustek BearPaws, look at the Plustek and the MA-1509 backend."
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
:model "1200CUS"
|
||||
:status :basic
|
||||
:interface "USB"
|
||||
:comment "Works, but is slow. Maybe a Mustek BearPaw 2400 CU clone?"
|
||||
:comment "Works, but is slow. Probably a Mustek BearPaw 2400 CU clone."
|
||||
|
||||
; -----------------------------------------------------------------------------
|
||||
|
||||
|
|
@ -61,27 +61,22 @@
|
|||
:model "Colorpage Vivid4"
|
||||
:status :good
|
||||
:interface "USB"
|
||||
:comment "Works."
|
||||
|
||||
:model "Colorpage Vivid4x"
|
||||
:status :good
|
||||
:interface "USB"
|
||||
:comment "Works."
|
||||
|
||||
:model "Colorpage Vivid4xe"
|
||||
:status :basic
|
||||
:status :good
|
||||
:interface "USB"
|
||||
:comment "Should work but has limited testing. Please contact me if you own such a device."
|
||||
|
||||
:model "Colorpage Vivid 1200 X"
|
||||
:status :untested
|
||||
:status :good
|
||||
:interface "USB"
|
||||
;:comment "Untested. Please tell us if the scanner works!"
|
||||
|
||||
:model "Colorpage Vivid 1200 XE"
|
||||
:status :good
|
||||
:interface "USB"
|
||||
;:comment ""
|
||||
|
||||
; -----------------------------------------------------------------------------
|
||||
|
||||
|
|
@ -153,12 +148,6 @@
|
|||
:model "BearPaw 1200 CU Plus"
|
||||
:interface "USB"
|
||||
:status :good
|
||||
:comment "Product id 0x021c"
|
||||
|
||||
:model "BearPaw 1200 CU Plus"
|
||||
:interface "USB"
|
||||
:status :good
|
||||
:comment "Procuct id 0x021b."
|
||||
|
||||
:model "BearPaw 1200 TA"
|
||||
:interface "USB"
|
||||
|
|
@ -197,12 +186,12 @@
|
|||
:model "BearPaw 2448 CS Plus"
|
||||
:interface "USB"
|
||||
:status :basic
|
||||
:comment "Same as 2448 TA Plus, but without TA."
|
||||
:comment "Slow. Same as 2448 TA Plus, but without TA."
|
||||
|
||||
:model "BearPaw 2448 TA Plus"
|
||||
:interface "USB"
|
||||
:status :basic
|
||||
:comment "Transparency adapter supported. Slow. Brightness depends on resolution?"
|
||||
:comment "Slow. Transparency adapter supported. Slow. Brightness depends on resolution?"
|
||||
|
||||
:model "Plug-n-Scan 2400 MT"
|
||||
:interface "USB"
|
||||
|
|
@ -230,7 +219,7 @@
|
|||
:model "ScanExpress 2400 USB"
|
||||
:interface "USB"
|
||||
:status :minimal
|
||||
:comment "Should be detected but may need some more work in the code. Testers welcome."
|
||||
:comment "Should be detected but may need some more work in the code. Testers welcome. Please contact me if you own this scanner."
|
||||
|
||||
:model "ScanMagic 1200 UB Plus"
|
||||
:interface "USB"
|
||||
|
|
@ -249,12 +238,7 @@
|
|||
:model "Diamond 1200 Plus"
|
||||
:status :good
|
||||
:interface "USB"
|
||||
:comment "Product id 0x021c. Similar to Mustek BearPaw 1200 Plus"
|
||||
|
||||
:model "Diamond 1200 Plus"
|
||||
:status :good
|
||||
:interface "USB"
|
||||
:comment "Product id 0x021b. Similar to Mustek BearPaw 1200 Plus"
|
||||
:comment "Similar to Mustek BearPaw 1200 Plus"
|
||||
|
||||
:model "Diamond 2450"
|
||||
:status :good
|
||||
|
|
|
|||
|
|
@ -1,5 +1,14 @@
|
|||
gt68xx.CHANGES -*-text-*-
|
||||
|
||||
V 1.0.75 (2005-09-01)
|
||||
|
||||
* Genius ColorPage Vivid 1200 X is reported to work.
|
||||
* Genius ColorPage Vivid 4 XE seems to be the same as 4 X, it just doesn't have
|
||||
buttons.
|
||||
* Cleanup of .desc file.
|
||||
* Fixed gain setting.
|
||||
* Mustek ScanExpress A3 USB 600 dpi color scanning works now.
|
||||
|
||||
V 1.0.74 (2005-08-20)
|
||||
|
||||
* Increased number limit of scanners that can work with this backend to 50.
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue