Fixed test to move home sensor at the start of scan. Fixed gray mode linemode

test. That stopped e.g. the Plustek OpticPro U 16 B from working in gray mode.

ChangeLog

@@ -1,3 +1,12 @@
+2004-11-14  Henning Meier-Geinitz <henning@meier-geinitz.de>
+
+	* backend/gt68xx.c backend/gt68xx_devices.c
+	  backend/gt68xx_gt6801.c backend/gt68xx_gt6816.c
+	  doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES: Fixed test
+	  to move home sensor at the start of scan.  Fixed gray mode
+	  linemode test. That stopped e.g. the Plustek OpticPro U 16 B from
+	  working in gray mode.
+
 2004-11-13  Henning Meier-Geinitz <henning@meier-geinitz.de>
 
 	* backend/v4l.c: 64 bit fix from Frank Zago <fzago at austin dot

backend/gt68xx.c

@@ -48,7 +48,7 @@
 
 #include "../include/sane/config.h"
 
-#define BUILD 66
+#define BUILD 67
 #define MAX_DEBUG
 #define WARMUP_TIME 60
 #define CALIBRATION_HEIGHT 2.5
@@ -1342,7 +1342,7 @@ sane_open (SANE_String_Const devicename, SANE_Handle * handle)
 
   RIE (gt68xx_device_get_id (dev));
 
-  if (!(dev->model->flags | GT68XX_FLAG_NO_STOP))
+  if (!(dev->model->flags & GT68XX_FLAG_NO_STOP))
     RIE (gt68xx_device_stop_scan (dev));
 
   RIE (gt68xx_device_get_power_status (dev, &power_ok));
@@ -1736,7 +1736,7 @@ sane_start (SANE_Handle handle)
     }
 
   s->calib = s->val[OPT_QUALITY_CAL].w;
-  if (!(s->dev->model->flags | GT68XX_FLAG_NO_STOP))
+  if (!(s->dev->model->flags & GT68XX_FLAG_NO_STOP))
     RIE (gt68xx_device_stop_scan (s->dev));
 
   RIE (gt68xx_device_carriage_home (s->dev));

backend/gt68xx_devices.c

@@ -1074,8 +1074,7 @@ static GT68xx_Model genius_vivid4_model = {
   SANE_FALSE,			/* Is this a CIS scanner? */
   GT68XX_FLAG_OFFSET_INV | GT68XX_FLAG_NO_POWER_STATUS| GT68XX_FLAG_NO_LINEMODE 
   /* Which flags are needed for this scanner? */
-  /* Untested but as this scanner seems to be very similar to Plustelk U16B it
-     should work. */
+  /* This scanner seems to be very similar to Plustelk U16B and is reported to work. */
 };
 
 
@@ -1126,7 +1125,7 @@ static GT68xx_Model genius_vivid3x_model  = {
 
   SANE_FALSE,			/* Is this a CIS scanner? */
   GT68XX_FLAG_OFFSET_INV 	/* Which flags are needed for this scanner? */
-  /* Tested zo some degree, based on the Plustek OpticPro 1248U*/
+  /* Tested to some degree, based on the Plustek OpticPro 1248U*/
 };
 
 static GT68xx_Model genius_vivid4x_model  = {

backend/gt68xx_gt6801.c

@@ -553,7 +553,7 @@ gt6801_setup_scan (GT68xx_Device * dev,
       GT68xx_Packet req;
       SANE_Byte motor_mode_1, motor_mode_2;
 
-      if ((dev->model->flags & GT68XX_FLAG_NO_LINEMODE) && line_mode)
+      if ((dev->model->flags & GT68XX_FLAG_NO_LINEMODE) && line_mode && color)
 	{
 	  DBG (0, "gt6801_setup_scan: the scanner's memory is too small for "
 	       "that combination of resolution, dpi and width\n");

backend/gt68xx_gt6816.c

@@ -534,7 +534,7 @@ gt6816_setup_scan (GT68xx_Device * dev,
 	  return SANE_STATUS_NO_MEM;
 	}
 
-      if ((dev->model->flags & GT68XX_FLAG_NO_LINEMODE) && line_mode)
+      if ((dev->model->flags & GT68XX_FLAG_NO_LINEMODE) && line_mode && color)
 	{
 	  DBG (0, "gt6816_setup_scan: the scanner's memory is too small for "
 	       "that combination of resolution, dpi and width\n");

doc/descriptions/gt68xx.desc

@@ -1,5 +1,5 @@
 :backend "gt68xx"
-:version "1.0-66"
+:version "1.0-67"
 :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."

doc/gt68xx/gt68xx.CHANGES

@@ -1,5 +1,11 @@
 gt68xx.CHANGES -*-text-*-
 
+V 1.0.67 (2004-11-14)
+
+* Fixed test to move home sensor at the start of scan.
+* Fixed gray mode linemode test. That stopped e.g. the Plustek OpticPro U 16 B
+  from working in gray mode.
+
 V 1.0.66 (2004-10-31)
 
 * Removed unused gain and offset options.