umax backend build 38

DEVEL_2_0_BRANCH-1
Oliver Rauch 2002-10-16 15:03:41 +00:00
rodzic f82c69e727
commit 9a266515f9
3 zmienionych plików z 19 dodań i 3 usunięć

Wyświetl plik

@ -1,3 +1,8 @@
2002-10-16 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
* backend/umax.c, umax-scanner.c: added Power Look 2000
as supported device, build 38
2002-10-15 Gerhard Jaeger <gerhard@gjaeger.de>
* doc/sane-plustek.man: Major update

Wyświetl plik

@ -105,7 +105,7 @@ static char *scanner_str[] =
"UMAX ", "Mirage II ",
"UMAX ", "Mirage IIse ",
"UMAX ", "PL-II ",
/* "UMAX ", "PowerLook 2000 ", */
"UMAX ", "Power Look 2000 ",
"UMAX ", "PowerLook 2100XL",
"UMAX ", "PowerLook III ",
"UMAX ", "PowerLook 3000 ",

Wyświetl plik

@ -49,7 +49,7 @@
/* --------------------------------------------------------------------------------------------------------- */
#define BUILD 37
#define BUILD 38
/* --------------------------------------------------------------------------------------------------------- */
@ -2921,6 +2921,17 @@ static void umax_correct_inquiry(Umax_Device *dev, char *vendor, char *product,
DBG(DBG_warning," - adding calibration width offset for batch scanning of %d pixels\n", dev->calibration_width_offset_batch);
}
}
else if (!strncmp(product, "Power Look 2000", 15))
{
DBG(DBG_warning,"setting up special options for %s\n", product);
if (dev->calibration_width_offset == -99999) /* no calibration-width-offset defined in umax.conf */
{
dev->calibration_width_offset = 52;
DBG(DBG_warning," - adding calibration width offset of %d pixels\n", dev->calibration_width_offset);
}
/* calibration_area = image */
}
else if (!strncmp(product, "PowerLook 2100XL", 16))
{
DBG(DBG_warning,"setting up special options for %s\n", product);
@ -5956,8 +5967,8 @@ SANE_Status sane_init(SANE_Int *version_code, SANE_Auth_Callback authorize)
else if (umax_test_configure_option(option_str, "slow-speed", &umax_slow, -1, 1));
else if (umax_test_configure_option(option_str, "care-about-smearing", &umax_smear, -1, 1));
else if (umax_test_configure_option(option_str, "calibration-full-ccd", &umax_calibration_area, -1, 1));
else if (umax_test_configure_option(option_str, "calibration-width-offset", &umax_calibration_width_offset, -99999, 65535));
else if (umax_test_configure_option(option_str, "calibration-width-offset-batch", &umax_calibration_width_offset_batch, -99999, 65535));
else if (umax_test_configure_option(option_str, "calibration-width-offset", &umax_calibration_width_offset, -99999, 65535));
else if (umax_test_configure_option(option_str, "calibration-bytes-pixel", &umax_calibration_bytespp, -1, 2));
else if (umax_test_configure_option(option_str, "exposure-time-rgb-bind", &umax_exposure_time_rgb_bind, -1, 1));
else if (umax_test_configure_option(option_str, "invert-shading-data", &umax_invert_shading_data, -1, 1));