- fixed overflows in 610P shading calibration coefficients

-  minor man update
	-  610P status change from minimal to good

ChangeLog

@@ -1,4 +1,11 @@
-2004-06-06  Oliver Schwartz <Oliver.Schwartz@gmx.de>
+2004-06-17  Stéphane Voltz <svoltz@wanadoo.fr>
+
+	* backend/umax_pp_low.c doc/descriptions/umax_pp.desc 
+	  doc/sane-umax_pp.man:
+	  fixed overflows in 610P shading calibration coefficients,
+	  minor man update, 610P status change from minimal to good
+
+2004-06-16  Oliver Schwartz <Oliver.Schwartz@gmx.de>
 
 	* backend/snapscan.h backend/snapscan.c backend/snapscan-usb.c: 
 	  Don't enforce even number of URB packages on 1212u_2 since

backend/umax_pp_low.c

@@ -12343,6 +12343,10 @@ shadingCalibration (int color, int dcRed, int dcGreen, int dcBlue,
 	    sum += data[y * w + x];
 	  avg = ((float) (sum)) / ((float) (h - (top + bottom)));
 	  coeff = (256.0 * (250.0 / avg - 1.0)) / 1.70;
+	  if(coeff<0)
+	  	coeff=0;
+	  if(coeff>255)
+	  	coeff=255;
 	  calibration[x + 2 * w - 4] = (int) (coeff + 0.5);
 	}
     }
@@ -12369,6 +12373,10 @@ shadingCalibration (int color, int dcRed, int dcGreen, int dcBlue,
 		  coeff = (256.0 * (250.0 / avg - 1.0)) / 1.70;
 		  break;
 		}
+	  if(coeff<0)
+	  	coeff=0;
+	  if(coeff>255)
+	  	coeff=255;
 	      calibration[x + i * w - 4] = (int) (coeff + 0.5);
 	    }
 	  /* 100 in coeffs -> +104 on picture */

doc/descriptions/umax_pp.desc

@@ -33,19 +33,17 @@
 :status :good      
 
 :model "Astra 1600P"
-:interface "Parport (EPP)"
+:interface "Parport (EPP/ECP)"
 :status :good      
 
 :model "Astra 600P"
-:interface "Parport (sPP/ECP)"
+:interface "Parport (SPP/ECP)"
 :status :unsupported      
 :comment "untested, but should be close to 610P"
 
 :model "Astra 610P"
 :interface "Parport (SPP/ECP)"
-:status :minimal      
-:comment "work in progress"
-
+:status :good      
 
 :mfg "Hewlett-Packard"
 

doc/sane-umax_pp.man

@@ -26,10 +26,12 @@ Astra 2000P
 .br 
 .RE
 .PP 
-This backend handles 75x75, 150x150, 300x300, 600x600 and 600x1200 dpi scan
-resolutions, in color and gray levels. There is a software lineart mode.
+This backend handles 75x75, 150x150, 300x300, 600x600 and 600x1200 for 1220P/1600P/2000P
+dpi scan reslutions,and 75x75, 150x150, 300x300 and 300x600 for 610P. In color and gray 
+levels, there is a software lineart mode.
 .PP 
-These scanners share the same ASIC. Only parts such as CCD and ADC change from
+The new generation models share a newer version of the 610P ASIC embedded in an EPAT chip. 
+Only parts such as CCD and ADC change from
 one to another. They even all reports being UMAX Astra 1220P via IEEE1284.
 There isn't software way to recognize them properly. Under windows, model is
 set by the driver installed, regardless of the hardware. 
@@ -37,8 +39,9 @@ set by the driver installed, regardless of the hardware.
 .TP 
 .B EPP/ECP MODES ONLY
 The current version of the backend uses only EPP or ECP mode to communicate 
-with the scanner. PS/2 and SPP mode aren't implemented. It is recommended that 
-you set your parallel port to EPP in BIOS with the current version of this 
+with the scanner. PS/2 mode isn't implemented. The 610P only use SPP. It is 
+recommended that you set your parallel port to EPP in BIOS with the current 
+version of this 
 backend. You can leave it to ECP or ECP+EPP, but in this case you may not use
 ppdev but only direct hardware access if you have to use ECP.  ECPEPP will only
  work if you use a 2.4 or 2.6 kernel with ppdev character device support.
@@ -290,7 +293,9 @@ For latest bug fixes and information see
 .SH "AUTHOR"
 Stéphane VOLTZ <svoltz@wanadoo.fr>
 
-
+.SH "CREDITS"
+Support for the 610P has been made possible thank to an hardware donation
+by William Stuart.
 
 .SH "BUG REPORTS"
 If something doesn't work, please contact me. But I need some information about