Fix TPO scanning range for Epson 1670

ChangeLog

@@ -1,3 +1,8 @@
+2003-11-08  Oliver Schwartz <Oliver.Schwartz@gmx.de>
+
+	* backend/snapscan-options.c backend/snapscan-usb.c
+	  Fix TPO range for Epson 1670, fix compiler warnings on gcc 3.3
+
 2003-11-08  Oliver Schwartz <Oliver.Schwartz@gmx.de>
 
 	* backend/snapscan-scsi.c backend/snapscan.c doc/descriptions/snapscan.desc:

backend/snapscan-options.c

@@ -144,6 +144,16 @@ static const SANE_Range y_range_tpo_e50 =
     SANE_FIX (0.0), SANE_FIX (240.0), 0
 };        /* mm */
 
+/* TPO range for the Epson 1670 */
+static const SANE_Range x_range_tpo_1670 =
+{
+    SANE_FIX (0.0), SANE_FIX (101.0), 0
+};        /* mm */
+static const SANE_Range y_range_tpo_1670 =
+{
+    SANE_FIX (0.0), SANE_FIX (228.0), 0
+};        /* mm */
+
 static SANE_Range x_range_tpo;
 static SANE_Range y_range_tpo;
 static const SANE_Range gamma_range =
@@ -220,6 +230,10 @@ static void init_options (SnapScan_Scanner * ps)
         x_range_tpo = x_range_tpo_e50;
         y_range_tpo = y_range_tpo_e50;
         break;
+    case PERFECTION1670:
+        x_range_tpo = x_range_tpo_1670;
+        y_range_tpo = y_range_tpo_1670;
+        break;
     default:
         x_range_tpo = x_range_tpo_default;
         y_range_tpo = y_range_tpo_default;
@@ -1470,6 +1484,9 @@ SANE_Status sane_control_option (SANE_Handle h,
 
 /*
  * $Log$
+ * Revision 1.11  2003/11/08 09:50:27  oliver-guest
+ * Fix TPO scanning range for Epson 1670
+ *
  * Revision 1.10  2003/10/21 20:43:25  oliver-guest
  * Bugfixes for SnapScan backend
  *

backend/snapscan-usb.c

@@ -398,7 +398,7 @@ static int enqueue_bq(int fd,const void *src, size_t src_size)
 
     bqelements++;
     DBG(DL_DATA_TRACE, "%s: Busy queue: elements=%d, bqhead=%p, bqtail=%p\n",
-        me,bqelements,bqhead,bqtail);
+        me,bqelements,(void*)bqhead,(void*)bqtail);
     return 0;
 }
 
@@ -423,7 +423,7 @@ static void dequeue_bq()
 
     bqelements--;
     DBG(DL_DATA_TRACE, "%s: Busy queue: elements=%d, bqhead=%p, bqtail=%p\n",
-        me,bqelements,bqhead,bqtail);
+        me,bqelements,(void*)bqhead,(void*)bqtail);
 }
 
 static SANE_Status usb_request_sense(SnapScan_Scanner *pss) {
@@ -456,6 +456,9 @@ static SANE_Status usb_request_sense(SnapScan_Scanner *pss) {
 
 /*
  * $Log$
+ * Revision 1.13  2003/11/08 09:50:27  oliver-guest
+ * Fix TPO scanning range for Epson 1670
+ *
  * Revision 1.12  2003/07/26 17:16:55  oliverschwartz
  * Changed licence to GPL + SANE exception for snapscan-usb.[ch]
  *