From f723898b2bb53d19f44f81b299a6a151844c9a28 Mon Sep 17 00:00:00 2001
From: Henning Geinitz <sane@geinitz.org>
Date: Mon, 19 Apr 2004 18:01:48 +0000
Subject: [PATCH] Minor fixes for Mustek BearPaw 2448 TA Plus.

---
 ChangeLog                    |  6 ++++++
 backend/gt68xx.c             |  2 +-
 backend/gt68xx_devices.c     | 16 ++++++++--------
 doc/descriptions/gt68xx.desc | 10 +++++-----
 doc/gt68xx/gt68xx.CHANGES    | 10 ++++++++++
 5 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7e0b87130..e70850a86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-19  Henning Meier-Geinitz <henning@meier-geinitz.de>
+
+	* backend/gt68xx.c backend/gt68xx_devices.c
+	  doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES:
+	  Minor fixes for Mustek BearPaw 2448 TA Plus.
+
 2004-04-17  Henning Meier-Geinitz <henning@meier-geinitz.de>
 
 	* acinclude.m4 aclocal.m4 configure: Don't use -ansi on MacOS X.
diff --git a/backend/gt68xx.c b/backend/gt68xx.c
index 7efef5518..280e27ee4 100644
--- a/backend/gt68xx.c
+++ b/backend/gt68xx.c
@@ -48,7 +48,7 @@
 
 #include "../include/sane/config.h"
 
-#define BUILD 59
+#define BUILD 60
 #define MAX_DEBUG
 #define WARMUP_TIME 30
 #define CALIBRATION_HEIGHT 2.5
diff --git a/backend/gt68xx_devices.c b/backend/gt68xx_devices.c
index 7be6bcdd8..1702fea5a 100644
--- a/backend/gt68xx_devices.c
+++ b/backend/gt68xx_devices.c
@@ -315,22 +315,22 @@ static GT68xx_Model mustek_2448taplus_model = {
   1200,				/* if ydpi is equal or higher, use linemode */
   SANE_FALSE,			/* Use base_ydpi for all resolutions */
 
-  {1200, 600, 300, 100, 0},	/* possible x-resolutions */
-  {2400, 1200, 600, 300, 100, 0},	/* possible y-resolutions */
+  {1200, 600, 300, 200, 100, 0},	/* possible x-resolutions */
+  {2400, 1200, 600, 300, 200, 100, 0},	/* possible y-resolutions */
   {16, 12, 8, 0},			/* possible depths in gray mode */
   {16, 12, 8, 0},		/* possible depths in color mode */
 
   SANE_FIX (7.41),		/* Start of scan area in mm  (x) */
   SANE_FIX (7.4),		/* Start of scan area in mm (y) */
-  SANE_FIX (217.5),		/* Size of scan area in mm (x) */
-  SANE_FIX (298.0),		/* Size of scan area in mm (y) */
+  SANE_FIX (216.3),		/* Size of scan area in mm (x) */
+  SANE_FIX (297.5),		/* Size of scan area in mm (y) */
 
   SANE_FIX (0.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (3.5),		/* Start of black mark in mm (x) */
+  SANE_FIX (3.9),		/* Start of black mark in mm (x) */
 
   SANE_FIX (94.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (107.0) /* Start of scan area in TA mode in mm (y) */ ,
-  SANE_FIX (37.0),		/* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (105.0),		/* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (36.0),		/* Size of scan area in TA mode in mm (x) */
   SANE_FIX (165.0),		/* Size of scan area in TA mode in mm (y) */
 
   SANE_FIX (95.0),		/* Start of white strip in TA mode in mm (y) */
@@ -344,7 +344,7 @@ static GT68xx_Model mustek_2448taplus_model = {
   SANE_FIX (2.0),		/* Default gamma value */
 
   SANE_FALSE,			/* Is this a CIS scanner? */
-  GT68XX_FLAG_UNTESTED		/* Which flags are needed for this scanner? */
+  0				/* Which flags are needed for this scanner? */
     /* Based on data from Jakub Dvo?ák <xdvorak@chello.cz>. */
 };
 
diff --git a/doc/descriptions/gt68xx.desc b/doc/descriptions/gt68xx.desc
index 6cdc2bd91..e5e7da9ad 100644
--- a/doc/descriptions/gt68xx.desc
+++ b/doc/descriptions/gt68xx.desc
@@ -1,5 +1,5 @@
 :backend "gt68xx"
-:version "1.0-59"
+:version "1.0-60"
 :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."
@@ -185,13 +185,13 @@
 
 :model "BearPaw 2448 CS Plus"
 :interface "USB"
-:status :basic
-:comment "Limited testing only. Please contact me if you own such a device."
+:status :good
+:comment "Actually untested, but should be the same as 2448 TA Plus, but without TA."
 
 :model "BearPaw 2448 TA Plus"
 :interface "USB"
-:status :basic
-:comment "With transparency adapter. Limited testing. Please contact me if you own such a device."
+:status :good
+:comment "Transparency adapter supported. Brightness depends on resolution?"
 
 :model "Plug-n-Scan 2400 MT"
 :interface "USB"
diff --git a/doc/gt68xx/gt68xx.CHANGES b/doc/gt68xx/gt68xx.CHANGES
index b8d8207b1..cc27c2275 100644
--- a/doc/gt68xx/gt68xx.CHANGES
+++ b/doc/gt68xx/gt68xx.CHANGES
@@ -1,5 +1,15 @@
 gt68xx.CHANGES -*-text-*-
 
+V 1.0-60 (2004-04-19)
+
+* Mustek BearPaw 2448 TA PLUS:
+  - Fixed resolution settings (added missinf 200 dpi mode)
+  - Fixed margins
+  - Fixed black mark
+  - Fixed TA margins
+  - Removed untested flag
+  - Changed status to "good"
+
 V 1.0-59 (2004-04-10)
 
 * Used 0, 4, 4 as linedistance for Mustek A3 USB.