From 2c7d3ea4d8d1c0f21de870325ab587f3d4a461fd Mon Sep 17 00:00:00 2001
From: Oliver Schwartz <oliverschwartz@users.sf.net>
Date: Mon, 5 Dec 2005 20:38:23 +0000
Subject: [PATCH] Small bugfix for Benq 5150

---
 ChangeLog               | 6 +++++-
 backend/snapscan-scsi.c | 5 +++++
 backend/snapscan.c      | 5 ++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index aacff9fab..46b3eb250 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-05  Oliver Schwartz <Oliver.Schwartz@gmx.de>
+
+	* backend/snapscan.c backend/snapscan-scsi.c: small bugfix for Benq5150
+
 2005-12-05  Henning Meier-Geinitz <henning@meier-geinitz.de>
 
 	* doc/descriptions/unsupported.desc: Added Canon PIXMA MP170.
@@ -18,7 +22,7 @@
 
 2005-12-04  Oliver Schwartz <Oliver.Schwartz@gmx.de>
 
-	* backend/snapscan.c backend/snapscan.c backend/snapscan-scsi.c
+	* backend/snapscan.h backend/snapscan.c backend/snapscan-scsi.c
 	  backend/snapscan-options.c: Some fixes for Benq 5150
 
 2005-12-03  Peter Fales <peter@fales-lorenz.net>
diff --git a/backend/snapscan-scsi.c b/backend/snapscan-scsi.c
index dd17740c2..8cb509ad6 100644
--- a/backend/snapscan-scsi.c
+++ b/backend/snapscan-scsi.c
@@ -640,6 +640,7 @@ static void release_unit (SnapScan_Scanner *pss)
 #define SEND_LENGTH 10
 #define DTC_HALFTONE 0x02
 #define DTC_GAMMA 0x03
+#define DTC_GAMMA2 0x04
 #define DTC_SPEED 0x81
 #define DTC_CALIBRATION 0x82
 #define DTC_CALIBRATION_BLACK 0x89
@@ -698,6 +699,7 @@ static SANE_Status send (SnapScan_Scanner *pss, u_char dtc, u_char dtcq)
         }
         break;
     case DTC_GAMMA:        /* gamma function */
+    case DTC_GAMMA2:
         switch (dtcq)
         {
         case DTCQ_GAMMA_GRAY8:    /* 8-bit tables */
@@ -1486,6 +1488,9 @@ static SANE_Status download_firmware(SnapScan_Scanner * pss)
 
 /*
  * $Log$
+ * Revision 1.53  2005/12/05 20:38:22  oliver-guest
+ * Small bugfix for Benq 5150
+ *
  * Revision 1.52  2005/12/04 15:03:00  oliver-guest
  * Some fixes for Benq 5150
  *
diff --git a/backend/snapscan.c b/backend/snapscan.c
index 2bc7c16a0..d902fb4cd 100644
--- a/backend/snapscan.c
+++ b/backend/snapscan.c
@@ -1320,7 +1320,7 @@ static SANE_Status send_gamma_table (SnapScan_Scanner *pss, u_char dtc, u_char d
             break;
         case PRISA5150:
             /* 5150 needs the gamma table twice, with dtc = 0x04 for the second one */
-            status = send (pss, dtc+1, dtcq);
+            status = send (pss, DTC_GAMMA2, dtcq);
             CHECK_STATUS (status, me, "2nd send");
             break;
         default:
@@ -1926,6 +1926,9 @@ SANE_Status sane_get_select_fd (SANE_Handle h, SANE_Int * fd)
 
 /*
  * $Log$
+ * Revision 1.64  2005/12/05 20:38:23  oliver-guest
+ * Small bugfix for Benq 5150
+ *
  * Revision 1.63  2005/12/04 15:03:00  oliver-guest
  * Some fixes for Benq 5150
  *