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

genesys: Remove dead code related to SCAN_FLAG_USE_OPTICAL_RES

merge-requests/146/head
Povilas Kanapickas 2019-08-24 10:00:51 +03:00
rodzic 21f949bd87
commit 9a21a8335f
3 zmienionych plików z 3 dodań i 32 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

16
backend/genesys_gl124.cc
Wyświetl plik

@ -1062,7 +1062,6 @@ static void gl124_init_scan_regs(Genesys_Device* dev, const Genesys_Sensor& sens
DBG_HELPER(dbg); DBG_HELPER(dbg);
session.assert_computed(); session.assert_computed();
int used_res;
int start, used_pixels; int start, used_pixels;
int bytes_per_line; int bytes_per_line;
int move; int move;
@ -1089,20 +1088,7 @@ static void gl124_init_scan_regs(Genesys_Device* dev, const Genesys_Sensor& sens
} }
DBG (DBG_info, "gl124_init_scan_regs : stagger=%d lines\n", stagger); DBG (DBG_info, "gl124_init_scan_regs : stagger=%d lines\n", stagger);
/** @brief compute used resolution */ unsigned used_res = session.params.xres;
if (session.params.flags & SCAN_FLAG_USE_OPTICAL_RES) {
used_res = session.optical_resolution;
}
else
{
// resolution is choosen from a fixed list and can be used directly, unless we have ydpi
// higher than sensor's maximum one */
if (session.params.xres > session.optical_resolution) {
used_res = session.optical_resolution;
} else {
used_res = session.params.xres;
}
}
/* compute scan parameters values */ /* compute scan parameters values */
/* pixels are allways given at full optical resolution */ /* pixels are allways given at full optical resolution */

10
backend/genesys_gl846.cc
Wyświetl plik

@ -947,7 +947,6 @@ static void gl846_init_scan_regs(Genesys_Device* dev, const Genesys_Sensor& sens
DBG_HELPER(dbg); DBG_HELPER(dbg);
session.assert_computed(); session.assert_computed();
int used_res;
int start, used_pixels; int start, used_pixels;
int bytes_per_line; int bytes_per_line;
int move; int move;
@ -972,14 +971,7 @@ static void gl846_init_scan_regs(Genesys_Device* dev, const Genesys_Sensor& sens
} }
DBG(DBG_info, "%s : stagger=%d lines\n", __func__, stagger); DBG(DBG_info, "%s : stagger=%d lines\n", __func__, stagger);
if (session.params.flags & SCAN_FLAG_USE_OPTICAL_RES) { unsigned used_res = session.params.xres;
used_res = session.optical_resolution;
}
else
{
/* resolution is choosen from a list */
used_res = session.params.xres;
}
/* compute scan parameters values */ /* compute scan parameters values */
/* pixels are allways given at full optical resolution */ /* pixels are allways given at full optical resolution */

9
backend/genesys_gl847.cc
Wyświetl plik

@ -966,7 +966,6 @@ static void gl847_init_scan_regs(Genesys_Device* dev, const Genesys_Sensor& sens
DBG_HELPER(dbg); DBG_HELPER(dbg);
session.assert_computed(); session.assert_computed();
int used_res;
int start, used_pixels; int start, used_pixels;
int bytes_per_line; int bytes_per_line;
int move; int move;
@ -991,13 +990,7 @@ static void gl847_init_scan_regs(Genesys_Device* dev, const Genesys_Sensor& sens
} }
DBG(DBG_info, "%s : stagger=%d lines\n", __func__, stagger); DBG(DBG_info, "%s : stagger=%d lines\n", __func__, stagger);
/* used_res */ unsigned used_res = session.params.xres;
if (session.params.flags & SCAN_FLAG_USE_OPTICAL_RES) {
used_res = session.optical_resolution;
} else {
/* resolution is choosen from a list */
used_res = session.params.xres;
}
/* compute scan parameters values */ /* compute scan parameters values */
/* pixels are allways given at full optical resolution */ /* pixels are allways given at full optical resolution */