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

disable GL841 shading and gamma correction when searching for strip

merge-requests/1/head
Stphane Voltz 2010-01-12 06:38:59 +01:00
rodzic 7724df7c8b
commit 802987f983
1 zmienionych plików z 27 dodań i 15 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

42
backend/genesys_gl841.c
Wyświetl plik

@ -6000,7 +6000,14 @@ gl841_search_strip (Genesys_Device * dev, SANE_Bool forward, SANE_Bool black)
local_reg, local_reg,
dpi, dpi,
dpi, dpi,
0, 0, pixels, lines, depth, channels, 0, 0); 0,
0,
pixels,
lines,
depth,
channels,
0,
SCAN_FLAG_DISABLE_SHADING | SCAN_FLAG_DISABLE_GAMMA);
if (status != SANE_STATUS_GOOD) if (status != SANE_STATUS_GOOD)
{ {
DBG (DBG_error, DBG (DBG_error,
@ -6063,7 +6070,7 @@ gl841_search_strip (Genesys_Device * dev, SANE_Bool forward, SANE_Bool black)
pass = 0; pass = 0;
if (DBG_LEVEL >= DBG_data) if (DBG_LEVEL >= DBG_data)
{ {
sprintf (title, "search_strip_%s%02d.pnm", sprintf (title, "search_strip_%s_%s%02d.pnm", black ? "black" : "white",
forward ? "fwd" : "bwd", pass); forward ? "fwd" : "bwd", pass);
sanei_genesys_write_pnm_file (title, data, depth, channels, pixels, sanei_genesys_write_pnm_file (title, data, depth, channels, pixels,
lines); lines);
@ -6120,10 +6127,10 @@ gl841_search_strip (Genesys_Device * dev, SANE_Bool forward, SANE_Bool black)
if (DBG_LEVEL >= DBG_data) if (DBG_LEVEL >= DBG_data)
{ {
sprintf (title, "search_strip_%s%02d.pnm", sprintf (title, "search_strip_%s_%s%02d.pnm",
forward ? "fwd" : "bwd", pass); black ? "black" : "white", forward ? "fwd" : "bwd", pass);
sanei_genesys_write_pnm_file (title, data, depth, channels, sanei_genesys_write_pnm_file (title, data, depth, channels, pixels,
pixels, lines); lines);
} }
/* search data to find black strip */ /* search data to find black strip */
@ -6162,13 +6169,14 @@ gl841_search_strip (Genesys_Device * dev, SANE_Bool forward, SANE_Bool black)
} }
else else
{ {
DBG (DBG_data, "gl841_search_strip: pixels=%d, count=%d\n", DBG (DBG_data,
pixels, count); "gl841_search_strip: pixels=%d, count=%d (%d%%)\n",
pixels, count, (100 * count) / pixels);
} }
} }
} }
else /* since calibration scans are done forward, we need the whole area else /* since calibration scans are done forward, we need the whole area
to be of the required color when searching backward */ to be of the required color when searching backward */
{ {
count = 0; count = 0;
for (y = 0; y < lines; y++) for (y = 0; y < lines; y++)
@ -6195,12 +6203,14 @@ gl841_search_strip (Genesys_Device * dev, SANE_Bool forward, SANE_Bool black)
{ {
found = 1; found = 1;
DBG (DBG_data, DBG (DBG_data,
"gl841_search_strip: strip found backward during pass %d \n", pass); "gl841_search_strip: strip found backward during pass %d \n",
pass);
} }
else else
{ {
DBG (DBG_data, "gl841_search_strip: pixels=%d, count=%d\n", DBG (DBG_data,
pixels, count); "gl841_search_strip: pixels=%d, count=%d (%d%%)\n", pixels,
count, (100 * count) / pixels);
} }
} }
pass++; pass++;
@ -6209,12 +6219,14 @@ gl841_search_strip (Genesys_Device * dev, SANE_Bool forward, SANE_Bool black)
if (found) if (found)
{ {
status = SANE_STATUS_GOOD; status = SANE_STATUS_GOOD;
DBG (DBG_info, "gl841_search_strip: strip found\n"); DBG (DBG_info, "gl841_search_strip: %s strip found\n",
black ? "black" : "white");
} }
else else
{ {
status = SANE_STATUS_UNSUPPORTED; status = SANE_STATUS_UNSUPPORTED;
DBG (DBG_info, "gl841_search_strip: strip not found\n"); DBG (DBG_info, "gl841_search_strip: %s strip not found\n",
black ? "black" : "white");
} }
DBG (DBG_proc, "gl841_search_strip: completed\n"); DBG (DBG_proc, "gl841_search_strip: completed\n");