Updated code for Genius Vivid 4x and Mustek ScanExpress A3 USB. Added Genius

Colorpage Vivid3 V2 and Googlegear 2000 as supported devices.

backend/gt68xx.c

@@ -48,7 +48,7 @@
 
 #include "../include/sane/config.h"
 
-#define BUILD 50
+#define BUILD 51
 #define MAX_DEBUG
 #define WARMUP_TIME 30
 #define CALIBRATION_HEIGHT 2.5

backend/gt68xx_devices.c

@@ -779,7 +779,7 @@ static GT68xx_Model mustek_a3usb_model = {
 
   SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
 
-  0, 0, 0,			/* RGB CCD Line-distance correction in pixel */
+  0, 4, 2,			/* RGB CCD Line-distance correction in pixel */
   0,				/* CCD distcance for CCD with 6 lines) */
 
   COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
@@ -1031,14 +1031,14 @@ static GT68xx_Model genius_vivid4x_model  = {
   0, 8, 16,			/* RGB CCD Line-distance correction in pixel */
   0,				/* CCD distcance for CCD with 6 lines) */
 
-  COLOR_ORDER_BGR,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
   {0x1c, 0x29, 0x1c, 0x2c, 0x1c, 0x2b},	/* Default offset/gain */
   {0x157, 0x157, 0x157},	/* Default exposure parameters */
   SANE_FIX (2.0),		/* Default gamma value */
 
   SANE_FALSE,			/* Is this a CIS scanner? */
   GT68XX_FLAG_OFFSET_INV | GT68XX_FLAG_UNTESTED 	/* Which flags are needed for this scanner? */
-  /* Completely unmtested, copied from 3x */
+  /* Mostly untested, copied from 3x, some values from Claudio Filho <filhocf@openoffice.org> */
 };
 
 static GT68xx_Model genius_vivid3xe_model  = {

doc/descriptions/gt68xx.desc

@@ -1,5 +1,5 @@
 :backend "gt68xx"
-:version "1.0-50"
+:version "1.0-51"
 :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."
@@ -46,20 +46,32 @@
 :model "Colorpage Vivid3x"
 :status :good
 :interface "USB"
-:comment "Works but has limited testing"
+;:comment ""
+
+:model "Colorpage Vivid3 V2"
+:status :good
+:interface "USB"
+:comment "Same as Colorpage Vivid3x"
 
 :model "Colorpage Vivid3xe"
-:status :basic
+:status :good
 :interface "USB"
-:comment "Works but has limited testing. Color problems? Reports are welcome."
+;:comment ""
 
 :model "Colorpage Vivid4x"
-:status :untested
+:status :basic
 :interface "USB"
-:comment "Should be detecetd but may not work. Please contact me if you have such a scanner."
+:comment "Should work but has limited testing. Please contact me if you own such a device."
 
 ; -----------------------------------------------------------------------------
 
+:mfg "Googlegear"
+:model "2000"
+:status :good
+:interface "USB"
+:comment "Same as Artec Ultima 2000."
+; -----------------------------------------------------------------------------
+
 :mfg "Lexmark"
 :url "http://www.lexmark.com/"
 :model "X70"
@@ -158,8 +170,8 @@
 
 :model "BearPaw 2448 TA Plus"
 :interface "USB"
-:status :untested
+:status :minimal
-:comment "Untested. Please test and report success or failure to me."
+:comment "Very limited testing. Images don't seem to be ok. Please contact me if you own such a device."
 
 :model "Plug-n-Scan 2400 MT"
 :interface "USB"
@@ -178,7 +190,7 @@
 :model "ScanExpress A3 USB"
 :interface "USB"
 :status :good
-:comment "Should work. I've only few reports so please contact me, if you own such a device and tell me, if you find any problems"
+:comment "Should work but colors may not be perfect yet. I've only few reports so please contact me, if you own such a device and tell me, if you find any problems"
 
 :model "ScanExpress 2400 USB"
 :interface "USB"

doc/gt68xx/gt68xx.CHANGES

@@ -1,5 +1,17 @@
 gt68xx.CHANGES -*-text-*-
 
+V 1.0-51 (2003-12-14)
+
+* Changed color order to RGB vor Genius Vivid 4x. Seems to work now. Updated
+  manpage and .desc.
+* Set linedistance correction to 0, 4, 2 for ScanExpress A3 USB. Not perfect
+  yet but better than before.
+* Added Genius Colorpage Vivid3 V2 and Googlegear 2000 as supported deviced
+  to manpage and .desc.
+* Changed Genius Colorpage Vivid3x status to good as it seems to work now.
+* Changed status of Mustek BearPaw 2448 TA Plus to minimal as it seems to at
+  least scan something.
+
 V 1.0-50 (2003-11-23)
 
 * Added Mustek BearPaw 2448 TA Plus. It's completely untested.

doc/sane-gt68xx.man

@@ -1,4 +1,4 @@
-.TH sane-gt68xx 5 "30 Sept 2003" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH sane-gt68xx 5 "14 Dec 2003" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane-gt68xx
 .SH NAME
 sane-gt68xx \- SANE backend for GT-68XX based USB flatbed scanners
@@ -21,8 +21,14 @@ Fujitsu 1200CUS
 .br
 Genius Colorpage Vivid3x
 .br
+Genius Colorpage Vivid3 V2
+.br
 Genius Colorpage Vivid3xe
 .br
+Genius Colorpage Vivid4x
+.br
+Googlegear 2000
+.br
 Lexmark X70
 .br
 Lexmark X73