genesys fixes

- fix shading calibration for non gl847/gl124 scanners
- enable 16 bit gamma for gl847
- add MUST_WAIT flags to gl847 scanners so solve parking isues

backend/genesys.c

@@ -3328,7 +3328,7 @@ genesys_restore_calibration (Genesys_Device * dev)
 		  cache->white_average_data, dev->average_size);
 
 
-        if(dev->model->cmd_set->send_shading_data!=NULL)
+        if(dev->model->cmd_set->send_shading_data==NULL)
           {
             status = genesys_send_shading_coefficient (dev);
             if (status != SANE_STATUS_GOOD)
@@ -3648,7 +3648,7 @@ genesys_flatbed_calibration (Genesys_Device * dev)
 	}
     }
 
-  if(dev->model->cmd_set->send_shading_data!=NULL)
+  if(dev->model->cmd_set->send_shading_data==NULL)
     {
       status = genesys_send_shading_coefficient (dev);
       if (status != SANE_STATUS_GOOD)
@@ -3867,7 +3867,7 @@ genesys_sheetfed_calibration (Genesys_Device * dev)
 
   /* send the shading coefficient when doing whole line shading
    * but not when using SHDAREA like GL124 */
-  if(dev->model->cmd_set->send_shading_data!=NULL)
+  if(dev->model->cmd_set->send_shading_data==NULL)
     {
       status = genesys_send_shading_coefficient (dev);
       if (status != SANE_STATUS_GOOD)

backend/genesys_devices.c

@@ -1294,6 +1294,7 @@ static Genesys_Model canon_lide_100_model = {
   /* Which flags are needed for this scanner? */
       GENESYS_FLAG_SKIP_WARMUP
     | GENESYS_FLAG_ODD_EVEN_CIS
+    | GENESYS_FLAG_MUST_WAIT
     | GENESYS_FLAG_OFFSET_CALIBRATION
     | GENESYS_FLAG_DARK_CALIBRATION
     | GENESYS_FLAG_CUSTOM_GAMMA,
@@ -1448,6 +1449,7 @@ static Genesys_Model canon_5600f_model = {
   GPO_CANONLIDE200,
   MOTOR_CANONLIDE200,
   GENESYS_FLAG_UNTESTED		/* not working yet */
+    | GENESYS_FLAG_MUST_WAIT
     | GENESYS_FLAG_SKIP_WARMUP
     | GENESYS_FLAG_ODD_EVEN_CIS
     | GENESYS_FLAG_OFFSET_CALIBRATION
@@ -1501,6 +1503,7 @@ static Genesys_Model canon_lide_700f_model = {
   GPO_CANONLIDE200,
   MOTOR_CANONLIDE200,
   GENESYS_FLAG_UNTESTED		/* not working yet */
+    | GENESYS_FLAG_MUST_WAIT
     | GENESYS_FLAG_SKIP_WARMUP
     | GENESYS_FLAG_ODD_EVEN_CIS
     | GENESYS_FLAG_OFFSET_CALIBRATION
@@ -1556,6 +1559,7 @@ static Genesys_Model canon_lide_200_model = {
   GPO_CANONLIDE200,
   MOTOR_CANONLIDE200,
       GENESYS_FLAG_SKIP_WARMUP
+    | GENESYS_FLAG_MUST_WAIT
     | GENESYS_FLAG_ODD_EVEN_CIS
     | GENESYS_FLAG_OFFSET_CALIBRATION
     | GENESYS_FLAG_DARK_CALIBRATION

backend/genesys_gl847.c

@@ -1801,8 +1801,6 @@ independent of our calculated values:
     {
       depth = 8;
     }
-  if (depth == 16)
-    flags |= SCAN_FLAG_DISABLE_GAMMA;
 
   /* we enable true gray for cis scanners only, and just when doing 
    * scan since color calibration is OK for this mode