diff --git a/backend/umax-scanner.c b/backend/umax-scanner.c
index f94bfbdc9..11843f936 100644
--- a/backend/umax-scanner.c
+++ b/backend/umax-scanner.c
@@ -92,7 +92,6 @@ static char *scanner_str[] =
"UMAX ", "UMAX S-12G ",
"UMAX ", "SuperVista S-12 ",
"UMAX ", "PSD ",
- "UMAX ", "PL-II ",
"UMAX ", "Astra 600S ",
"UMAX ", "Astra 610S ",
"UMAX ", "Astra 1200S ",
@@ -100,10 +99,12 @@ static char *scanner_str[] =
"UMAX ", "Astra 2100S ",
"UMAX ", "Astra 2200 ",
"UMAX ", "Astra 2400S ",
+/* "UMAX ", "Astra 6400 ", */ /* this is a firewire scanner */
+/* "UMAX ", "Astra 6450 ", */ /* this is a firewire scanner */
"UMAX ", "Mirage D-16L ",
"UMAX ", "Mirage II ",
"UMAX ", "Mirage IIse ",
-/* "UMAX ", "PL-II ", */
+ "UMAX ", "PL-II ",
/* "UMAX ", "PowerLook 2000 ", */
"UMAX ", "PowerLook III ",
"UMAX ", "PowerLook 3000 ",
@@ -117,7 +118,8 @@ static char *scanner_str[] =
"Linotype", "SAPHIR4 ",
/* "LinoHell", "OPAL ", */
"HDM ", "LS4H1S ", /* Linoscan 1400 */
- "Nikon ", "AX-210 ",
+ "Nikon ", "AX-110 ", /* is a Vista S6E */
+ "Nikon ", "AX-210 ", /* is a Supervista S12 */
"KYE ", "ColorPage-HR5 ",
"EPSON ", "Perfection600 ",
"ESCORT ", "Galleria 600S ", /* is an Astra 600S */
diff --git a/backend/umax.c b/backend/umax.c
index d4a20435b..6d355d2e6 100644
--- a/backend/umax.c
+++ b/backend/umax.c
@@ -49,7 +49,7 @@
/* --------------------------------------------------------------------------------------------------------- */
-#define BUILD 31
+#define BUILD 32
/* --------------------------------------------------------------------------------------------------------- */
@@ -192,16 +192,14 @@ static int umax_scsi_maxqueue = 2; /* use command queueing depth 2 as default */
static int umax_handle_bad_sense_error = 0; /* default: handle bad sense error code as device busy */
static int umax_execute_request_sense = 0; /* default: do not use request sense in do_calibration */
static int umax_force_preview_bit_rgb = 0; /* default: do not force preview bit in real color scan */
-
-/* predefine fast scan, used by most scanners */
static int umax_slow = -1; /* don`t use slow scanning speed */
static int umax_smear = -1; /* don`t care about image smearing problem */
-
static int umax_calibration_area = -1; /* -1=auto, 0=calibration on image, 1=calibration for full ccd */
static int umax_calibration_width_offset = -99999; /* -99999=auto */
static int umax_calibration_bytespp = -1; /* -1=auto */
static int umax_invert_shading_data = -1; /* -1=auto */
static int umax_lamp_control_available = 0; /* 0=disabled */
+static int umax_gamma_lsb_padded = -1; /* -1=auto */
/* ------------------------------------------------------------ CALIBRATION MODE --------------------------- */
@@ -2465,7 +2463,13 @@ static void umax_correct_inquiry(Umax_Device *dev, char *vendor, char *product,
}
else if (!strncmp(product, "Astra 1220S ", 12))
{
- DBG(DBG_warning,"using standard options for %s\n", product);
+ DBG(DBG_warning,"setting up special options for %s\n", product);
+
+ if (dev->gamma_lsb_padded == -1) /* nothing defined in umax.conf and not by backend */
+ {
+ DBG(DBG_warning," - 16 bit gamma table is created lsb padded\n");
+ dev->gamma_lsb_padded = 1;
+ }
}
else if (!strncmp(product, "Astra 2100S ", 12))
{
@@ -2955,7 +2959,7 @@ static int umax_check_values(Umax_Device *dev)
if (dev->y_resolution > dev->relevant_optical_res)
{
dev->scale_y = 2;
- }
+ }
else if (dev->y_resolution > dev->relevant_optical_res/2)
{
dev->scale_y = 1;
@@ -4071,6 +4075,7 @@ static void umax_init(Umax_Device *dev) /* umax_init is called once while
dev->calibration_bytespp = umax_calibration_bytespp;
dev->invert_shading_data = umax_invert_shading_data;
dev->lamp_control_available = umax_lamp_control_available;
+ dev->gamma_lsb_padded = umax_gamma_lsb_padded;
DBG(DBG_info, "request_scsi_maxqueue = %d\n", dev->request_scsi_maxqueue);
DBG(DBG_info, "request_preview_lines = %d\n", dev->request_preview_lines);
@@ -4359,6 +4364,11 @@ static SANE_Status attach_scanner(const char *devicename, Umax_Device **devp)
dev->invert_shading_data = 0;
}
+ if (dev->gamma_lsb_padded == -1) /* nothing defined in umax.conf and not by backend */
+ {
+ dev->gamma_lsb_padded = 0;
+ }
+
umax_get_inquiry_values(dev);
umax_print_inquiry(dev);
DBG(DBG_inquiry,"\n");
@@ -5486,6 +5496,7 @@ SANE_Status sane_init(SANE_Int *version_code, SANE_Auth_Callback authorize)
else if (umax_test_configure_option(option_str, "calibration-bytes-pixel", &umax_calibration_bytespp, -1, 2));
else if (umax_test_configure_option(option_str, "invert-shading-data", &umax_invert_shading_data, -1, 1));
else if (umax_test_configure_option(option_str, "lamp-control-available", &umax_lamp_control_available, 0, 1));
+ else if (umax_test_configure_option(option_str, "gamma-lsb-padded", &umax_gamma_lsb_padded, -1, 1));
else
{
DBG(DBG_error,"ERROR: unknown option \"%s\" in %s\n", option_str, UMAX_CONFIG_FILE);
@@ -6088,7 +6099,6 @@ SANE_Status sane_control_option(SANE_Handle handle, SANE_Int option, SANE_Action
}
scanner->output_range.min = 0;
- scanner->output_range.max = (int) pow(2, scanner->val[option].w) - 1;
scanner->output_range.quant = 0;
if (scanner->val[option].w == 8) /* 8 bit mode */
@@ -6099,9 +6109,18 @@ SANE_Status sane_control_option(SANE_Handle handle, SANE_Int option, SANE_Action
else /* > 8 bit mode */
{
scanner->output_bytes = 2; /* 2 bytes output */
- scanner->output_range.max = 65535;
+
+ if (scanner->device->gamma_lsb_padded) /* e.g. astra 1220s need lsb padded data */
+ {
+ scanner->output_range.max = (int) pow(2, scanner->val[option].w) - 1;
+ }
+ else
+ {
+ scanner->output_range.max = 65535; /* define maxval for msb padded data */
+ }
}
+
if (info)
{
*info |= SANE_INFO_RELOAD_PARAMS;
diff --git a/backend/umax.conf b/backend/umax.conf
index 26586cd43..9d0f0a767 100644
--- a/backend/umax.conf
+++ b/backend/umax.conf
@@ -18,6 +18,7 @@ scsi LinoHell Office
scsi LinoHell Office2
scsi LinoHell SAPHIR2
scsi HDM LS4H1S
+scsi Nikon AX-110
scsi Nikon AX-210
scsi KYE ColorPage-HR5
scsi EPSON Perfection600
diff --git a/backend/umax.desc b/backend/umax.desc
index d2cb3bbcc..e052d494c 100644
--- a/backend/umax.desc
+++ b/backend/umax.desc
@@ -10,117 +10,233 @@
;
:backend "umax" ; name of backend
-:version "1.01-build-3" ; version of backend
+:version "1.0-31" ; version of backend
:status :stable ; :alpha, :beta, :stable, :new
:manpage "sane-umax" ; name of manpage (if it exists)
-:url "http://www.wolfsburg.de/~rauch/sane/sane-umax.html" ; backend's web page
+:url "http://www.rauch-domain.de/sane-umax/index.html" ; backend's web page
:devicetype :scanner ; start of a list of devices....
; other types: :stillcam, :vidcam,
; :meta, :api
:mfg "UMAX" ; name a manufacturer
-:url "http://support.umax.co.uk/"
:url "http://www.umax.com/"
:url "http://support.umax.com/"
:url "http://www.umax.de/"
:url "http://www.umax.com.tw/"
:url "http://www.umaxweb.com.tw/"
+:url "http://support.umax.co.uk/"
:model "parallel scanners" ; name models for above-specified mfg.
-:comment "Not supported!!!"
+:interface "Parport"
+:comment "Not supported - see backend umax_pp"
+:model "USB scanners"
+:interface "USB"
+:comment "Not supported - see backend umax1220u"
+:model "firewire scanners"
+:interface "Firewire"
+:comment "not tested"
:model "Vista S6"
+:interface "SCSI"
:comment "OK"
:model "Vista S6E"
+:interface "SCSI"
:comment "OK"
:model "UMAX S-6E"
+:interface "SCSI"
:comment "OK"
:model "UMAX S-6EG"
+:interface "SCSI"
:comment "OK"
:model "Vista-S8"
-:comment "Not tested"
+:interface "SCSI"
+:comment "OK"
:model "Supervista S-12"
+:interface "SCSI"
:comment "OK"
:model "UMAX S-12"
+:interface "SCSI"
:comment "OK"
:model "UMAX S-12G"
+:interface "SCSI"
:comment "OK"
:model "Astra 600S"
+:interface "SCSI"
:comment "OK"
:model "Astra 610S"
+:interface "SCSI"
:comment "OK"
:model "Astra 1200S"
+:interface "SCSI"
:comment "OK"
:model "Astra 1220S"
+:interface "SCSI"
:comment "OK"
-:model "UC 630"
-:comment "Version 1.6 OK, others only lineart OK"
-:model "UG 630"
+:model "Astra 2100S"
+:interface "SCSI"
:comment "OK"
-:model "UG 80"
+:model "Astra 2200 (SU)"
+:interface "SCSI"
+:comment "OK"
+:model "Astra 2400S"
+:interface "SCSI"
+:comment "OK"
+:model "Astra 6400"
+:interface "IEEE-1394"
+:comment "not tested"
+:model "Astra 6450"
+:interface "IEEE-1394"
+:comment "not tested"
+:model "Astra MX3"
+:interface "SCSI"
+:comment "OK"
+:model "Mirage D-16L"
+:interface "SCSI"
:comment "OK"
-:model "UC 840"
-:comment "Version 1.6 OK, others only lineart OK"
-:model "UC 1200S"
-:comment "does not work (firmware version ?)"
-:model "UC 1200SE"
-:comment "?"
-:model "UC 1260"
-:comment "Version 1.6 OK, others unknown"
-:model "Mirage"
-:comment "Not tested"
:model "Mirage II"
-:comment "Not tested"
+:interface "SCSI"
+:comment "OK"
:model "Mirage IIse"
+:interface "SCSI"
:comment "Not tested"
-:model "Vista-T630"
-:comment "OK for some firmwareversions, on others only lineart OK"
:model "PSD"
+:interface "SCSI"
:comment "OK"
:model "PowerLook"
+:interface "SCSI"
:comment "Not tested"
:model "PL-II"
-:comment "only works with some scanners! (unknown why)"
+:interface "SCSI"
+:comment "Not tested"
:model "PowerLook III"
+:interface "SCSI"
+:comment "OK"
+:model "PowerLook 270"
+:interface "SCSI"
+:comment "not tested"
+:model "PowerLook 270plus"
+:interface "SCSI"
+:comment "not tested"
+:model "PowerLook 1100"
+:interface "IEE-1394"
:comment "Not tested"
:model "PowerLook 2000"
+:interface "SCSI"
+:comment "Not tested"
+:model "PowerLook 2100XL"
+:interface "SCSI"
:comment "Not tested"
:model "PowerLook 3000"
-:comment "Not tested"
-:model "Gemini D-16"
+:interface "SCSI"
:comment "OK"
+:model "Gemini D-16"
+:interface "SCSI"
+:comment "OK"
+:model "UMAX VT600"
+:interface "SCSI"
+:comment "not tested"
+:model "Vista-T630"
+:interface "SCSI"
+:comment "OK for some firmwareversions, on others only lineart OK"
+:model "UC 630"
+:interface "SCSI"
+:comment "Version 2.8 OK, others only lineart OK"
+:model "UG 630"
+:interface "SCSI"
+:comment "OK"
+:model "UG 80"
+:interface "SCSI"
+:comment "OK"
+:model "UC 840"
+:interface "SCSI"
+:comment "Version 1.6 OK, others only lineart OK"
+:model "UC 1200S"
+:interface "SCSI"
+:comment "unknown - please try"
+:model "UC 1200SE"
+:interface "SCSI"
+:comment "Version 3.0 OK, others unknown"
+:model "UC 1260"
+:interface "SCSI"
+:comment "Version 1.6 OK, others unknown"
:mfg "Linotype Hell" ; another manufacturer...
+:url "http://www.heidelberg-cps.com/"
:model "Jade"
+:interface "SCSI"
:comment "OK, SCSI-ID=LinoHell Office"
+:model "Jade"
+:interface "SCSI"
+:comment "OK, SCSI-ID=LinoHell JADE"
:model "Jade2"
+:interface "SCSI"
:comment "OK, SCSI-ID=LinoHell Office2"
:model "Saphir"
+:interface "SCSI"
:comment "Not tested"
:model "Saphir2"
+:interface "SCSI"
:comment "OK, SCSI-ID=LinoHell SAPHIR2"
:model "Saphir Ultra"
+:interface "SCSI"
:comment "Not tested"
:model "Saphir Ultra II"
+:interface "SCSI"
:comment "Not tested"
:model "Saphir HiRes"
+:interface "SCSI"
:comment "Not tested"
:model "Opal"
+:interface "SCSI"
:comment "Not tested"
:model "Opal Ultra"
+:interface "SCSI"
:comment "Not tested"
+:model "Linoscan 1400"
+:interface "SCSI"
+:comment "OK, SCSI-ID=HDM LS4H1S"
:mfg "Vobis/Highscreen"
+:url "http://www.vobis.de/"
:model "Scanboostar Premium"
+:interface "SCSI"
:comment "OK, SCSI-ID=LinoHell Office2"
+:mfg "EDGE" ; another manufacturer...
+; :url "http://???/"
+:model "KTX-9600US"
+:interface "SCSI"
+:comment "no feedback"
+
+:mfg "Epson" ; another manufacturer...
+:url "http://www.epson.com/"
+:model "Perfection 600"
+:interface "SCSI"
+:comment "OK, SCSI-ID=EPSON Perfection600"
+
:mfg "Escom" ; another manufacturer...
:model "Image Scanner 256"
+:interface "SCSI"
:comment "OK, SCSI-ID=UMAX UG 80"
-:mfg "Nikon" ; another manufacturer...
-:model "AX-210"
-:comment "OK"
+:mfg "Escort" ; another manufacturer...
+:model "Galleria 600"
+:interface "SCSI"
+:comment "untested, SCSI-ID=ESCORT Galleria 600S"
+:mfg "Genius" ; another manufacturer...
+:url "http://www.genius.kye.de/"
+:model "ColorPage-HR5 (Pro)"
+:interface "SCSI"
+:comment "OK, SCSI-ID=KYE ColorPage-HR5"
+
+:mfg "Nikon" ; another manufacturer...
+:url "http://www.nikon.com/"
+:model "Scantouch 110 / AX-110"
+:interface "SCSI"
+:comment "?"
+:model "AX-210"
+:interface "SCSI"
+:comment "OK"
; :comment and :url specifiers are optional after :mfg, :model, :desc,
; and at the top-level.
diff --git a/backend/umax.h b/backend/umax.h
index d035fb130..b6b48d848 100644
--- a/backend/umax.h
+++ b/backend/umax.h
@@ -451,6 +451,7 @@ typedef struct Umax_Device
int pause_after_reposition; /* pause for repositioning in ms */
int pause_for_moving; /* pause for moving scanhead over full scanarea in ms */
int lamp_control_available; /* is set when scanner supportes lamp control */
+ int gamma_lsb_padded; /* 16 bit gamma data is padded to lsb */
#ifdef HAVE_SANEI_IPC
sanei_ipc *ipc;
diff --git a/doc/umax/sane-umax-astra-doc.html b/doc/umax/sane-umax-astra-doc.html
index ec7326dfb..1b2334937 100644
--- a/doc/umax/sane-umax-astra-doc.html
+++ b/doc/umax/sane-umax-astra-doc.html
@@ -135,7 +135,7 @@ Supported scanners:
|
-X
+UTA-2a
|
@@ -219,7 +219,7 @@ Supported scanners:
|
-X
+UTA-2a
|
@@ -261,7 +261,7 @@ Supported scanners:
|
-X
+UTA-3a
|
@@ -303,7 +303,7 @@ Supported scanners:
|
-X
+UTC-2100
|
@@ -346,7 +346,7 @@ Supported scanners:
|
-incl
+incl
|
@@ -388,7 +388,7 @@ Supported scanners:
|
-X
+UTA-2400
|
@@ -416,6 +416,93 @@ Supported scanners:
|
+
+
+|
+Astra 6400
+ |
+
+
+Astra 6400
+ |
+
+
+?
+***
+ |
+
+
+X
+ |
+
+
+
+ |
+
+
+?
+ |
+
+
+?
+ |
+
+
+?
+ |
+
+
+1,8,14,24,42
+ |
+
+
+600 x 1200
+ |
+
+
+
+|
+Astra 6450
+ |
+
+
+Astra 6450
+ |
+
+
+?
+***
+ |
+
+
+incl
+ |
+
+
+
+ |
+
+
+?
+ |
+
+
+?
+ |
+
+
+?
+ |
+
+
+1,8,14,24,42
+ |
+
+
+600 x 1200
+ |
+
+
|
Astra MX3
@@ -431,7 +518,7 @@ Supported scanners:
|
-X
+UTC-2100?
|
@@ -459,12 +546,15 @@ Supported scanners:
|
+
* Astra 1200S-C with external power supply and Firmware Version 2.9 could make problems.
** Astra 2200 and MX3 are supported via SCSI. Connection via the USB bus not tested.
+
+*** Astra 6400 and 6450 are firewire scanners: not tested.
UTA = Umax Transparancy Adapter, ADF = Automatic Document Feeder
@@ -472,10 +562,11 @@ Supported scanners:
-This page has been changed on 12th. february 2001
+This page has been changed on 16th. december 2001
+
diff --git a/doc/umax/sane-umax-powerlook-doc.html b/doc/umax/sane-umax-powerlook-doc.html
index 41d802799..9ac245145 100644
--- a/doc/umax/sane-umax-powerlook-doc.html
+++ b/doc/umax/sane-umax-powerlook-doc.html
@@ -177,7 +177,7 @@ Supported scanners:
-X
+UTA-II
|
@@ -205,6 +205,7 @@ Supported scanners:
|
+
|
Power Look III
@@ -219,7 +220,7 @@ Supported scanners:
|
-X
+UTA-III
|
@@ -247,6 +248,137 @@ Supported scanners:
|
+
+
+|
+PowerLook 270
+ |
+
+
+unknown
+ |
+
+
+?
+ |
+
+
+incl
+ |
+
+
+
+ |
+
+
+?
+ |
+
+
+?
+ |
+
+
+?
+ |
+
+
+1,8,14,24,42
+ |
+
+
+2700 x 2700
+ |
+
+
+
+
+|
+PowerLook 270plus
+ |
+
+
+unknown
+ |
+
+
+?
+ |
+
+
+incl
+ |
+
+
+
+ |
+
+
+?
+ |
+
+
+?
+ |
+
+
+?
+ |
+
+
+1,8,14,24,42
+ |
+
+
+2700 x 2700
+ |
+
+
+
+
+|
+PowerLook 1100
+ |
+
+
+unknown
+ |
+
+
+?
+*
+ |
+
+
+incl
+ |
+
+
+
+ |
+
+
+?
+ |
+
+
+?
+ |
+
+
+?
+ |
+
+
+1,8,14,24,42
+ |
+
+
+1200 x 2400
+ |
+
+
+
|
PowerLook 2000
@@ -289,6 +421,50 @@ Supported scanners:
|
+
+
+|
+PowerLook 2100XL
+ |
+
+
+unknown
+ |
+
+
+?
+ |
+
+
+UTA-2100XL
+ |
+
+
+
+ |
+
+
+?
+ |
+
+
+?
+ |
+
+
+?
+ |
+
+
+1,8,14,24,42
+ |
+
+
+800 x 1600
+ |
+
+
+
|
PowerLook 3000
@@ -332,57 +508,21 @@ Supported scanners:
|
-
-|
-PowerLook 1600XL
- |
-
-
-unknown
- |
-
-
-?
- |
-
-
-incl
- |
-
-
-
- |
-
-
-?
- |
-
-
-?
- |
-
-
-?
- |
-
-
-1,8,14,24,42
- |
-
-
-800 x 1600
- |
-
-UTA = Umax Transparancy Adapter, ADF = Automatic Document Feeder
-
(X = supported by scanner, incl = is included)
+
+* Powerlook 1100 is a firewire scanner: not tested
+
+
+UTA = Umax Transparancy Adapter, ADF = Automatic Document Feeder
+
+(X = supported by scanner, incl = is included)
-
This page has been changed on 12th. february 2001
+
This page has been changed on 16th. decemnber 2001
diff --git a/doc/umax/sane-umax-vista-doc.html b/doc/umax/sane-umax-vista-doc.html
index 0b9155d37..49148a303 100644
--- a/doc/umax/sane-umax-vista-doc.html
+++ b/doc/umax/sane-umax-vista-doc.html
@@ -136,7 +136,7 @@ Supported scanners:
-X
+UTA-V6
|
@@ -178,7 +178,7 @@ Supported scanners:
|
-X
+UTA-V6
|
@@ -220,7 +220,7 @@ Supported scanners:
|
-X
+UTA-V6
|
@@ -262,7 +262,7 @@ Supported scanners:
|
-X
+UTA-V6
|
@@ -304,7 +304,7 @@ Supported scanners:
|
-X
+UTA-V6?
|
@@ -346,7 +346,7 @@ Supported scanners:
|
-X
+UTA-V12
|
@@ -388,7 +388,7 @@ Supported scanners:
|
-X
+UTA-V12
|
@@ -430,7 +430,7 @@ Supported scanners:
|
-X
+UTA-V12
|
diff --git a/doc/umax/umax.CHANGES b/doc/umax/umax.CHANGES
index a3d19f94e..60451d50f 100644
--- a/doc/umax/umax.CHANGES
+++ b/doc/umax/umax.CHANGES
@@ -985,8 +985,8 @@ build-28 -> build-29
* set minimum resolution to 5 (was 1 before what could make problems)
-build-29 -> build-30 (sane-1.0.6)
----------------------------------
+build-29 -> build-30
+--------------------
* added EDGE KTX-9600US as supported scanner
@@ -994,8 +994,8 @@ build-29 -> build-30 (sane-1.0.6)
if not necessary
-build-30 -> build-31
---------------------
+build-30 -> build-31 (sane-1.0.6)
+---------------------------------
* sane-umax.man uses @LIBDIR@ and @CONFIGFIR@
@@ -1008,3 +1008,15 @@ build-30 -> build-31
for UMAX Supervista S-12, LinoHell Office and LinHell JADE
+
+build-31 -> build-32
+--------------------
+
+ * added Nikon AX-110 as supported scanner (Vista S6E)
+
+ * added umax.conf option "gamma-lsb-padded" with options:
+ -1 = auto
+ 0 = inactive (msb padded)
+ 1 = active (lsb padded)
+ activated for astra 1220s, internal 12 bit gamma correction does work now
+
|