diff --git a/ChangeLog b/ChangeLog index c1d344b65..c3c9b8c17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-09-18 Henning Meier-Geinitz + + * backend/gt68xx.c backend/gt68xx_high.c + doc/descriptions/gt68xx.descdoc/gt68xx/gt68xx.CHANGES + doc/gt68xx/gt68xx.TODO: Fixed segfault that may happen with + Mustek ScanExpress A3 USB. + 2005-09-17 Mattias Ellert * README.darwin: New date for good libusb from CVS diff --git a/backend/gt68xx.c b/backend/gt68xx.c index 3dc363401..6ee0f8b00 100644 --- a/backend/gt68xx.c +++ b/backend/gt68xx.c @@ -48,7 +48,7 @@ #include "../include/sane/config.h" -#define BUILD 75 +#define BUILD 76 #define MAX_DEBUG #define WARMUP_TIME 60 #define CALIBRATION_HEIGHT 2.5 diff --git a/backend/gt68xx_high.c b/backend/gt68xx_high.c index f18b05b66..63fefde8d 100644 --- a/backend/gt68xx_high.c +++ b/backend/gt68xx_high.c @@ -1705,6 +1705,7 @@ gt68xx_afe_cis_read_lines (GT68xx_Afe_Values * values, values->scan_dpi = params.xdpi; values->calwidth = params.pixel_xs; values->callines = params.pixel_ys; + values->start_black = scanner->dev->model->x_offset_mark; return SANE_STATUS_GOOD; } diff --git a/doc/descriptions/gt68xx.desc b/doc/descriptions/gt68xx.desc index aafd8cc7b..9d4589fcd 100644 --- a/doc/descriptions/gt68xx.desc +++ b/doc/descriptions/gt68xx.desc @@ -1,5 +1,5 @@ :backend "gt68xx" -:version "1.0-75" +:version "1.0-76" :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." diff --git a/doc/gt68xx/gt68xx.CHANGES b/doc/gt68xx/gt68xx.CHANGES index 2bb779be1..7ed8c6e2d 100644 --- a/doc/gt68xx/gt68xx.CHANGES +++ b/doc/gt68xx/gt68xx.CHANGES @@ -1,5 +1,9 @@ gt68xx.CHANGES -*-text-*- +V 1.0.76 (2005-09-18) + +* Fixed segfault that may happen with Mustek ScanExpress A3 USB. + V 1.0.75 (2005-09-01) * Genius ColorPage Vivid 1200 X is reported to work. diff --git a/doc/gt68xx/gt68xx.TODO b/doc/gt68xx/gt68xx.TODO index 664ef0e9b..dfb802f82 100644 --- a/doc/gt68xx/gt68xx.TODO +++ b/doc/gt68xx/gt68xx.TODO @@ -83,7 +83,6 @@ Mustek ScanExpress A3 USB - still slight vert. stripes - why is line distance setup necessary? - exposure doesn't seem to have any effect -- 600 dpi color produces random garbage after about 800 lines. Scanhead stops. Mustek ScanExpress 1248 UB ok