* backend/fujitsu.[ch]: backend v85

- round pixels_per_line down to arbitrary limits for fi-4990 & fi-4860
 - fi-4860 returns random garbage to serial number queries
 - initialize *info to 0 in sane_control_option()
* doc/descriptions/fujitsu.desc: backend v85, improve status/comments
* frontend/scanimage.c: initialize *info, fix buffer overwalk

ChangeLog

@@ -1,3 +1,11 @@
+2008-12-10  m. allan noah <kitno455 a t gmail d o t com>
+	* backend/fujitsu.[ch]: backend v85
+	- round pixels_per_line down to arbitrary limits for fi-4990 & fi-4860
+	- fi-4860 returns random garbage to serial number queries
+	- initialize *info to 0 in sane_control_option()
+	* doc/descriptions/fujitsu.desc: backend v85, improve status/comments
+	* frontend/scanimage.c: initialize *info, fix buffer overwalk
+
 2008-12-10  m. allan noah <kitno455 a t gmail d o t com>
 	* backend/canon_dr.c: backend v10
 	- add all documented request sense codes to sense_handler()

backend/fujitsu.c

@@ -405,6 +405,10 @@
       v84 2008-11-07, MAN
          - round lines down to even number to get even # of total bytes
          - round binary bpl and Bpl down to byte boundary
+      v85 2008-11-10, MAN
+         - round pixels_per_line down to arbitrary limits for fi-4990 & fi-4860
+         - fi-4860 returns random garbage to serial number queries
+         - initialize *info to 0 in sane_control_option()
 
    SANE FLOW DIAGRAM
 
@@ -465,7 +469,7 @@
 #include "fujitsu.h"
 
 #define DEBUG 1
-#define BUILD 84
+#define BUILD 85
 
 /* values for SANE_DEBUG_FUJITSU env var:
  - errors           5
@@ -1809,6 +1813,11 @@ init_model (struct fujitsu *s)
   s->reverse_by_mode[MODE_GRAYSCALE] = 1;
   s->reverse_by_mode[MODE_COLOR] = 1;
 
+  s->ppl_mod_by_mode[MODE_LINEART] = 8;
+  s->ppl_mod_by_mode[MODE_HALFTONE] = 8;
+  s->ppl_mod_by_mode[MODE_GRAYSCALE] = 1;
+  s->ppl_mod_by_mode[MODE_COLOR] = 1;
+
   /* if scanner has built-in gamma tables, we use the first one (0) */
   /* otherwise, we use the first downloaded one (0x80) */
   /* note that you may NOT need to send the table to use it? */
@@ -1948,6 +1957,24 @@ init_model (struct fujitsu *s)
     /* weirdness */
     s->duplex_interlace = DUPLEX_INTERLACE_NONE;
     s->color_interlace = COLOR_INTERLACE_RRGGBB;
+
+    s->ppl_mod_by_mode[MODE_LINEART] = 32;
+    s->ppl_mod_by_mode[MODE_HALFTONE] = 32;
+    s->ppl_mod_by_mode[MODE_GRAYSCALE] = 4;
+    s->ppl_mod_by_mode[MODE_COLOR] = 4;
+  }
+
+  /* some firmware versions use capital f? */
+  else if (strstr (s->model_name, "Fi-4860")
+   || strstr (s->model_name, "fi-4860") ) {
+
+    /* weirdness */
+    s->broken_diag_serial = 1;
+
+    s->ppl_mod_by_mode[MODE_LINEART] = 32;
+    s->ppl_mod_by_mode[MODE_HALFTONE] = 32;
+    s->ppl_mod_by_mode[MODE_GRAYSCALE] = 4;
+    s->ppl_mod_by_mode[MODE_COLOR] = 4;
   }
 
   else if (strstr (s->model_name,"fi-6230")
@@ -2153,7 +2180,7 @@ init_serial (struct fujitsu *s)
 
   DBG (10, "init_serial: start\n");
 
-  if (!s->has_cmd_sdiag || !s->has_cmd_rdiag){
+  if (!s->has_cmd_sdiag || !s->has_cmd_rdiag || s->broken_diag_serial){
     DBG (5, "init_serial: send/read diag not supported, returning\n");
     return SANE_STATUS_INVAL;
   }
@@ -4023,6 +4050,9 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
   if (info == 0)
     info = &dummy;
 
+  /*blast info in case frontend forgot*/
+  *info = 0;
+
   if (option >= NUM_OPTIONS) {
     DBG (5, "sane_control_option: %d too big\n", option);
     return SANE_STATUS_INVAL;
@@ -5716,38 +5746,55 @@ sane_get_parameters (SANE_Handle handle, SANE_Parameters * params)
         /* this backend only sends single frame images */
         params->last_frame = 1;
 
+        /* initial ppl from user settings */
         params->pixels_per_line = s->resolution_x * (s->br_x - s->tl_x) / 1200;
 
-        if (s->mode == MODE_COLOR) {
-            params->format = SANE_FRAME_RGB;
-            params->depth = 8;
-            if(s->compress == COMP_JPEG){
-                params->format = SANE_FRAME_JPEG;
-            }
-            params->bytes_per_line = params->pixels_per_line * 3;
-        }
-        else if (s->mode == MODE_GRAYSCALE) {
-            params->format = SANE_FRAME_GRAY;
-            params->depth = 8;
-            if(s->compress == COMP_JPEG){
-                params->format = SANE_FRAME_JPEG;
-            }
-            params->bytes_per_line = params->pixels_per_line;
-        }
-        else {
-            params->format = SANE_FRAME_GRAY;
-            params->depth = 1;
-
-            /* round down to byte boundary */
-            params->pixels_per_line -= params->pixels_per_line % 8;
-
-            params->bytes_per_line = params->pixels_per_line / 8;
-        }
-
         /* some scanners require even number of bytes in each transfer block,
          * so we round to even # of total lines, to ensure last block is even */
         params->lines = s->resolution_y * (s->br_y - s->tl_y) / 1200;
         params->lines -= params->lines % 2;
+
+        if (s->mode == MODE_COLOR) {
+            params->depth = 8;
+
+            /* jpeg requires 8x8 squares */
+            if(s->compress == COMP_JPEG){
+              params->format = SANE_FRAME_JPEG;
+              params->pixels_per_line -= params->pixels_per_line % 8;
+              params->lines -= params->lines % 8;
+            }
+            else{
+              params->format = SANE_FRAME_RGB;
+              params->pixels_per_line 
+                -= params->pixels_per_line % s->ppl_mod_by_mode[s->mode];
+            }
+
+            params->bytes_per_line = params->pixels_per_line * 3;
+        }
+        else if (s->mode == MODE_GRAYSCALE) {
+            params->depth = 8;
+
+            /* jpeg requires 8x8 squares */
+            if(s->compress == COMP_JPEG){
+              params->format = SANE_FRAME_JPEG;
+              params->pixels_per_line -= params->pixels_per_line % 8;
+              params->lines -= params->lines % 8;
+            }
+            else{
+              params->format = SANE_FRAME_GRAY;
+              params->pixels_per_line 
+                -= params->pixels_per_line % s->ppl_mod_by_mode[s->mode];
+            }
+
+            params->bytes_per_line = params->pixels_per_line;
+        }
+        else {
+            params->depth = 1;
+            params->format = SANE_FRAME_GRAY;
+            params->pixels_per_line 
+              -= params->pixels_per_line % s->ppl_mod_by_mode[s->mode];
+            params->bytes_per_line = params->pixels_per_line / 8;
+        }
     }
 
     DBG(15,"sane_get_parameters: x: max=%d, page=%d, gpw=%d, res=%d\n",

backend/fujitsu.h

@@ -313,11 +313,14 @@ struct fujitsu
   int window_gamma;
   int endorser_string_len;
 
+  int broken_diag_serial;   /* some scanners are just plain borked */
+
   int has_vuid_mono;    /* mono set window data */
   int has_vuid_3091;    /* 3091/2 set window data */
   int has_vuid_color;   /* color set window data */
 
   int reverse_by_mode[6]; /* mode specific */
+  int ppl_mod_by_mode[6]; /* mode specific scanline length limitation */
 
   /* --------------------------------------------------------------------- */
   /* immutable values which are set during serial number probing scanner   */

doc/descriptions/fujitsu.desc

@@ -11,7 +11,7 @@
 
 :backend "fujitsu"               ; name of backend
 :url "http://www.thebility.com/fujitsu/" 
-:version "82"                    ; version of backend
+:version "85"                    ; version of backend
 :manpage "sane-fujitsu"          ; name of manpage (if it exists)
 :comment "Backend updated for SANE release 1.1.0, see sane-fujitsu manpage"
 :devicetype :scanner             ; start of a list of devices....
@@ -326,35 +326,35 @@
 :model "fi-5900C"
 :interface "SCSI USB"
 :usbid "0x04c5" "0x10e7"
-:status :complete
+:status :good
-:comment "big, current"
+:comment "big, current, independent ultrasonic control and multistream unsupported"
 
 :model "fi-6750S"
 :interface "USB"
 :status :untested
 :usbid "0x04c5" "0x1178"
-:comment "Simplex, USB only version of fi-6770, might have usb suspend problem?"
+:comment "Simplex, USB only version of fi-6770, won't wakeup via software?"
 
 :model "fi-6670"
 :interface "SCSI USB"
 :status :good
 :usbid "0x04c5" "0x1176"
-:comment "big, current, might have usb suspend problem?"
+:comment "big, current, won't wakeup via software"
 
 :model "fi-6670A"
 :interface "SCSI USB"
-:status :untested
+:status :good
 :usbid "0x04c5" "0x1177"
-:comment "big, current, with VRS CGA board, might have usb suspend problem?"
+:comment "big, current, VRS CGA board unsupported, won't wakeup via software"
 
 :model "fi-6770"
 :interface "SCSI USB"
-:status :untested
+:status :good
 :usbid "0x04c5" "0x1174"
-:comment "big, current, might have usb suspend problem?"
+:comment "big, current, won't wakeup via software"
 
 :model "fi-6770A"
 :interface "SCSI USB"
-:status :basic
+:status :good
 :usbid "0x04c5" "0x1175"
-:comment "big, current, with VRS CGA board, might have usb suspend problems?"
+:comment "big, current, VRS CGA board unsupported, won't wakeup via software"

frontend/scanimage.c

@@ -956,7 +956,7 @@ set_option (SANE_Handle device, int optnum, void *valuep)
   const SANE_Option_Descriptor *opt;
   SANE_Status status;
   SANE_Word orig = 0;
-  SANE_Int info;
+  SANE_Int info = 0;
 
   opt = sane_get_option_descriptor (device, optnum);
   if (opt && (!SANE_OPTION_IS_ACTIVE (opt->cap)))
@@ -1476,7 +1476,7 @@ pass_fail (int max, int len, SANE_Byte * buffer, SANE_Status status)
     fprintf (stderr, "FAIL Error: %s\n", sane_strstatus (status));
   else if (buffer[len] != 0x23)
     {
-      while (buffer[len] != 0x23)
+      while (len <= max && buffer[len] != 0x23)
 	++len;
       fprintf (stderr, "FAIL Cheat: %d bytes\n", len);
     }