2002-09-07 Oliver Rauch <Oliver.Rauch@rauch-domain.de>

* backend/umax.c, umax.h, umax-scanner.c, umax.conf
          doc/descriptions/umax.desc
          Update to sane-umax build 36

backend/umax-scanner.c

@@ -106,18 +106,22 @@ static char *scanner_str[] =
   "UMAX ",	"Mirage IIse ",
   "UMAX ",	"PL-II ",
 /*  "UMAX ",	"PowerLook 2000 ", */
+  "UMAX ",	"PowerLook 2100XL",
   "UMAX ",	"PowerLook III ",
   "UMAX ",	"PowerLook 3000 ",
   "UMAX ",	"Gemini D-16 ",
+  "UMAX ",      "PS-2400X ", /* same as LinoHell SAPHIR */
+/*  "Color",	"FilmScanner____1", */ /* UMAX Powerlook 270 */
   "LinoHell",	"JADE ",   /* is a Supervista S-12 */
   "LinoHell",	"Office ", /* is a Supervista S-12 */
   "LinoHell",	"Office2 ",
+  "LinoHell",	"SAPHIR ", /* same as UMAX PS-2400X */
   "LinoHell",	"SAPHIR2 ",
 /*  "LinoHell",	"SAPHIR3 ", */
 /*  "LinoHell",	"SAPHIR4 ", */
   "Linotype",	"SAPHIR4 ",
 /*  "LinoHell",	"OPAL ", */
-  "HDM ",	"LS4H1S  ", /* Linoscan 1400 */
+  "HDM ",	"LS4H1S ", /* Linoscan 1400 */
   "Nikon ",	"AX-110 ", /* is a Vista S6E */
   "Nikon ",	"AX-210 ", /* is a Supervista S12 */
   "KYE ",	"ColorPage-HR5 ", 

backend/umax.conf

@@ -57,11 +57,17 @@
 #  2 = 2 bytes/pixel  
 #option calibration-bytes-pixel -1
 
+# define if scanner uses the same exposure times for red, green and blue
+# -1 = automatically set by driver - if known
+#  0 = disabled (own selection for red, green and blue)
+#  1 = enabled (same values for red, green and blue)
+#options exposure-time-rgb-bind 0
+
 # define if shading data shall be inverted befor sending it back to the scanner
 # -1 = automatically set by driver - if known
 #  0 = disabled
 #  1 = enabled 
-#option invert-shading-data
+#option invert-shading-data 0
 
 # define if the scanner supports lamp control commands
 # 0 = automatically set by driver - if known

backend/umax.h

@@ -150,12 +150,18 @@ enum Umax_Option
     OPT_SCAN_LAMP_DEN,
 
     OPT_SELECT_EXPOSURE_TIME,
+    OPT_SELECT_CAL_EXPOSURE_TIME,
     OPT_SELECT_LAMP_DENSITY,
 
     OPT_LAMP_ON,
     OPT_LAMP_OFF,
     OPT_LAMP_OFF_AT_EXIT,
 
+    OPT_BATCH_SCAN_START,							/* start batch scan function */
+    OPT_BATCH_SCAN_LOOP,							 /* loop batch scan function */
+    OPT_BATCH_SCAN_END,								  /* end batch scan function */
+    OPT_BATCH_NEXT_TL_Y,						      /* batch scan function next y position */
+
 #ifdef UMAX_CALIBRATION_MODE_SELECTABLE
     OPT_CALIB_MODE,
 #endif
@@ -305,6 +311,7 @@ typedef struct Umax_Device
   int			inquiry_shadow_max;					      /* maximum value for s */
 
   int			inquiry_quality_ctrl;						    /* 1 = supported */
+  int			inquiry_batch_scan;						    /* 1 = supported */
   int			inquiry_preview;						    /* 1 = supported */
   int			inquiry_lamp_ctrl;						    /* 1 = supported */
   int			inquiry_transavail;						/* 1 = uta available */
@@ -375,6 +382,9 @@ typedef struct Umax_Device
   int			gamma_input_bits_code;				/* 1 = 24bpp, 4 = 30 bpp, 8 = 36 bpp */
   int			set_auto;					    /* 0 or 1, don't know what it is */
   int			preview;							     /* 1 if preview */
+  int			batch_scan;					  /* 1 = batch scan, 0 = normal scan */
+  int			batch_end;						  /* 1 = reposition scanhead */
+  int			batch_next_tl_y;			  /* top left y position for next batch scan */
   int			quality;					/* 1 = quality_calibration, 0 = fast */
   int			reverse;					      /* 1: exchange black and white */
   int			reverse_multi;						   /* 1: invert color values */
@@ -442,7 +452,9 @@ typedef struct Umax_Device
 
   int			calibration_area;		      /* define calibration area if no area is given */
   int                   calibration_width_offset;  /* some scanners do calibrate with some additional pixels */
+  int                   calibration_width_offset_batch;			      /* the same for batch scanning */
   int                   calibration_bytespp;		   /* correction of bytespp if driver knows about it */
+  int                   exposure_time_rgb_bind;		  /* exposure time can not be defined for each color */
   int			invert_shading_data;	     /* invert shading data before sending it to the scanner */
   int                   common_xy_resolutions;			/* do not allow different x and y resolution */
   int			pause_for_color_calibration;	/* pause between start_scan and do_calibration in ms */
@@ -452,6 +464,7 @@ typedef struct Umax_Device
   int			pause_for_moving;	       /* pause for moving scanhead over full scanarea in ms */
   int			lamp_control_available;		       /* is set when scanner supportes lamp control */
   int			gamma_lsb_padded;                              /* 16 bit gamma data is padded to lsb */
+  int			force_quality_calibration;			   /* always set quality calibration */
 } Umax_Device;
 
 

doc/descriptions/umax.desc

@@ -339,7 +339,7 @@
 :status :untested
 :comment "untested, SCSI-ID=ESCORT Galleria 600S"
 
-:mfg "Genius"                      ; another manufacturer...
+:mfg "Genius"                  ; another manufacturer...
 :url "http://www.genius.kye.de/"
 
 :model "ColorPage-HR5 (Pro)"