gl847 fixes

- improved send shading data calls
- fixed shading area line number for gl847 scanners

backend/genesys.c

@@ -1052,7 +1052,7 @@ sanei_genesys_init_shading_data (Genesys_Device * dev, int pixels_per_line)
 
   /* these models don't need to init shading data due to the use of specific send shading data
      function */
-  if(dev->model->ccd_type==CCD_KVSS080 || dev->model->ccd_type==CCD_G4050 || dev->model->asic_type == GENESYS_GL124)
+  if(dev->model->ccd_type==CCD_KVSS080 || dev->model->ccd_type==CCD_G4050 || dev->model->cmd_set->send_shading_data!=NULL)
     return SANE_STATUS_GOOD;
 
   DBG (DBG_proc, "sanei_genesys_init_shading_data (pixels_per_line = %d)\n",
@@ -3220,7 +3220,7 @@ genesys_restore_calibration (Genesys_Device * dev)
 		  cache->white_average_data, dev->average_size);
 
 
-        if(dev->model->asic_type != GENESYS_GL124)
+        if(dev->model->cmd_set->send_shading_data!=NULL)
           {
             status = genesys_send_shading_coefficient (dev);
             if (status != SANE_STATUS_GOOD)
@@ -3540,7 +3540,7 @@ genesys_flatbed_calibration (Genesys_Device * dev)
 	}
     }
 
-  if(dev->model->asic_type != GENESYS_GL124)
+  if(dev->model->cmd_set->send_shading_data!=NULL)
     {
       status = genesys_send_shading_coefficient (dev);
       if (status != SANE_STATUS_GOOD)
@@ -3759,7 +3759,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->asic_type != GENESYS_GL124)
+  if(dev->model->cmd_set->send_shading_data!=NULL)
     {
       status = genesys_send_shading_coefficient (dev);
       if (status != SANE_STATUS_GOOD)
@@ -4247,7 +4247,7 @@ genesys_start_scan (Genesys_Device * dev)
   
   /* GL124 is using SHDAREA, so we have to wait for scan to be set up before
    * sending shading data */
-  if(dev->model->asic_type == GENESYS_GL124)
+  if(dev->model->cmd_set->send_shading_data!=NULL)
     {
       status = genesys_send_shading_coefficient (dev);
       if (status != SANE_STATUS_GOOD)

backend/genesys_devices.c

@@ -1250,7 +1250,7 @@ static Genesys_Model canon_lide_100_model = {
     | GENESYS_FLAG_DARK_CALIBRATION
     | GENESYS_FLAG_CUSTOM_GAMMA,
   GENESYS_HAS_SCAN_SW | GENESYS_HAS_COPY_SW | GENESYS_HAS_EMAIL_SW | GENESYS_HAS_FILE_SW,
-  150,
+  60,
   400
 };
 
@@ -1405,7 +1405,7 @@ static Genesys_Model canon_5600f_model = {
     | GENESYS_FLAG_DARK_CALIBRATION
     | GENESYS_FLAG_CUSTOM_GAMMA,
   GENESYS_HAS_SCAN_SW | GENESYS_HAS_COPY_SW | GENESYS_HAS_EMAIL_SW | GENESYS_HAS_FILE_SW,
-  150,
+  60,
   400
 };
 
@@ -1458,7 +1458,7 @@ static Genesys_Model canon_lide_200_model = {
     | GENESYS_FLAG_DARK_CALIBRATION
     | GENESYS_FLAG_CUSTOM_GAMMA,
   GENESYS_HAS_SCAN_SW | GENESYS_HAS_COPY_SW | GENESYS_HAS_EMAIL_SW | GENESYS_HAS_FILE_SW,
-  150,
+  60,
   400
 };
 

backend/genesys_gl124.c

@@ -3625,11 +3625,10 @@ gl124_is_compatible_calibration (Genesys_Device * dev,
       return SANE_STATUS_UNSUPPORTED;
     }
 
-  /* a cache entry expires after 30 minutes for non sheetfed scanners */
+  /* a cache entry expires after 60 minutes for non sheetfed scanners */
-  /*
 #ifdef HAVE_SYS_TIME_H
   gettimeofday (&time, NULL);
-  if ((time.tv_sec - cache->last_calibration > 30 * 60)
+  if ((time.tv_sec - cache->last_calibration > 60 * 60)
       && (dev->model->is_sheetfed == SANE_FALSE)
       && (dev->settings.scan_method == SCAN_METHOD_FLATBED))
     {
@@ -3638,7 +3637,6 @@ gl124_is_compatible_calibration (Genesys_Device * dev,
       return SANE_STATUS_UNSUPPORTED;
     }
 #endif
-*/
 
   DBGCOMPLETED;
   return SANE_STATUS_GOOD;