Povilas Kanapickas
693ff3e77a
genesys: Remove accidental use of C++14 features
2019-09-27 03:10:53 +03:00
Povilas Kanapickas
4f1890f195
Merge branch 'genesys-desegmentation-refactor' into 'master'
...
genesys: Simplify desegmentation state (part 3)
See merge request sane-project/backends!165
2019-09-24 22:46:08 +00:00
Povilas Kanapickas
a4729cff19
Merge branch 'genesys-misc-cleanup' into 'master'
...
genesys: Miscellaneous cleanup
See merge request sane-project/backends!164
2019-09-24 21:11:09 +00:00
Povilas Kanapickas
e4e1a02733
Merge branch 'genesys-session-hwdpi-divisor' into 'master'
...
genesys: Use common code path to compute session hwdpi divisor
See merge request sane-project/backends!163
2019-09-24 15:08:50 +00:00
Povilas Kanapickas
37b60ada83
Merge branch 'genesys-desegmetation-refactor' into 'master'
...
genesys: Simplify desegmentation state (part 2)
See merge request sane-project/backends!162
2019-09-24 14:41:17 +00:00
Olaf Meeuwissen
8539f350fd
sanei_wire: Fix sanei_w_void function signature
...
This function needs to have the same number of arguments as any other
functions passed to sanei_w_array() via its w_element argument, i.e.
sanei_w_char and sanei_w_word, in the w_option_value() implementation
in sanei/sanei_net.c.
Fixes [-Werror=cast-function-type] compiler warning.
2019-09-24 21:22:13 +09:00
Povilas Kanapickas
cad4085565
Merge branch 'genesys-session-buffer-sizes' into 'master'
...
genesys: Use common code path for computing session buffer sizes
See merge request sane-project/backends!161
2019-09-22 20:47:19 +00:00
Povilas Kanapickas
ce2d9840a7
Merge branch 'genesys-desegmentation-refactor' into 'master'
...
genesys: Simplify desegmentation state (part 1)
See merge request sane-project/backends!160
2019-09-22 18:29:02 +00:00
Povilas Kanapickas
f44c0bb680
Merge branch 'genesys-session-line-sizes' into 'master'
...
genesys: Use common code path to compute session line sizes
See merge request sane-project/backends!159
2019-09-22 17:39:15 +00:00
Povilas Kanapickas
37734c880d
Merge branch 'genesys-session-output-line-count' into 'master'
...
genesys: Use common code path to compute session output_line_count
See merge request sane-project/backends!158
2019-09-22 17:17:29 +00:00
Povilas Kanapickas
0cf4c1d555
Merge branch 'genesys-misc-cleanup' into 'master'
...
genesys: Miscellaneous cleanup in gl646 motor code
See merge request sane-project/backends!157
2019-09-22 16:58:14 +00:00
Povilas Kanapickas
6f51393bd7
Merge branch 'genesys-session-max-color-shift-lines' into 'master'
...
genesys: Use common code path to compute session max_color_shift_lines
See merge request sane-project/backends!155
2019-09-21 15:59:41 +00:00
Povilas Kanapickas
d0365bd7e4
Merge branch 'sanei-fix--usb-testing-mode-in-release' into 'master'
...
sanei_usb: Fix uninitialized device struct in USB testing code
See merge request sane-project/backends!156
2019-09-21 15:56:34 +00:00
Povilas Kanapickas
c69e22eb76
sanei_usb: Fix uninitialized device struct in USB testing code
2019-09-21 18:42:56 +03:00
Povilas Kanapickas
9afaf9a2cf
Merge branch 'genesys-fix-total-bytes-to-read' into 'master'
...
genesys: Fix computation of total_bytes_to_read
See merge request sane-project/backends!154
2019-09-20 14:37:24 +00:00
Povilas Kanapickas
da9307c7a6
Merge branch 'genesys-session-output-pixels' into 'master'
...
genesys: Use common code path to compute session output_pixels
See merge request sane-project/backends!153
2019-09-19 22:51:01 +00:00
Povilas Kanapickas
bd35742b78
Merge branch 'genesys-handle-non-uniform-scans-at-high-level' into 'master'
...
genesys: handle non-uniform scans at high level
See merge request sane-project/backends!152
2019-09-19 22:32:54 +00: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
aacdd88a27
pixma: update doc files
2019-09-12 22:08:49 +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
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
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
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