Only feed when doing calibration for LiDE 35 and compatibles

merge-requests/1/head
Pierre Willenbrock 2009-10-09 22:49:07 +02:00 zatwierdzone przez Stphane Voltz
rodzic f4d53520ea
commit 95434c1f0a
1 zmienionych plików z 22 dodań i 16 usunięć

Wyświetl plik

@ -4734,15 +4734,19 @@ gl841_led_calibration (Genesys_Device * dev)
DBG (DBG_proc, "gl841_led_calibration\n");
status = gl841_feed(dev, 280);/*feed to white strip. canon lide 35 only.*/
if (status != SANE_STATUS_GOOD)
if (dev->model->gpo_type == GPO_CANONLIDE35)
{
DBG (DBG_error,
"gl841_coarse_gain_calibration: Failed to feed: %s\n",
sane_strstatus (status));
return status;
}
status = gl841_feed(dev, 280);/*feed to white strip. canon lide 35 only.*/
if (status != SANE_STATUS_GOOD)
{
DBG (DBG_error,
"gl841_led_calibration: Failed to feed: %s\n",
sane_strstatus (status));
return status;
}
}
/* offset calibration is always done in color mode */
channels = 3;
@ -5336,15 +5340,17 @@ gl841_coarse_gain_calibration (Genesys_Device * dev, int dpi)
DBG (DBG_proc, "gl841_coarse_gain_calibration\n");
status = gl841_feed(dev, 280);/*feed to white strip. canon lide 35 only.*/
if (status != SANE_STATUS_GOOD)
if (dev->model->gpo_type == GPO_CANONLIDE35)
{
DBG (DBG_error,
"gl841_coarse_gain_calibration: Failed to feed: %s\n",
sane_strstatus (status));
return status;
status = gl841_feed(dev, 280);/*feed to white strip. canon lide 35 only.*/
if (status != SANE_STATUS_GOOD)
{
DBG (DBG_error,
"gl841_coarse_gain_calibration: Failed to feed: %s\n",
sane_strstatus (status));
return status;
}
}
/* coarse gain calibration is allways done in color mode */