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

fixed ta size handling and gl646 calibration

merge-requests/1/head
Stphane Voltz 2010-03-09 22:22:43 +01:00
rodzic 32c1b061b8
commit 7e95fd8365
3 zmienionych plików z 22 dodań i 17 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
backend/genesys.c
Wyświetl plik

@ -5548,7 +5548,7 @@ init_options (Genesys_Scanner * s)
return SANE_STATUS_NO_MEM;
}
y_range=create_range(model->x_size);
y_range=create_range(model->y_size);
if(y_range==NULL)
{
return SANE_STATUS_NO_MEM;
@ -6740,12 +6740,12 @@ set_option_value (Genesys_Scanner * s, int option, void *val,
if (strcmp (s->val[option].s, FLATBED) == 0)
{
x_range=create_range(s->dev->model->x_size);
y_range=create_range(s->dev->model->x_size);
y_range=create_range(s->dev->model->y_size);
}
else
{
x_range=create_range(s->dev->model->x_size_ta);
y_range=create_range(s->dev->model->x_size_ta);
y_range=create_range(s->dev->model->y_size_ta);
}
if(x_range==NULL || y_range==NULL)
{
@ -6760,8 +6760,8 @@ set_option_value (Genesys_Scanner * s, int option, void *val,
s->opt[OPT_TL_Y].constraint.range = y_range;
s->val[OPT_TL_Y].w = 0;
s->opt[OPT_BR_X].constraint.range = x_range;
s->opt[OPT_BR_Y].constraint.range = y_range;
s->val[OPT_BR_Y].w = y_range->max;
s->opt[OPT_BR_Y].constraint.range = y_range;
s->val[OPT_BR_X].w = x_range->max;
/* signals reload */

2
backend/genesys_devices.c
Wyświetl plik

@ -1062,7 +1062,7 @@ static Genesys_Model hp3670c_model = {
SANE_FIX (52.2), /* Start of scan area in TA mode in mm (x) */
SANE_FIX (55.6), /* Start of scan area in TA mode in mm (y) */
SANE_FIX (21.6), /* Size of scan area in TA mode in mm (x) */
SANE_FIX (25.6), /* Size of scan area in TA mode in mm (x) */
SANE_FIX (100.0), /* Size of scan area in TA mode in mm (y) */
SANE_FIX (43.2), /* Start of white strip in TA mode in mm (y) */

29
backend/genesys_gl646.c
Wyświetl plik

@ -4139,11 +4139,9 @@ ad_fe_coarse_gain_calibration (Genesys_Device * dev, int dpi)
/* setup for a RGB scan, one full sensor's width line */
/* resolution is the one from the final scan */
resolution =
get_closest_resolution (dev->model->ccd_type, dpi, SANE_TRUE);
channels = 3;
settings.scan_mode = SCAN_MODE_COLOR;
resolution = get_closest_resolution (dev->model->ccd_type, dpi, SANE_TRUE);
channels = 3;
settings.scan_mode = SCAN_MODE_COLOR;
settings.scan_method = SCAN_METHOD_FLATBED;
settings.xres = resolution;
@ -4224,7 +4222,10 @@ ad_fe_coarse_gain_calibration (Genesys_Device * dev, int dpi)
/**
* Alternative coarse gain calibration
* this on uses the settings from offset_calibration.
* this on uses the settings from offset_calibration. First scan moves so
* we can go to calibration area for XPA.
* @param dev device for scan
* @param dpi resolutnio to calibrate at
*/
static SANE_Status
gl646_coarse_gain_calibration (Genesys_Device * dev, int dpi)
@ -4258,7 +4259,7 @@ gl646_coarse_gain_calibration (Genesys_Device * dev, int dpi)
else
{
resolution =
get_closest_resolution (dev->model->ccd_type, dpi, SANE_TRUE);
get_closest_resolution (dev->model->ccd_type, dev->settings.xres, SANE_TRUE);
}
settings.scan_method = dev->settings.scan_method;
@ -4305,10 +4306,7 @@ gl646_coarse_gain_calibration (Genesys_Device * dev, int dpi)
average[0] = 255;
average[1] = 255;
average[2] = 255;
if (dev->model->ccd_type == CIS_XP200)
idx = 0;
else
idx = dev->settings.color_filter;
idx = dev->settings.color_filter;
average[idx] = 0;
}
pass = 0;
@ -4329,7 +4327,7 @@ gl646_coarse_gain_calibration (Genesys_Device * dev, int dpi)
}
/* after first scan, we don't move anymore */
move = SANE_TRUE;
move = SANE_FALSE;
settings.tl_y = 0;
/* log scanning data */
@ -4870,6 +4868,7 @@ simple_scan (Genesys_Device * dev, Genesys_Settings settings, SANE_Bool move,
unsigned char *buffer;
DBG (DBG_proc, "simple_scan: starting\n");
DBG (DBG_io, "simple_scan: move=%d, forward=%d, shading=%d\n",move,forward,shading);
/* round up to multiple of 3 in case of CIS scanner */
if (dev->model->is_cis == SANE_TRUE)
@ -4984,6 +4983,12 @@ simple_scan (Genesys_Device * dev, Genesys_Settings settings, SANE_Bool move,
/* wait for buffers to be filled */
do
{
usleep (10000UL);
RIE (sanei_genesys_get_status (dev, &empty));
if (DBG_LEVEL > DBG_info)
{
print_status (empty);
}
RIE (sanei_genesys_test_buffer_empty (dev, &empty));
}
while (empty);