mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

genesys: Return errors as exceptions from genesys_*_calibration()

merge-requests/104/head
Povilas Kanapickas 2019-07-20 11:02:38 +03:00
rodzic b41ad140ad
commit 7c70d30f63
1 zmienionych plików z 10 dodań i 21 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

31
backend/genesys.cc
Wyświetl plik

@ -2933,8 +2933,7 @@ static void genesys_save_calibration(Genesys_Device* dev, const Genesys_Sensor&
* @param dev device to calibrate * @param dev device to calibrate
* @return SANE_STATUS_GOOD if everything when all right, else the error code. * @return SANE_STATUS_GOOD if everything when all right, else the error code.
*/ */
static SANE_Status static void genesys_flatbed_calibration(Genesys_Device* dev, Genesys_Sensor& sensor)
genesys_flatbed_calibration(Genesys_Device * dev, Genesys_Sensor& sensor)
{ {
DBG_HELPER(dbg); DBG_HELPER(dbg);
uint32_t pixels_per_line; uint32_t pixels_per_line;
@ -3055,8 +3054,6 @@ genesys_flatbed_calibration(Genesys_Device * dev, Genesys_Sensor& sensor)
sanei_usb_testing_record_message("genesys_send_shading_coefficient"); sanei_usb_testing_record_message("genesys_send_shading_coefficient");
genesys_send_shading_coefficient(dev, sensor); genesys_send_shading_coefficient(dev, sensor);
} }
return SANE_STATUS_GOOD;
} }
/** /**
@ -3069,7 +3066,7 @@ genesys_flatbed_calibration(Genesys_Device * dev, Genesys_Sensor& sensor)
* @param dev device to calibrate * @param dev device to calibrate
* @return SANE_STATUS_GOOD if everything when all right, else the error code. * @return SANE_STATUS_GOOD if everything when all right, else the error code.
*/ */
static SANE_Status genesys_sheetfed_calibration(Genesys_Device * dev, Genesys_Sensor& sensor) static void genesys_sheetfed_calibration(Genesys_Device* dev, Genesys_Sensor& sensor)
{ {
DBG_HELPER(dbg); DBG_HELPER(dbg);
SANE_Bool forward = SANE_TRUE; SANE_Bool forward = SANE_TRUE;
@ -3077,8 +3074,7 @@ static SANE_Status genesys_sheetfed_calibration(Genesys_Device * dev, Genesys_Se
if (dev->model->cmd_set->search_strip == NULL) if (dev->model->cmd_set->search_strip == NULL)
{ {
DBG(DBG_error, "%s: no strip searching function available\n", __func__); throw SaneException(SANE_STATUS_UNSUPPORTED, "no strip searching function available");
return SANE_STATUS_UNSUPPORTED;
} }
// first step, load document // first step, load document
@ -3199,21 +3195,21 @@ static SANE_Status genesys_sheetfed_calibration(Genesys_Device * dev, Genesys_Se
/* resotre settings */ /* resotre settings */
dev->settings.xres = xres; dev->settings.xres = xres;
return SANE_STATUS_GOOD;
} }
/** /**
* does the calibration process for a device * does the calibration process for a device
* @param dev device to calibrate * @param dev device to calibrate
*/ */
static SANE_Status static void genesys_scanner_calibration(Genesys_Device* dev, Genesys_Sensor& sensor)
genesys_scanner_calibration(Genesys_Device * dev, Genesys_Sensor& sensor)
{ {
DBG_HELPER(dbg);
if (dev->model->is_sheetfed == SANE_FALSE) if (dev->model->is_sheetfed == SANE_FALSE)
{ {
return genesys_flatbed_calibration (dev, sensor); genesys_flatbed_calibration(dev, sensor);
return;
} }
return genesys_sheetfed_calibration(dev, sensor); genesys_sheetfed_calibration(dev, sensor);
} }
/* unused function kept in case it may be usefull in the futur */ /* unused function kept in case it may be usefull in the futur */
@ -3459,14 +3455,7 @@ genesys_start_scan (Genesys_Device * dev, SANE_Bool lamp_off)
if (!(dev->model->flags & GENESYS_FLAG_NO_CALIBRATION) if (!(dev->model->flags & GENESYS_FLAG_NO_CALIBRATION)
&&dev->model->is_sheetfed == SANE_FALSE) &&dev->model->is_sheetfed == SANE_FALSE)
{ {
status = genesys_scanner_calibration(dev, sensor); genesys_scanner_calibration(dev, sensor);
if (status != SANE_STATUS_GOOD)
{
DBG(DBG_error, "%s: failed to do scanner calibration: %s\n", __func__,
sane_strstatus(status));
return status;
}
genesys_save_calibration (dev, sensor); genesys_save_calibration (dev, sensor);
} }
else else
@ -6562,7 +6551,7 @@ set_option_value (Genesys_Scanner * s, int option, void *val,
catch_all_exceptions(__func__, [&]() catch_all_exceptions(__func__, [&]()
{ {
s->dev->model->cmd_set->save_power(s->dev, SANE_FALSE); s->dev->model->cmd_set->save_power(s->dev, SANE_FALSE);
TIE(genesys_scanner_calibration(s->dev, sensor)); genesys_scanner_calibration(s->dev, sensor);
}); });
catch_all_exceptions(__func__, [&]() catch_all_exceptions(__func__, [&]()
{ {