Povilas Kanapickas
0267eeeeae
genesys: Remove the desegmentation state struct
2019-09-12 22:22:00 +03:00
Povilas Kanapickas
3d023060a3
genesys: Move desegmentation skip_bytes to session struct
2019-09-12 22:21:59 +03:00
Povilas Kanapickas
192dd886cd
genesys: Use common code path to compute ..._segment_pixel_group_count
2019-09-12 22:21:58 +03:00
Povilas Kanapickas
4870a9f975
genesys: Properly set conseq_pixel_dist_bytes on gl124
2019-09-12 22:21:57 +03:00
Povilas Kanapickas
95eb6a72dd
genesys: Use single code path to compute session output_line_bytes_raw
2019-09-12 22:21:56 +03:00
Povilas Kanapickas
1f4a5311d7
genesys: Rename DesegmentationState::raw_{channel => line}_bytes
2019-09-12 22:21:55 +03:00
Povilas Kanapickas
61d4779402
genesys: Remove erroneously named raw_line_bytes
...
The raw_channel_bytes is what we store the line information to. Turns
out raw_line_bytes is unnecessary and only ever used by error.
2019-09-12 22:21:54 +03:00
Povilas Kanapickas
4df8872ab3
genesys: Simplify raw_channel_bytes computation more
...
On the chipsets in question, session.hwdpi_divisor == sensor.optical_res
/ sensor.get_register_hwdpi(...), so the divisor cancels out with the
rest of the expression.
2019-09-12 22:21:53 +03:00
Povilas Kanapickas
95a3836f1a
genesys: Simplify raw_channel_bytes calculation
2019-09-12 22:21:52 +03:00
Povilas Kanapickas
98320f5b81
genesys: Don't overflow in multiply_by_depth_ceil
2019-09-12 22:21:51 +03:00
Povilas Kanapickas
eb0882ecc4
genesys: Use common code path to compute session optical_pixels_raw
2019-09-12 22:11:20 +03:00
Povilas Kanapickas
3a323a751a
genesys: Use common code path to compute session conseq_pixel_dist_bytes
2019-09-12 22:11:19 +03:00
Povilas Kanapickas
693ff3e77a
genesys: Remove accidental use of C++14 features
2019-09-27 03:10:53 +03:00
Povilas Kanapickas
b856c2cb6f
genesys: Remove used_pixels to simplify segment setup
2019-09-12 21:24:32 +03:00
Povilas Kanapickas
0a10bcef59
genesys: Refactor the segment setup code to expose chip similarities
2019-09-12 21:24:31 +03:00
Povilas Kanapickas
41b5e5f5ff
genesys: Use common code path to compute session segment_count
2019-09-12 21:24:30 +03:00
Povilas Kanapickas
ae784d9927
genesys: Simplify segment count calculation
2019-09-12 21:24:29 +03:00
Povilas Kanapickas
a830fca943
genesys: Remove GL123 enum
2019-09-12 22:40:57 +03:00
Povilas Kanapickas
322a9a6810
genesys: Don't modify session in *_init_scan_regs()
2019-09-12 22:40:56 +03:00
Povilas Kanapickas
80d0129f44
genesys: Pass start pixel to *_init_optical_regs_scan() via session
2019-09-12 22:40:55 +03:00
Povilas Kanapickas
c0e465784e
genesys: Deduplicate different get_sensor_profile implementations
2019-09-12 22:40:54 +03:00
Povilas Kanapickas
52baae02dc
genesys: Use common code path to compute session hwdpi_divisor
2019-09-12 21:55:30 +03:00
Povilas Kanapickas
f480521a23
genesys: Pass sensor profile directly to *_setup_sensor() where possible
2019-09-12 21:55:29 +03:00
Povilas Kanapickas
676831dc7b
genesys: Move Genesys_Device::curr to DesegmentationState
2019-09-12 21:26:58 +03:00
Povilas Kanapickas
f92253adc8
genesys: Move Genesys_Device::segnb to DesegmentationState
2019-09-12 21:26:57 +03:00
Povilas Kanapickas
15996983ba
genesys: Rename SensorProfile::segment_{count => size}
2019-09-12 21:26:56 +03:00
Povilas Kanapickas
31820384de
genesys: Move Genesys_Device::skip to DesegmentationState
2019-09-12 21:26:55 +03:00
Povilas Kanapickas
9bd14f5350
genesys: Move Genesys_Device::len to DesegmentationState
2019-09-12 21:26:54 +03:00
Povilas Kanapickas
07d8db5423
genesys: Move Genesys_Device::dist to DesegmentationState
2019-09-12 21:26:53 +03:00
Povilas Kanapickas
dd70296827
genesys: Move desegmentation line width data to a separate struct
2019-09-12 21:26:52 +03:00
Povilas Kanapickas
827c3a049d
genesys: Rename ScanSession::output_{line_channel => channel}_bytes
2019-09-12 21:26:51 +03:00
Povilas Kanapickas
cbb7e95350
genesys: Use common code path to compute session buffer sizes
2019-09-12 20:28:46 +03:00
Povilas Kanapickas
a0cead1cd5
genesys: Pass asic type to sanei_genesys_get_bulk_max_size()
2019-09-12 20:28:45 +03:00
Povilas Kanapickas
88d6cdcc32
genesys: Rename read_bytes_left -> read_bytes_left_after_deseg
2019-09-12 20:06:38 +03:00
Povilas Kanapickas
96a893bb0d
genesys: Simplify words_per_line calculations
2019-09-12 20:06:37 +03:00
Povilas Kanapickas
463f5f4364
genesys: Don't duplicate data passed to *_init_optical_regs_scan()
2019-09-12 20:06:36 +03:00
Povilas Kanapickas
ed4419e73d
genesys: Use common code path to calculate session line sizes
2019-09-12 19:49:51 +03:00
Povilas Kanapickas
9915608309
genesys: Extract multiplication by depth to a separate function
2019-09-12 19:49:50 +03:00
Povilas Kanapickas
991eec63d5
genesys: Use common code path to compute session output_line_count
2019-09-12 19:34:43 +03:00
Povilas Kanapickas
605fcf9762
genesys: Assume correct resolution is passed from high-level
2019-09-12 19:11:07 +03:00
Povilas Kanapickas
73951b4bf8
genesys: Simplify motor code on gl646 by retining real motor dpi prop
2019-09-12 19:11:06 +03:00
Povilas Kanapickas
ce144ed46f
genesys: Use common code path to compute session max_color_shift_lines
2019-09-12 18:27:45 +03:00
Povilas Kanapickas
77e0acde22
genesys: Fix computation of total_bytes_to_read
2019-09-12 18:22:57 +03:00
Povilas Kanapickas
0961c5d32f
genesys: Use common code path to compute session output_pixels
2019-09-12 18:23:32 +03:00
Povilas Kanapickas
50e5c80434
genesys: Remove low-level handling of xdpi < ydpi case
...
The high-level code ensures that the xdpi is always natively supported
by the scanner.
2019-09-12 18:21:18 +03:00
Povilas Kanapickas
548eff4a32
genesys: Fix support for scans when xdpi<ydpi on gl646
2019-09-12 18:21:17 +03:00
Povilas Kanapickas
21254ad929
genesys: Use Sensor::optical_res directly where possible
2019-09-12 18:21:16 +03:00
Povilas Kanapickas
c1b8cb5c31
Merge branch 'genesys-session-num-staggered-lines' into 'master'
...
genesys: Use common code path to compute session num_staggered_lines
See merge request sane-project/backends!151
2019-09-19 22:17:43 +00:00
Rolf Bensch
1e2f64dc3d
pixma: backend version 0.23.2
2019-09-12 22:09:22 +02:00
Rolf Bensch
fd94a7e60c
Merge branch 'MF633_635_645' into 'master'
...
pixma: new scanners Canon i-SENSYS MF633C/MF635C, MF645C
See merge request sane-project/backends!126
2019-09-12 19:42:12 +00:00