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

genesys: Rename SensorProfile::segment_{count => size}

merge-requests/162/head
Povilas Kanapickas 2019-09-12 21:26:56 +03:00
rodzic 31820384de
commit 15996983ba
4 zmienionych plików z 22 dodań i 22 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
backend/genesys_gl846.cc
Wyświetl plik

@ -768,7 +768,7 @@ static void gl846_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens
/* in cas of multi-segments sensor, we have to add the witdh /* in cas of multi-segments sensor, we have to add the witdh
* of the sensor crossed by the scan area */ * of the sensor crossed by the scan area */
if (dev->model->flags & GENESYS_FLAG_SIS_SENSOR && segnb > 1) { if (dev->model->flags & GENESYS_FLAG_SIS_SENSOR && segnb > 1) {
dev->deseg.conseq_pixel_dist_bytes = sensor_profile.segment_count; dev->deseg.conseq_pixel_dist_bytes = sensor_profile.segment_size;
} }
/* use a segcnt rounded to next even number */ /* use a segcnt rounded to next even number */

2
backend/genesys_gl847.cc
Wyświetl plik

@ -787,7 +787,7 @@ static void gl847_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens
/* in cas of multi-segments sensor, we have to add the witdh /* in cas of multi-segments sensor, we have to add the witdh
* of the sensor crossed by the scan area */ * of the sensor crossed by the scan area */
if (dev->model->flags & GENESYS_FLAG_SIS_SENSOR && segnb > 1) { if (dev->model->flags & GENESYS_FLAG_SIS_SENSOR && segnb > 1) {
dev->deseg.conseq_pixel_dist_bytes = sensor_profile.segment_count; dev->deseg.conseq_pixel_dist_bytes = sensor_profile.segment_size;
} }
/* use a segcnt rounded to next even number */ /* use a segcnt rounded to next even number */

2
backend/genesys_sensor.h
Wyświetl plik

@ -165,7 +165,7 @@ struct SensorProfile
unsigned ccd_size_divisor = 1; unsigned ccd_size_divisor = 1;
unsigned exposure_lperiod = 0; unsigned exposure_lperiod = 0;
SensorExposure exposure; SensorExposure exposure;
unsigned segment_count = 0; // only on GL846, GL847 unsigned segment_size = 0; // only on GL846, GL847
std::vector<unsigned> segment_order; std::vector<unsigned> segment_order;
GenesysRegisterSettingSet custom_regs; GenesysRegisterSettingSet custom_regs;

38
backend/genesys_tables_sensor.cc
Wyświetl plik

@ -1638,7 +1638,7 @@ void genesys_init_sensor_tables()
profile.dpi = 200; profile.dpi = 200;
profile.exposure_lperiod = 2848; profile.exposure_lperiod = 2848;
profile.exposure = { 410, 275, 203 }; profile.exposure = { 410, 275, 203 };
profile.segment_count = 5136; profile.segment_size = 5136;
profile.segment_order = {}; profile.segment_order = {};
profile.custom_regs = { profile.custom_regs = {
{ 0x17, 0x0a }, { 0x17, 0x0a },
@ -1653,7 +1653,7 @@ void genesys_init_sensor_tables()
profile.dpi = 300; profile.dpi = 300;
profile.exposure_lperiod = 1424; profile.exposure_lperiod = 1424;
profile.exposure = { 410, 275, 203 }; profile.exposure = { 410, 275, 203 };
profile.segment_count = 5136; profile.segment_size = 5136;
profile.segment_order = {}; profile.segment_order = {};
profile.custom_regs = { profile.custom_regs = {
{ 0x17, 0x0a }, { 0x17, 0x0a },
@ -1668,7 +1668,7 @@ void genesys_init_sensor_tables()
profile.dpi = 600; profile.dpi = 600;
profile.exposure_lperiod = 1432; profile.exposure_lperiod = 1432;
profile.exposure = { 410, 275, 203 }; profile.exposure = { 410, 275, 203 };
profile.segment_count = 5136; profile.segment_size = 5136;
profile.segment_order = {}; profile.segment_order = {};
profile.custom_regs = { profile.custom_regs = {
{ 0x17, 0x0a }, { 0x17, 0x0a },
@ -1683,7 +1683,7 @@ void genesys_init_sensor_tables()
profile.dpi = 1200; profile.dpi = 1200;
profile.exposure_lperiod = 2712; profile.exposure_lperiod = 2712;
profile.exposure = { 746, 478, 353 }; profile.exposure = { 746, 478, 353 };
profile.segment_count = 5136; profile.segment_size = 5136;
profile.segment_order = {0, 1}; profile.segment_order = {0, 1};
profile.custom_regs = { profile.custom_regs = {
{ 0x17, 0x08 }, { 0x17, 0x08 },
@ -1698,7 +1698,7 @@ void genesys_init_sensor_tables()
profile.dpi = 2400; profile.dpi = 2400;
profile.exposure_lperiod = 5280; profile.exposure_lperiod = 5280;
profile.exposure = { 1417, 909, 643 }; profile.exposure = { 1417, 909, 643 };
profile.segment_count = 5136; profile.segment_size = 5136;
profile.segment_order = {0, 2, 1, 3}; profile.segment_order = {0, 2, 1, 3};
profile.custom_regs = { profile.custom_regs = {
{ 0x17, 0x06 }, { 0x17, 0x06 },
@ -1713,7 +1713,7 @@ void genesys_init_sensor_tables()
profile.dpi = 4800; profile.dpi = 4800;
profile.exposure_lperiod = 10416; profile.exposure_lperiod = 10416;
profile.exposure = { 2692, 1728, 1221 }; profile.exposure = { 2692, 1728, 1221 };
profile.segment_count = 5136; profile.segment_size = 5136;
profile.segment_order = {0, 2, 4, 6, 1, 3, 5, 7}; profile.segment_order = {0, 2, 4, 6, 1, 3, 5, 7};
profile.custom_regs = { profile.custom_regs = {
{ 0x17, 0x04 }, { 0x17, 0x04 },
@ -1776,7 +1776,7 @@ void genesys_init_sensor_tables()
profile.dpi = 150; profile.dpi = 150;
profile.exposure_lperiod = 2848; profile.exposure_lperiod = 2848;
profile.exposure = { 465, 310, 239 }; profile.exposure = { 465, 310, 239 };
profile.segment_count = 5187; profile.segment_size = 5187;
profile.segment_order = {}; profile.segment_order = {};
profile.custom_regs = { profile.custom_regs = {
{ 0x17, 0x0c }, { 0x17, 0x0c },
@ -1791,7 +1791,7 @@ void genesys_init_sensor_tables()
profile.dpi = 300; profile.dpi = 300;
profile.exposure_lperiod = 1424; profile.exposure_lperiod = 1424;
profile.exposure = { 465, 310, 239 }; profile.exposure = { 465, 310, 239 };
profile.segment_count = 5187; profile.segment_size = 5187;
profile.segment_order = {}; profile.segment_order = {};
profile.custom_regs = { profile.custom_regs = {
{ 0x17, 0x0c }, { 0x17, 0x0c },
@ -1806,7 +1806,7 @@ void genesys_init_sensor_tables()
profile.dpi = 600; profile.dpi = 600;
profile.exposure_lperiod = 1504; profile.exposure_lperiod = 1504;
profile.exposure = { 465, 310, 239 }; profile.exposure = { 465, 310, 239 };
profile.segment_count = 5187; profile.segment_size = 5187;
profile.segment_order = {}; profile.segment_order = {};
profile.custom_regs = { profile.custom_regs = {
{ 0x17, 0x0c }, { 0x17, 0x0c },
@ -1821,7 +1821,7 @@ void genesys_init_sensor_tables()
profile.dpi = 1200; profile.dpi = 1200;
profile.exposure_lperiod = 2696; profile.exposure_lperiod = 2696;
profile.exposure = { 1464, 844, 555 }; profile.exposure = { 1464, 844, 555 };
profile.segment_count = 5187; profile.segment_size = 5187;
profile.segment_order = {0, 1}; profile.segment_order = {0, 1};
profile.custom_regs = { profile.custom_regs = {
{ 0x17, 0x0a }, { 0x17, 0x0a },
@ -1836,7 +1836,7 @@ void genesys_init_sensor_tables()
profile.dpi = 2400; profile.dpi = 2400;
profile.exposure_lperiod = 10576; profile.exposure_lperiod = 10576;
profile.exposure = { 2798, 1558, 972 }; profile.exposure = { 2798, 1558, 972 };
profile.segment_count = 5187; profile.segment_size = 5187;
profile.segment_order = {0, 1, 2, 3}; profile.segment_order = {0, 1, 2, 3};
profile.custom_regs = { profile.custom_regs = {
{ 0x17, 0x08 }, { 0x17, 0x08 },
@ -1851,7 +1851,7 @@ void genesys_init_sensor_tables()
profile.dpi = 4800; profile.dpi = 4800;
profile.exposure_lperiod = 10576; profile.exposure_lperiod = 10576;
profile.exposure = { 2798, 1558, 972 }; profile.exposure = { 2798, 1558, 972 };
profile.segment_count = 5187; profile.segment_size = 5187;
profile.segment_order = {0, 1, 4, 5, 2, 3, 6, 7}; profile.segment_order = {0, 1, 4, 5, 2, 3, 6, 7};
profile.custom_regs = { profile.custom_regs = {
{ 0x17, 0x06 }, { 0x17, 0x06 },
@ -1912,7 +1912,7 @@ void genesys_init_sensor_tables()
profile.dpi = 200; profile.dpi = 200;
profile.exposure_lperiod = 2848; profile.exposure_lperiod = 2848;
profile.exposure = { 410, 275, 203 }; profile.exposure = { 410, 275, 203 };
profile.segment_count = 5136; profile.segment_size = 5136;
profile.segment_order = {}; profile.segment_order = {};
profile.custom_regs = { profile.custom_regs = {
{ 0x17, 0x0a }, { 0x17, 0x0a },
@ -1928,7 +1928,7 @@ void genesys_init_sensor_tables()
profile.dpi = 300; profile.dpi = 300;
profile.exposure_lperiod = 1424; profile.exposure_lperiod = 1424;
profile.exposure = { 410, 275, 203 }; profile.exposure = { 410, 275, 203 };
profile.segment_count = 5136; profile.segment_size = 5136;
profile.segment_order = {}; profile.segment_order = {};
profile.custom_regs = { profile.custom_regs = {
{ 0x17, 0x0a }, { 0x17, 0x0a },
@ -1943,7 +1943,7 @@ void genesys_init_sensor_tables()
profile.dpi = 600; profile.dpi = 600;
profile.exposure_lperiod = 1432; profile.exposure_lperiod = 1432;
profile.exposure = { 410, 275, 203 }; profile.exposure = { 410, 275, 203 };
profile.segment_count = 5136; profile.segment_size = 5136;
profile.segment_order = {}; profile.segment_order = {};
profile.custom_regs = { profile.custom_regs = {
{ 0x17, 0x0a }, { 0x17, 0x0a },
@ -1958,7 +1958,7 @@ void genesys_init_sensor_tables()
profile.dpi = 1200; profile.dpi = 1200;
profile.exposure_lperiod = 2712; profile.exposure_lperiod = 2712;
profile.exposure = { 746, 478, 353 }; profile.exposure = { 746, 478, 353 };
profile.segment_count = 5136; profile.segment_size = 5136;
profile.segment_order = {0, 1}; profile.segment_order = {0, 1};
profile.custom_regs = { profile.custom_regs = {
{ 0x17, 0x08 }, { 0x17, 0x08 },
@ -1973,7 +1973,7 @@ void genesys_init_sensor_tables()
profile.dpi = 2400; profile.dpi = 2400;
profile.exposure_lperiod = 5280; profile.exposure_lperiod = 5280;
profile.exposure = { 1417, 909, 643 }; profile.exposure = { 1417, 909, 643 };
profile.segment_count = 5136; profile.segment_size = 5136;
profile.segment_order = {0, 2, 1, 3}; profile.segment_order = {0, 2, 1, 3};
profile.custom_regs = { profile.custom_regs = {
{ 0x17, 0x06 }, { 0x17, 0x06 },
@ -3354,7 +3354,7 @@ void genesys_init_sensor_tables()
profile.dpi = 1200; profile.dpi = 1200;
profile.exposure_lperiod = 11000; profile.exposure_lperiod = 11000;
profile.exposure = { 0, 0, 0 }; profile.exposure = { 0, 0, 0 };
profile.segment_count = 5136; profile.segment_size = 5136;
profile.segment_order = {0, 1}; profile.segment_order = {0, 1};
profile.custom_regs = { profile.custom_regs = {
{ 0x17, 0x13 }, { 0x17, 0x13 },
@ -3416,7 +3416,7 @@ void genesys_init_sensor_tables()
profile.dpi = 1200; profile.dpi = 1200;
profile.exposure_lperiod = 11000; profile.exposure_lperiod = 11000;
profile.exposure = { 0, 0, 0 }; profile.exposure = { 0, 0, 0 };
profile.segment_count = 5136; profile.segment_size = 5136;
profile.segment_order = {0, 1}; profile.segment_order = {0, 1};
profile.custom_regs = { profile.custom_regs = {
{ 0x17, 0x13 }, { 0x17, 0x13 },