Fujitsu backend v104

- never request more than s->buffer_size from scanner
- silence noisy set_window() calls from init_interlace()

ChangeLog

@@ -1,6 +1,15 @@
+2010-11-24 m. allan noah <kitno455 at gmail dot com>
+	* backend/fujitsu.c, backend/fujitsu.conf.in, 
+	  doc/descriptions/fujitsu.desc, doc/sane-fujitsu.man:
+	Fujitsu backend versions 103 and 104
+	- remove compiled-in default config file
+	- initial support for new fi-6xxx machines
+	- never request more than s->buffer_size from scanner
+	- silence noisy set_window() calls from init_interlace()
+
 2010-11-19 Julien Blache <jb@jblache.org>
 	* doc/descriptions-external/epkowa.desc: update for iScan 2.26.1,
-        from Olaf Meeuwissen <olaf.meeuwissen@avasys.jp>.
+	from Olaf Meeuwissen <olaf.meeuwissen@avasys.jp>.
 
 2010-11-17 Stéphane Voltz <stef.dev@free.fr>
 	* backend/genesys.c: don't write scan data unless specified by debug 
@@ -36,7 +45,7 @@
 
 2010-10-30 Julien Blache <jb@jblache.org>
 	* backend/xerox_mfp.conf.in, doc/descriptions/xerox_mfp.desc: add
-          Samsung SCX 4824 & 4825FN (Debian #601748). Resync desc file with
+	Samsung SCX 4824 & 4825FN (Debian #601748). Resync desc file with
 	  config file.
 
 2010-10-13 Stéphane Voltz <stef.dev@free.fr>

backend/fujitsu.c

@@ -8,9 +8,14 @@
    Copyright (C) 2001-2004 Oliver Schirrmeister
    Copyright (C) 2003-2010 m. allan noah
 
-   JPEG output support funded by Archivista GmbH, www.archivista.ch
+   JPEG output and low memory usage support funded by:
-   Endorser support funded by O A S Oilfield Accounting Service Ltd, www.oas.ca
+     Archivista GmbH, www.archivista.ch
-   Automatic length detection support funded by Martin G. Miller
+   Endorser support funded by:
+     O A S Oilfield Accounting Service Ltd, www.oas.ca
+   Automatic length detection support funded by:
+     Martin G. Miller, mgmiller at optonline.net
+   Software image enhancement routines funded by:
+     Fujitsu Computer Products of America, Inc. www.fcpa.com
 
    --------------------------------------------------------------------------
 
@@ -469,6 +474,9 @@
       v103 2010-11-23, MAN
          - remove compiled-in default config file
          - initial support for new fi-6xxx machines
+      v104 2010-11-24, MAN
+         - never request more than s->buffer_size from scanner
+         - silence noisy set_window() calls from init_interlace()
 
    SANE FLOW DIAGRAM
 
@@ -518,7 +526,7 @@
 #include "fujitsu.h"
 
 #define DEBUG 1
-#define BUILD 103
+#define BUILD 104
 
 /* values for SANE_DEBUG_FUJITSU env var:
  - errors           5
@@ -1552,7 +1560,7 @@ static SANE_Status
 init_ms(struct fujitsu *s) 
 {
   int ret;
-  int oldDbg;
+  int oldDbg=0;
 
   unsigned char cmd[MODE_SENSE_len];
   size_t cmdLen = MODE_SENSE_len;
@@ -1567,8 +1575,6 @@ init_ms(struct fujitsu *s)
     return SANE_STATUS_GOOD;
   }
 
-  oldDbg=0;
-
   /* some of the following probes will produce errors */
   /* so we reduce the dbg level to reduce the noise */
   /* however, if user builds with NDEBUG, we can't do that */
@@ -2084,6 +2090,7 @@ init_interlace (struct fujitsu *s)
 {
   SANE_Status ret = SANE_STATUS_GOOD;
   int curr_mode = s->mode;
+  int oldDbg=0;
 
   DBG (10, "init_interlace: start\n");
 
@@ -2112,12 +2119,22 @@ init_interlace (struct fujitsu *s)
    s->color_interlace <= COLOR_INTERLACE_RRGGBB;
    s->color_interlace++){
 
+    /* some of the following probes will produce errors */
+    /* so we reduce the dbg level to reduce the noise */
+    /* however, if user builds with NDEBUG, we can't do that */
+    /* so we protect the code with the following macro */
+    IF_DBG( oldDbg=DBG_LEVEL; )
+    IF_DBG( if(DBG_LEVEL < 35){ DBG_LEVEL = 0; } )
+
     ret = set_window(s);
+
+    IF_DBG (DBG_LEVEL = oldDbg;)
+
     if (ret == SANE_STATUS_GOOD){
       break;
     }
     else{
-      DBG (5, "init_interlace: not %d\n", s->color_interlace);
+      DBG (15, "init_interlace: not %d\n", s->color_interlace);
     }
   }
 
@@ -7009,6 +7026,9 @@ read_from_JPEGduplex(struct fujitsu *s)
     if(bytes > remain){
         bytes = remain;
     }
+    if(bytes > s->buffer_size){
+        bytes = s->buffer_size;
+    }
   
     DBG(15, "read_from_JPEGduplex: fto:%d frx:%d bto:%d brx:%d re:%d pa:%d\n",
       s->bytes_tot[SIDE_FRONT], s->bytes_rx[SIDE_FRONT],
@@ -7267,6 +7287,9 @@ read_from_3091duplex(struct fujitsu *s)
   if(bytes > remain){
     bytes = remain;
   }
+  if(bytes > s->buffer_size){
+    bytes = s->buffer_size;
+  }
 
   /* all requests must end on line boundary */
   bytes -= (bytes % s->params.bytes_per_line);
@@ -7387,6 +7410,9 @@ read_from_scanner(struct fujitsu *s, int side)
     if(bytes > remain){
         bytes = remain;
     }
+    if(bytes > s->buffer_size){
+        bytes = s->buffer_size;
+    }
   
     /* all requests must end on line boundary */
     bytes -= (bytes % s->params.bytes_per_line);

doc/sane-fujitsu.man

@@ -199,7 +199,7 @@ fi\-4220C and basic USB support: Ron Cemer <ron a t roncemer d o t com>
 fi\-4120, fi\-series color, backend re\-write, jpeg, current maintainer:
   m. allan noah: <kitno455 a t gmail d o t com>
 
-JPEG output support funded by:
+JPEG output and low memory usage support funded by:
   Archivista GmbH
   www.archivista.ch
 
@@ -215,8 +215,9 @@ Automatic length detection support funded by:
   Martin G. Miller
   mgmiller at optonline.net
 
-Hardware donated by Fujitsu Computer Products of America, Inc.
+Software image enhancement routines funded and hardware donated by:
-  http://us.fujitsu.com/fcpa
+  Fujitsu Computer Products of America, Inc.
+  www.fcpa.com
 
 .SH "SEE ALSO"
 sane(7),