Wykres commitów

9892 Commity (37b60ada834d707618e494d6b94f4f7b5d0217f9)

Autor SHA1 Wiadomość Data
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 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 0961c5d32f genesys: Use common code path to compute session output_pixels 2019-09-12 18:23:32 +03:00
Povilas Kanapickas 77e0acde22 genesys: Fix computation of total_bytes_to_read 2019-09-12 18:22:57 +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 453a6b75be genesys: Use common code path to compute session num_staggered_lines 2019-09-12 17:59:47 +03:00
Povilas Kanapickas 7e3a68c9e7 Merge branch 'sanei-usb-fix-build-without-usb' into 'master'
sanei_usb: Fix build when USB support is disabled

Closes #123

See merge request sane-project/backends!150
2019-09-09 21:54:13 +00:00
Povilas Kanapickas f2ce27f441 sanei_usb: Fix build when USB support is disabled 2019-09-10 00:39:08 +03:00
Stanislav Yuzvinsky 489a80088a Merge branch 'ricoh2' into 'master'
ricoh2: Add support for Aficio SG3110SFNw

See merge request sane-project/backends!149
2019-09-07 18:20:19 +00:00
Vladislav Bogdanov 8f1615f333 ricoh2: Add support for Aficio SG3110SFNw 2019-09-04 13:13:36 +03:00
Povilas Kanapickas 6b7052c4cf Merge branch 'genesys-misc-cleanup' into 'master'
genesys: Miscellaneous cleanup

See merge request sane-project/backends!148
2019-08-31 18:19:57 +00:00
Povilas Kanapickas fc85e7d15d Merge branch 'genesys-session-optical-pixels' into 'master'
genesys: Use common code path to compute session optical_pixels

See merge request sane-project/backends!147
2019-08-31 18:02:54 +00:00
Povilas Kanapickas 3db2278bea Merge branch 'genesys-misc-simplify' into 'master'
genesys: Miscellaneous simplifications

See merge request sane-project/backends!146
2019-08-31 17:44:21 +00:00
Povilas Kanapickas 66c804a7ea Merge branch 'genesys-ensure-correct-resolution-high-level' into 'master'
genesys: Ensure that correct resolution is passed from high level

See merge request sane-project/backends!145
2019-08-31 17:18:37 +00:00