update to sane-umax build 39

RELEASE_1_0_11_BRANCH
Oliver Rauch 2003-01-07 18:18:46 +00:00
rodzic bb778b2f56
commit 0b681c7438
2 zmienionych plików z 13 dodań i 3 usunięć

Wyświetl plik

@ -1,3 +1,6 @@
2003-01-07 Oliver Rauch <Oliver.Rauch@Rauch-Domain.DE>
* backend/umax.c: update to build 39
2003-01-07 Peter Fales <peter@fales-lorenz.net> 2003-01-07 Peter Fales <peter@fales-lorenz.net>
* backend/dc210.c, backend/dc240.c: Use a more portable way * backend/dc210.c, backend/dc240.c: Use a more portable way

Wyświetl plik

@ -49,7 +49,7 @@
/* --------------------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------------------- */
#define BUILD 38 #define BUILD 39
/* --------------------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------------------- */
@ -2557,7 +2557,8 @@ static SANE_Status umax_do_calibration(Umax_Device *dev)
if (width * bytespp > dev->bufsize) if (width * bytespp > dev->bufsize)
{ {
DBG(DBG_error,"ERROR: scsi buffer is to small for one shading line, calibration aborted\n"); DBG(DBG_error,"ERROR: scsi buffer is to small for one shading line, calibration aborted\n");
return SANE_STATUS_NO_MEM; DBG(DBG_error,"=> change umax.conf options scsi-buffer-size-min and scsi-buffer-size-max\n");
return SANE_STATUS_NO_MEM;
} }
/* UMAX S12 sends a kind of uncalibrated image data, bright -> 255, dark -> 0 */ /* UMAX S12 sends a kind of uncalibrated image data, bright -> 255, dark -> 0 */
@ -2927,10 +2928,16 @@ static void umax_correct_inquiry(Umax_Device *dev, char *vendor, char *product,
if (dev->calibration_width_offset == -99999) /* no calibration-width-offset defined in umax.conf */ if (dev->calibration_width_offset == -99999) /* no calibration-width-offset defined in umax.conf */
{ {
dev->calibration_width_offset = 52; dev->calibration_width_offset = 22;
DBG(DBG_warning," - adding calibration width offset of %d pixels\n", dev->calibration_width_offset); DBG(DBG_warning," - adding calibration width offset of %d pixels\n", dev->calibration_width_offset);
} }
/* calibration_area = image */ /* calibration_area = image */
if (dev->calibration_width_offset_batch == -99999) /* no calibration-width-offset for batch scanning defined in umax.conf */
{
dev->calibration_width_offset_batch = 24;
DBG(DBG_warning," - adding calibration width offset for batch scanning of %d pixels\n", dev->calibration_width_offset_batch);
}
} }
else if (!strncmp(product, "PowerLook 2100XL", 16)) else if (!strncmp(product, "PowerLook 2100XL", 16))
{ {