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

don't clear cache when loading cache file 

- don't clear just loaded cache entries when loading another cache file
- improve logging
merge-requests/1/head
Stphane Voltz 2015-04-12 08:55:24 +02:00
rodzic 2aed026154
commit a039e9efd1
2 zmienionych plików z 24 dodań i 28 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

26
backend/genesys.c
Wyświetl plik

@ -58,7 +58,7 @@
* SANE backend for Genesys Logic GL646/GL841/GL842/GL843/GL846/GL847/GL124 based scanners
*/
#define BUILD 2504
#define BUILD 2506
#define BACKEND_NAME genesys
#include "genesys.h"
@ -6919,8 +6919,8 @@ sane_open (SANE_String_Const devicename, SANE_Handle * handle)
tmpstr=calibration_filename(s->dev);
s->val[OPT_CALIBRATION_FILE].s = strdup (tmpstr);
s->dev->calib_file = strdup (tmpstr);
DBG (DBG_info, "Calibration filename set to:\n");
DBG (DBG_info, ">%s<\n", s->dev->calib_file);
DBG (DBG_info, "%s: Calibration filename set to:\n", __FUNCTION__);
DBG (DBG_info, "%s: >%s<\n", __FUNCTION__, s->dev->calib_file);
free(tmpstr);
/* now open file, fetch calibration records */
@ -7197,37 +7197,35 @@ static SANE_Status set_calibration_value (Genesys_Scanner * s, int option, void
{
SANE_Status status=SANE_STATUS_GOOD;
char *tmp;
Genesys_Calibration_Cache *cache;
Genesys_Device *dev=s->dev;
DBGSTART;
/* try to load file */
tmp=dev->calib_file;
dev->calib_file=val;
status=sanei_genesys_read_calibration (dev);
/* file exists but is invalid */
/* file exists but is invalid, so fall back to previous cache file
* an re-read it */
if (status!=SANE_STATUS_IO_ERROR && status!=SANE_STATUS_GOOD)
{
dev->calib_file=tmp;
status=sanei_genesys_read_calibration (dev);
return status;
}
/* we can set no file name value */
/* now we can set file name value */
if (s->val[option].s)
free (s->val[option].s);
s->val[option].s = strdup (val);
if (tmp)
free (tmp);
dev->calib_file = strdup (val);
DBG (DBG_info, "%s: Calibration filename set to:\n", __FUNCTION__);
DBG (DBG_info, "%s: >%s<\n", __FUNCTION__, s->dev->calib_file);
/* clear device calibration cache */
while(dev->calibration_cache!=NULL)
{
cache=dev->calibration_cache;
dev->calibration_cache=dev->calibration_cache->next;
free(cache);
}
DBGCOMPLETED;
return SANE_STATUS_GOOD;
}

26
backend/genesys_low.c
Wyświetl plik

@ -1763,7 +1763,10 @@ int sanei_genesys_get_lowest_dpi(Genesys_Device *dev)
/** @brief check is a cache entry may be used
* Compares current settings with the cache entry and return
* SANE_TRUE if they are compatible.
*/
* A calibration cache is compatible if color mode and x dpi match the user
* requested scan. In the case of CIS scanners, dpi isn't a criteria.
* flatbed cache entries are considred too old and then expires if they
* are older dans 1h, forcing calcibration at least once an hour. */
SANE_Status
sanei_genesys_is_compatible_calibration (Genesys_Device * dev,
Genesys_Calibration_Cache * cache,
@ -1779,22 +1782,20 @@ sanei_genesys_is_compatible_calibration (Genesys_Device * dev,
if(dev->model->cmd_set->calculate_current_setup==NULL)
{
DBG (DBG_proc,
"sanei_genesys_is_compatible_calibration: no calculate_setup, non compatible cache\n");
DBG (DBG_proc, "%s: no calculate_setup, non compatible cache\n", __FUNCTION__);
return SANE_STATUS_UNSUPPORTED;
}
status = dev->model->cmd_set->calculate_current_setup (dev);
if (status != SANE_STATUS_GOOD)
{
DBG (DBG_error,
"sanei_genesys_is_compatible_calibration: failed to calculate current setup: %s\n",
DBG (DBG_error, "%s: failed to calculate current setup: %s\n", __FUNCTION__,
sane_strstatus (status));
return status;
}
dev->current_setup.scan_method = dev->settings.scan_method;
DBG (DBG_proc, "sanei_genesys_is_compatible_calibration: checking\n");
DBG (DBG_proc, "%s: checking\n", __FUNCTION__);
/* a calibration cache is compatible if color mode and x dpi match the user
* requested scan. In the case of CIS scanners, dpi isn't a criteria */
@ -1812,24 +1813,22 @@ sanei_genesys_is_compatible_calibration (Genesys_Device * dev,
resolution=sanei_genesys_compute_dpihw(dev,dev->settings.xres);
compatible = (resolution == ((int) sanei_genesys_compute_dpihw(dev,cache->used_setup.xres)));
}
DBG (DBG_io, "%s: after resolution check current compatible=%d\n", __FUNCTION__, compatible);
if (dev->current_setup.half_ccd != cache->used_setup.half_ccd)
{
DBG (DBG_io,
"sanei_genesys_is_compatible_calibration: half_ccd=%d, used=%d\n",
DBG (DBG_io, "%s: half_ccd=%d, used=%d\n", __FUNCTION__,
dev->current_setup.half_ccd, cache->used_setup.half_ccd);
compatible = 0;
}
if (dev->current_setup.scan_method != cache->used_setup.scan_method)
{
DBG (DBG_io,
"sanei_genesys_is_compatible_calibration: current method=%d, used=%d\n",
DBG (DBG_io, "%s: current method=%d, used=%d\n", __FUNCTION__,
dev->current_setup.scan_method, cache->used_setup.scan_method);
compatible = 0;
}
if (!compatible)
{
DBG (DBG_proc,
"sanei_genesys_is_compatible_calibration: completed, non compatible cache\n");
DBG (DBG_proc, "%s: completed, non compatible cache\n", __FUNCTION__);
return SANE_STATUS_UNSUPPORTED;
}
@ -1843,8 +1842,7 @@ sanei_genesys_is_compatible_calibration (Genesys_Device * dev,
&& (dev->model->is_sheetfed == SANE_FALSE)
&& (dev->settings.scan_method == SCAN_METHOD_FLATBED))
{
DBG (DBG_proc,
"sanei_genesys_is_compatible_calibration: expired entry, non compatible cache\n");
DBG (DBG_proc, "%s: expired entry, non compatible cache\n", __FUNCTION__);
return SANE_STATUS_UNSUPPORTED;
}
}