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

genesys: Use Image in gl843_search_strip()

merge-requests/194/head
Povilas Kanapickas 2019-09-17 17:21:06 +03:00
rodzic 08a4d8455f
commit 5e2a0f5724
1 zmienionych plików z 11 dodań i 18 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

29
backend/genesys_gl843.cc
Wyświetl plik

@ -3170,7 +3170,6 @@ static void gl843_search_strip(Genesys_Device* dev, const Genesys_Sensor& sensor
DBG_HELPER_ARGS(dbg, "%s %s", black ? "black" : "white", forward ? "forward" : "reverse"); DBG_HELPER_ARGS(dbg, "%s %s", black ? "black" : "white", forward ? "forward" : "reverse");
unsigned int pixels, lines, channels; unsigned int pixels, lines, channels;
Genesys_Register_Set local_reg; Genesys_Register_Set local_reg;
size_t size;
int steps, depth, dpi; int steps, depth, dpi;
unsigned int pass, count, found, x, y; unsigned int pass, count, found, x, y;
GenesysRegister *r; GenesysRegister *r;
@ -3213,9 +3212,6 @@ static void gl843_search_strip(Genesys_Device* dev, const Genesys_Sensor& sensor
gl843_init_scan_regs(dev, calib_sensor, &local_reg, session); gl843_init_scan_regs(dev, calib_sensor, &local_reg, session);
size = session.output_total_bytes_raw;
std::vector<uint8_t> data(size);
/* set up for reverse or forward */ /* set up for reverse or forward */
r = sanei_genesys_get_address(&local_reg, REG02); r = sanei_genesys_get_address(&local_reg, REG02);
if (forward) { if (forward) {
@ -3234,7 +3230,8 @@ static void gl843_search_strip(Genesys_Device* dev, const Genesys_Sensor& sensor
} while (steps); } while (steps);
// now we're on target, we can read data // now we're on target, we can read data
sanei_genesys_read_data_from_scanner(dev, data.data(), size); auto data = read_unshuffled_image_from_scanner(dev, session,
session.output_total_bytes_raw);
gl843_stop_action(dev); gl843_stop_action(dev);
@ -3244,7 +3241,7 @@ static void gl843_search_strip(Genesys_Device* dev, const Genesys_Sensor& sensor
char fn[40]; char fn[40];
snprintf(fn, 40, "gl843_search_strip_%s_%s%02d.pnm", snprintf(fn, 40, "gl843_search_strip_%s_%s%02d.pnm",
black ? "black" : "white", forward ? "fwd" : "bwd", (int)pass); black ? "black" : "white", forward ? "fwd" : "bwd", (int)pass);
sanei_genesys_write_pnm_file(fn, data.data(), depth, channels, pixels, lines); sanei_genesys_write_pnm_file(fn, data);
} }
/* loop until strip is found or maximum pass number done */ /* loop until strip is found or maximum pass number done */
@ -3262,7 +3259,7 @@ static void gl843_search_strip(Genesys_Device* dev, const Genesys_Sensor& sensor
} while (steps); } while (steps);
// now we're on target, we can read data // now we're on target, we can read data
sanei_genesys_read_data_from_scanner(dev, data.data(), size); data = read_unshuffled_image_from_scanner(dev, session, session.output_total_bytes_raw);
gl843_stop_action(dev); gl843_stop_action(dev);
@ -3271,7 +3268,7 @@ static void gl843_search_strip(Genesys_Device* dev, const Genesys_Sensor& sensor
char fn[40]; char fn[40];
snprintf(fn, 40, "gl843_search_strip_%s_%s%02d.pnm", snprintf(fn, 40, "gl843_search_strip_%s_%s%02d.pnm",
black ? "black" : "white", forward ? "fwd" : "bwd", (int)pass); black ? "black" : "white", forward ? "fwd" : "bwd", (int)pass);
sanei_genesys_write_pnm_file(fn, data.data(), depth, channels, pixels, lines); sanei_genesys_write_pnm_file(fn, data);
} }
/* search data to find black strip */ /* search data to find black strip */
@ -3287,13 +3284,11 @@ static void gl843_search_strip(Genesys_Device* dev, const Genesys_Sensor& sensor
for (x = 0; x < pixels; x++) for (x = 0; x < pixels; x++)
{ {
/* when searching for black, detect white pixels */ /* when searching for black, detect white pixels */
if (black && data[y * pixels + x] > 90) if (black && data.get_raw_channel(x, y, 0) > 90) {
{
count++; count++;
} }
/* when searching for white, detect black pixels */ /* when searching for white, detect black pixels */
if (!black && data[y * pixels + x] < 60) if (!black && data.get_raw_channel(x, y, 0) < 60) {
{
count++; count++;
} }
} }
@ -3323,14 +3318,12 @@ static void gl843_search_strip(Genesys_Device* dev, const Genesys_Sensor& sensor
/* count of white/black pixels depending on the color searched */ /* count of white/black pixels depending on the color searched */
for (x = 0; x < pixels; x++) for (x = 0; x < pixels; x++)
{ {
/* when searching for black, detect white pixels */ // when searching for black, detect white pixels
if (black && data[y * pixels + x] > 90) if (black && data.get_raw_channel(x, y, 0) > 90) {
{
count++; count++;
} }
/* when searching for white, detect black pixels */ // when searching for white, detect black pixels
if (!black && data[y * pixels + x] < 60) if (!black && data.get_raw_channel(x, y, 0) < 60) {
{
count++; count++;
} }
} }