Povilas Kanapickas
ab9f5531c1
Merge branch 'genesys-identify-sensor-channel-count' into 'master'
...
genesys: Identify sensor by supported channel count
See merge request sane-project/backends!140
2019-08-31 15:23:06 +00:00
Povilas Kanapickas
0c6d7cd4a4
Merge branch 'genesys-fix-missing-return-after-refactor' into 'master'
...
genesys: Fix missing return from a previous refactor
See merge request sane-project/backends!138
2019-08-31 14:56:23 +00:00
Povilas Kanapickas
3e2b6cead0
Merge branch 'genesys-gl646-simplify-sensor' into 'master'
...
genesys: Simplify sensor setup on GL646
See merge request sane-project/backends!139
2019-08-31 14:55:57 +00:00
Povilas Kanapickas
6216ada2e7
Merge branch 'genesys-fix-sensor-write' into 'master'
...
genesys: Fix writing to sensors
See merge request sane-project/backends!137
2019-08-31 14:43:05 +00:00
Povilas Kanapickas
5b99a428d2
Merge branch 'genesys-resolution-filter-class' into 'master'
...
genesys: Extract resolution filtering to separate class
See merge request sane-project/backends!136
2019-08-31 14:39:01 +00:00
Povilas Kanapickas
6e950209b6
Merge branch 'genesys-session-ccd-size-divisor' into 'master'
...
genesys: Use common code path for ccd_size_divisor computation
See merge request sane-project/backends!135
2019-08-31 14:09:52 +00:00
Povilas Kanapickas
c34cd7cd86
Merge branch 'genesys-common-sensor-profiles' into 'master'
...
genesys: Use the sensor description list for sensor profiles
See merge request sane-project/backends!134
2019-08-31 13:25:34 +00:00
Povilas Kanapickas
302932c1db
Merge branch 'genesys-gl843-single-gpio-setting-list' into 'master'
...
genesys: Move all gpio settings to a single struct on GL843
See merge request sane-project/backends!133
2019-08-31 13:20:00 +00:00
Povilas Kanapickas
4a9738b719
Merge branch 'genesys-simplify-reg-setting-set' into 'master'
...
genesys: Reduce duplication in GenesysRegisterSettingSet
See merge request sane-project/backends!132
2019-08-31 13:04:53 +00:00
Povilas Kanapickas
2896c21ffe
Merge branch 'genesys-frontend-type' into 'master'
...
genesys: Add frontend type to the frontend description
See merge request sane-project/backends!131
2019-08-31 12:58:50 +00:00
Povilas Kanapickas
562f900337
Merge branch 'genesys-override-dpiset' into 'master'
...
genesys: Implement a way to override dpiset
See merge request sane-project/backends!130
2019-08-31 12:54:14 +00:00
Povilas Kanapickas
e452e869c2
Merge branch 'genesys-simplify-shading-calibration' into 'master'
...
genesys: Simplify shading calibration
See merge request sane-project/backends!129
2019-08-31 12:46:46 +00:00
Povilas Kanapickas
c73a7b5b06
Merge branch 'genesys-fix-std-accumulate' into 'master'
...
genesys: Use correct type for std::plus
See merge request sane-project/backends!128
2019-08-31 12:24:34 +00:00
Povilas Kanapickas
5e5a1a6fc3
genesys: Use correct type for std::plus
2019-08-31 15:11:40 +03:00
Stanislav Yuzvinsky
e6b2786380
Merge branch 'macos-malloc-fix' into 'master'
...
ricoh2_buffer: fix malloc header location on macOS
See merge request sane-project/backends!90
2019-08-30 14:16:41 +00:00
Mikael Vallerie
7f491519d1
Removing MF635_PID, using MF630_PID instead
2019-08-27 15:34:47 +02:00
Mikael Vallerie
d08e4c9000
Removing MF633C/MF635C from docs, as it's just a variant of MF630
2019-08-27 15:33:58 +02:00
Mikael Vallerie
13008723cd
Right PIDs for MF633C/MF635C and MF645C
2019-08-26 18:41:29 +02:00
Mikael Vallerie
f38f0b8681
Right pid for MF645C
2019-08-26 18:41:06 +02:00
Povilas Kanapickas
2757475dd9
genesys: Use session.params.xres directly where possible
2019-08-24 10:13:44 +03:00
Povilas Kanapickas
ba3013b1aa
genesys: Handle full sensor scans on gl841 consistently to other chips
2019-08-24 10:13:43 +03:00
Povilas Kanapickas
48251cf8b2
genesys: Simplify start pixel computation on gl841
2019-08-24 10:13:42 +03:00
Povilas Kanapickas
6ca11bfd71
genesys: Always dump session after computing it
2019-08-24 10:13:41 +03:00
Povilas Kanapickas
5226a163ab
genesys: Use common code path to compute session optical_pixels
2019-08-24 10:05:53 +03:00
Povilas Kanapickas
ec5225e1f8
genesys: Assume correct resolution is passed from high-level
2019-08-24 10:00:52 +03:00
Povilas Kanapickas
9a21a8335f
genesys: Remove dead code related to SCAN_FLAG_USE_OPTICAL_RES
2019-08-24 10:00:51 +03:00
Povilas Kanapickas
21f949bd87
genesys: Remove *_compute_exposure() wrappers
2019-08-24 10:00:50 +03:00
Rolf Bensch
b4c95a8ade
pixma: backend version 0.23.1
2019-08-20 13:30:25 +02:00
Rolf Bensch
f64489bd71
pixma: fix ADF scanning for Canon MAXIFY MB2000 and MB2300 Series
2019-08-20 13:26:11 +02:00
Rolf Bensch
8446baf4f9
pixma: fix ADF scanning for Canon MAXIFY MB5000 Series
2019-08-20 13:11:57 +02:00
Mikael Vallerie
62284c2ed5
Docs for MF633C/MF635C and MF645C
2019-08-19 20:21:23 +02:00
Olaf Meeuwissen
5e74e1b794
genesys: Make std::plus<> template type instantiation explicit
...
This fixes compile errors on older versions of gcc and possibly other
C++ compilers.
2019-08-19 22:06:33 +09:00
Mikael Vallerie
5d21800b51
pixma: new scanners Canon i-SENSYS MF633C/MF635C, MF645C
2019-08-18 18:53:08 +02:00
Povilas Kanapickas
a2ade50870
genesys: Ensure that resolution is set to a supported one at high-level
...
Previously we relied on low-level implementation to detect when the
requested resolution is higher than one supported by the scanner and
seamlessly patch around so that the high-level code does not notice.
This complicates the low level implementation and results to duplicate
code.
2019-08-18 11:13:01 +03:00
Povilas Kanapickas
61a055a8cf
genesys: Pass the line width requested by the frontend separately
2019-08-18 11:13:00 +03:00
Povilas Kanapickas
0b2840a3ff
genesys: Clarify frontend param processing a little
2019-08-18 11:12:59 +03:00
Povilas Kanapickas
ec0ceaebb5
genesys: Use correct resolution to select sensor during option parsing
2019-08-18 11:12:58 +03:00
Povilas Kanapickas
f48239419a
genesys: Use common code path to compute session optical_resolution
2019-08-18 10:39:36 +03:00
Povilas Kanapickas
687b549f0a
genesys: Use ScanSession to compute ccd_size_divisor on all chips
2019-08-18 10:37:49 +03:00
Povilas Kanapickas
ceb56a8b3b
genesys: Move gl646 sensor settings to the common sensor table
2019-08-17 12:02:45 +03:00
Povilas Kanapickas
a31da79e07
genesys: Compute cksel from register descriptions on gl646
2019-08-17 12:02:44 +03:00
Povilas Kanapickas
0cd26a8adf
genesys: Extract resolution filtering to separate class
2019-08-17 11:56:45 +03:00
Povilas Kanapickas
5532f2f277
genesys: Add channel count to the parameters that identify a sensor
2019-08-17 11:51:35 +03:00
Povilas Kanapickas
f2871ca81d
genesys: Reduce duplication in channel count and depth calculation
2019-08-17 11:51:34 +03:00
Povilas Kanapickas
d9fab3a7d8
genesys: Fix incorrect channel count when fetching ccd_size_divisor
...
All current scanners use the same divisor on both 1 and 3 channels, so
this commit does not change behavior.
2019-08-17 11:49:10 +03:00
Povilas Kanapickas
e8d9b6ff5d
genesys: Reduce duplication in the Sensor_Master struct list
2019-08-17 11:49:09 +03:00
Povilas Kanapickas
f228e427a9
genesys: Store sensor settings in std::vector on gl646
2019-08-17 11:49:08 +03:00
Povilas Kanapickas
a8ed3df0fd
genesys: Merge Sensor_Settings struct to Sensor_Master
2019-08-17 11:49:07 +03:00
Povilas Kanapickas
c001662c05
genesys: Reorder the components on Sensor_Master struct
2019-08-17 11:49:06 +03:00
Povilas Kanapickas
71a467ddf3
genesys: Remove unused data from Sensor_Master on gl646
2019-08-17 11:49:05 +03:00