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

genesys: Extract function to dump SetupParams to debug

merge-requests/82/head
Povilas Kanapickas 2019-06-08 14:04:13 +03:00
rodzic a8b61d0501
commit ca070fb569
7 zmienionych plików z 32 dodań i 47 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

11
backend/genesys_gl124.cc
Wyświetl plik

@ -1278,15 +1278,8 @@ gl124_init_scan_regs(Genesys_Device * dev, const Genesys_Sensor& sensor, Genesys
int optical_res;
SANE_Status status;
DBG(DBG_info,
"%s:\n"
"Resolution : %gDPI/%gDPI\n"
"Lines : %g\n"
"PPL : %g\n"
"Startpos : %g/%g\n"
"Depth/Channels: %u/%u\n"
"Flags : %x\n\n",
__func__, params.xres, params.yres, params.lines, params.pixels, params.startx, params.starty, params.depth, params.channels, params.flags);
DBG(DBG_info, "%s ", __func__);
debug_dump(DBG_info, params);
half_ccd=compute_half_ccd(sensor, params.xres);

14
backend/genesys_gl841.cc
Wyświetl plik

@ -2183,18 +2183,8 @@ gl841_init_scan_regs(Genesys_Device * dev, const Genesys_Sensor& sensor, Genesys
SANE_Status status;
unsigned int oflags; /**> optical flags */
DBG(DBG_info,
"%s settings:\n"
"Resolution : %gDPI/%gDPI\n"
"Lines : %g\n"
"PPL : %g\n"
"Startpos : %g/%g\n"
"Depth/Channels: %u/%u\n"
"Flags : %x\n\n",
__func__, params.xres, params.yres, params.lines, params.pixels,
params.startx, params.starty,
params.depth, params.channels,
params.flags);
DBG(DBG_info, "%s ", __func__);
debug_dump(DBG_info, params);
/*
results:

12
backend/genesys_gl843.cc
Wyświetl plik

@ -1435,16 +1435,8 @@ static SANE_Status gl843_init_scan_regs(Genesys_Device* dev, const Genesys_Senso
SANE_Status status;
DBG(DBG_info, "%s:\n"
"Resolution : %gDPI/%gDPI\n"
"Lines : %g\n"
"PPL : %g\n"
"Startpos : %g/%g\n"
"Depth/Channels: %u/%u\n"
"Flags : %x\n\n",
__func__, session.params.xres, session.params.yres, session.params.lines,
session.params.pixels, session.params.startx, session.params.starty,
session.params.depth, session.params.channels, session.params.flags);
DBG(DBG_info, "%s ", __func__);
debug_dump(DBG_info, session.params);
DBG(DBG_info, "%s : stagger=%d lines\n", __func__, session.num_staggered_lines);

10
backend/genesys_gl846.cc
Wyświetl plik

@ -1123,14 +1123,8 @@ gl846_init_scan_regs(Genesys_Device * dev, const Genesys_Sensor& sensor, Genesys
int optical_res;
SANE_Status status;
DBG(DBG_info, "%s settings:\n"
"Resolution : %gDPI/%gDPI\n"
"Lines : %g\n"
"PPL : %g\n"
"Startpos : %g/%g\n"
"Depth/Channels: %u/%u\n"
"Flags : %x\n\n",
__func__, params.xres, params.yres, params.lines, params.pixels, params.startx, params.starty, params.depth, params.channels, params.flags);
DBG(DBG_info, "%s ", __func__);
debug_dump(DBG_info, params);
/* we may have 2 domains for ccd: xres below or above half ccd max dpi */
if (sensor.get_ccd_size_divisor_for_dpi(params.xres) > 1)

10
backend/genesys_gl847.cc
Wyświetl plik

@ -1139,14 +1139,8 @@ gl847_init_scan_regs(Genesys_Device * dev, const Genesys_Sensor& sensor, Genesys
int optical_res;
SANE_Status status;
DBG(DBG_info, "%s settings:\n"
"Resolution : %gDPI/%gDPI\n"
"Lines : %g\n"
"PPL : %g\n"
"Startpos : %g/%g\n"
"Depth/Channels: %u/%u\n"
"Flags : %x\n\n",
__func__, params.xres, params.yres, params.lines, params.pixels, params.startx, params.starty, params.depth, params.channels, params.flags);
DBG(DBG_info, "%s ", __func__);
debug_dump(DBG_info, params);
/* we may have 2 domains for ccd: xres below or above half ccd max dpi */
if (sensor.get_ccd_size_divisor_for_dpi(params.xres) > 1)

21
backend/genesys_low.cc
Wyświetl plik

@ -2096,3 +2096,24 @@ void debug_dump(unsigned level, const Genesys_Settings& settings)
settings.tl_x, settings.tl_y,
static_cast<unsigned>(settings.scan_mode));
}
void debug_dump(unsigned level, const SetupParams& params)
{
DBG(level, "settings:\n"
"Resolution X/Y : %u / %u dpi\n"
"Lines : %u\n"
"Pixels per line : %u\n"
"Depth : %u\n"
"Channels : %u\n"
"Start position X/Y : %.3f/%.3f\n"
"Scan mode : %d\n",
"Color filter : %d\n",
"Flags : %x\n",
params.xres, params.yres,
params.lines, params.pixels,
params.depth, params.channels,
params.startx, params.starty,
static_cast<unsigned>(params.scan_mode),
static_cast<unsigned>(params.color_filter),
params.flags);
}

1
backend/genesys_low.h
Wyświetl plik

@ -1900,5 +1900,6 @@ void genesys_init_sensor_tables();
void genesys_init_frontend_tables();
void debug_dump(unsigned level, const Genesys_Settings& settings);
void debug_dump(unsigned level, const SetupParams& params);
#endif /* not GENESYS_LOW_H */