mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność
10 288 Commity
32 Gałęzie
59 Tagi
58 MiB
Wykres commitów

4782 Commity (c6784d2f1db40a65721766b6fc6442a93bc6eab8)

Autor SHA1 Wiadomość Data
Povilas Kanapickas 4c9f9f0847 Merge branch 'genesys-host-side-calibration' into 'master' 
genesys: Implement support for host-side calibration

See merge request sane-project/backends!195
 2019-09-29 18:44:12 +00:00
Povilas Kanapickas 7df7acbafd Merge branch 'genesys-gl843-image-calibration' into 'master' 
genesys: Use image pipeline for calibration on gl843

See merge request sane-project/backends!194
 2019-09-29 18:31:46 +00:00
Povilas Kanapickas cf5f30dec3 Merge branch 'genesys-fix-depth-option' into 'master' 
genesys: Fix handling of the `--depth` option

See merge request sane-project/backends!193
 2019-09-29 18:23:12 +00:00
Povilas Kanapickas b3445a1803 Merge branch 'genesys-move-register-lists-to-separate-files' into 'master' 
genesys: Move register address lists to separate files

See merge request sane-project/backends!192
 2019-09-29 18:09:59 +00:00
Povilas Kanapickas a30daa96d1 Merge branch 'genesys-misc-cleanup' into 'master' 
genesys: Miscellaneous cleanup

See merge request sane-project/backends!191
 2019-09-29 18:00:13 +00:00
Povilas Kanapickas 323f37753a genesys: Implement support for host-side calibration 2019-09-18 03:54:52 +03:00
Povilas Kanapickas 5e2a0f5724 genesys: Use Image in gl843_search_strip() 2019-09-17 17:21:06 +03:00
Povilas Kanapickas 08a4d8455f genesys: Use Image in gl843_coarse_gain_calibration() 2019-09-17 17:21:05 +03:00
Povilas Kanapickas 0746035980 genesys: Use Image in gl843_offset_calibration() 2019-09-17 17:21:04 +03:00
Povilas Kanapickas ac54f7f9bd genesys: Use Image in gl843_led_calibration() 2019-09-17 17:21:03 +03:00
Povilas Kanapickas 4a62165014 genesys: Use Image in gl843_search_start_position 2019-09-17 17:21:02 +03:00
Povilas Kanapickas 93395bd24e genesys: Add wrapper to retrieve raw channel value from image 2019-09-17 17:21:01 +03:00
Povilas Kanapickas 4f74dceaba genesys: Add wrapper that reads Image from the scanner 2019-09-17 17:21:00 +03:00
Povilas Kanapickas a5006703a3 genesys: Implement wrapper that writes Image to pnm file 2019-09-17 17:20:59 +03:00
Povilas Kanapickas 093439153e genesys: Add a way to retrieve full output of pipeline as an image 2019-09-17 17:20:58 +03:00
Povilas Kanapickas 3c99d405e0 genesys: Fix the default value of the depth option 2019-09-16 12:44:01 +03:00
Povilas Kanapickas a93d80651f genesys: Don't disable depth option even if one value is possible 2019-09-16 12:44:00 +03:00
Povilas Kanapickas b09aa6584d genesys: Add include guards to headers where missing 2019-09-16 11:36:02 +03:00
Povilas Kanapickas dc1350781f genesys: Move register address lists to separate files 2019-09-16 11:36:01 +03:00
Povilas Kanapickas 32c49e5ec1 Merge branch 'genesys-image-full-ownership' into 'master' 
genesys: Add class that handles full ownership of image data

See merge request sane-project/backends!188
 2019-09-29 17:25:50 +00:00
Povilas Kanapickas e53058e8b0 genesys: Add class that handles data ownership for full image 2019-09-29 20:03:48 +03:00
Povilas Kanapickas 6ced865d53 genesys: Move pixel-related functionality to separate file 2019-09-29 20:03:48 +03:00
Povilas Kanapickas 28b216513e Merge branch 'genesys-misc-cleanup' into 'master' 
genesys: Miscellaneous cleanup

See merge request sane-project/backends!185
 2019-09-28 18:22:42 +00:00
Povilas Kanapickas 11c80b129e genesys: Extract wait_until_has_valid_words() 2019-09-16 09:50:12 +03:00
Povilas Kanapickas b58192493e genesys: Properly use 16-bit data when calibrating 2019-09-16 09:50:11 +03:00
Povilas Kanapickas 599443bf72 genesys: Remove uses of dev->read_bytes_left_after_deseg 2019-09-16 09:34:15 +03:00
Povilas Kanapickas 5e60cc3636 genesys: Simplify calculations when on early document end 2019-09-16 09:34:14 +03:00
Povilas Kanapickas 20ad0c8c2e genesys: Add output_line_bytes_requested to the session struct 2019-09-16 09:34:13 +03:00
Povilas Kanapickas 88adea9cd6 genesys: Add the number of total bytes to the session struct 2019-09-16 09:34:12 +03:00
Povilas Kanapickas c3e7411aca genesys: Allow limiting the amount of data read from pipeline sources 2019-09-16 09:34:11 +03:00
Povilas Kanapickas 663e3a99ed genesys: Add a way to report persistent eof() status from pipeline 2019-09-16 09:34:10 +03:00
Povilas Kanapickas 2e10f4ac17 genesys: Report failures to produce full lines in pipeline 2019-09-16 09:34:09 +03:00
Povilas Kanapickas f2b1b4449e genesys: Add a way to use an image as a source for a pipeline 2019-09-16 09:34:08 +03:00
Povilas Kanapickas ab62a1448c genesys: Use session for pixel coordinates during calibration 2019-09-15 15:40:31 +03:00
Povilas Kanapickas b9346f0f79 genesys: Add a way to multiply the pixel counts sent to the scanner 2019-09-15 15:14:18 +03:00
Povilas Kanapickas 00b8441dfa genesys: Add a way to override logical HW dpi 2019-09-15 15:14:17 +03:00
Povilas Kanapickas 34c7a4cb29 genesys: Rename {dpihw => register_dpihw}_override 2019-09-15 15:14:16 +03:00
Povilas Kanapickas 050b0c1d8a genesys: Invert meaning of GENESYS_FLAG_LAZY_INIT 2019-09-15 14:46:48 +03:00
Povilas Kanapickas c7bb34c998 genesys: Simplify calibration calculations on GL843 2019-09-15 14:46:47 +03:00
Povilas Kanapickas 079fa25b0d genesys: Allow full value range of the frontend registers to be set 2019-09-15 14:46:46 +03:00
Povilas Kanapickas 2bb31ed5d8 genesys: Remove duplicate logs of information included into session 2019-09-15 14:46:45 +03:00
Olaf Meeuwissen 345be52f9e nec: Fix [-Werror=implicit-fallthrough] warning 
The fallthrough would log a message that is probably misleading.
 2019-09-28 20:33:26 +09:00
Povilas Kanapickas 29580b08b5 Merge branch 'genesys-deduplicate-shading-calibration' into 'master' 
genesys: Deduplicate shading calibration

See merge request sane-project/backends!184
 2019-09-28 05:49:11 +00:00
Povilas Kanapickas bf3e170dba Merge branch 'genesys-use-image-pipeline' into 'master' 
genesys: Use new image operations pipeline for image data reading and conversion

See merge request sane-project/backends!183
 2019-09-28 05:48:28 +00:00
Povilas Kanapickas f3d0a7c17c Merge branch 'genesys-fix-pow-ambiguity' into 'master' 
genesys: Fix ambiguity of std::pow() on old compilers

See merge request sane-project/backends!182
 2019-09-28 05:34:34 +00:00
Povilas Kanapickas bee1179e0e genesys: Print debug images of intermediate pipeline output 2019-09-28 07:33:28 +03:00
Povilas Kanapickas 41addb9730 genesys: Fix debug identifiers 2019-09-28 07:33:28 +03:00
Povilas Kanapickas 9cd1de5c52 genesys: Add a way to debug image pipelines 2019-09-28 07:33:28 +03:00
Povilas Kanapickas cd712f9f99 genesys: Use new image pipeline for row scaling 2019-09-28 07:33:28 +03:00
Povilas Kanapickas bf7e890fa4 genesys: Use new image pipeline for CCD line shifts and unstagger 2019-09-28 07:33:28 +03:00
Povilas Kanapickas 0b1bfa3f12 genesys: Swap 16-bit pixel endian on big endian machines 2019-09-28 07:33:27 +03:00
Povilas Kanapickas cae3015b66 genesys: Use new image pipeline for format and CIS reordering 2019-09-28 07:33:27 +03:00
Povilas Kanapickas 8cf5735278 genesys: Fix ambiguity of std::pow() on old compilers 2019-09-28 07:31:22 +03:00
Olaf Meeuwissen 9eefac82ca Merge branch '103-add-old-changelogs-to-source-tarball' into 'master' 
Resolve "Source tarball does not include older ChangeLogs"

Closes #103

See merge request sane-project/backends!127
 2019-09-28 03:09:07 +00:00
Povilas Kanapickas a500f577c0 Merge branch 'genesys-calibration-variable-names' into 'master' 
genesys: Improve clarity of calibration offset variable names

See merge request sane-project/backends!180
 2019-09-27 22:43:07 +00:00
Povilas Kanapickas c9e95999f3 Merge branch 'genesys-generic-register-set' into 'master' 
genesys: Make GenesysRegisterSettingSet generic

See merge request sane-project/backends!179
 2019-09-27 22:38:55 +00:00
Povilas Kanapickas db36dd8103 genesys: Move pixel coordinate calculation to a single place 2019-09-15 10:36:58 +03:00
Povilas Kanapickas be4c3c1f69 genesys: Reduce duplication of shading calculations 2019-09-14 13:49:23 +03:00
Povilas Kanapickas 580b9db562 genesys: Don't duplicate actions when DARK_CALIBRATION flag is off 2019-09-14 13:49:22 +03:00
Povilas Kanapickas 8790940cc3 genesys: Remove code that has no effects 2019-09-14 13:49:21 +03:00
Povilas Kanapickas 154ab4578b genesys: Extract calculation of dummy dark shading 2019-09-14 13:49:20 +03:00
Povilas Kanapickas 6f29caef0d genesys: Extract post-shading repark out of white calibration function 2019-09-14 13:49:19 +03:00
Povilas Kanapickas 802a62ee2c genesys: Fix incorrect calculation of output_line_bytes_raw on gl646 2019-09-13 16:40:42 +03:00
Povilas Kanapickas 40b2d8928f genesys: Fix definition of output_line_bytes_raw on gl841 CIS scanners 2019-09-13 16:40:41 +03:00
Povilas Kanapickas 434b03d498 genesys: Fix definition of output_line_bytes_raw on gl124 2019-09-13 16:40:40 +03:00
Povilas Kanapickas efbfcb0a7f genesys: Improve clarity of calibration offset variable names 2019-09-13 16:03:21 +03:00
Povilas Kanapickas dc52dc84f0 Merge branch 'genesys-misc-cleanup' into 'master' 
genesys: Miscellaneous cleanup

See merge request sane-project/backends!177
 2019-09-27 21:56:17 +00:00
Povilas Kanapickas 7a8da5c40b Merge branch 'genesys-analog-devices-adc-calibration' into 'master' 
genesys: Implement gain calibration for Analog-Devices ADC

See merge request sane-project/backends!176
 2019-09-27 21:32:02 +00:00
Povilas Kanapickas 0440123bdc Merge branch 'genesys-gl843-segmented-sensors' into 'master' 
genesys: Add support for segmented sensors on gl843

See merge request sane-project/backends!175
 2019-09-27 21:21:09 +00:00
Povilas Kanapickas 4cd9dbb73d Merge branch 'genesys-image-library' into 'master' 
genesys: Implement a streaming image library

See merge request sane-project/backends!174
 2019-09-27 21:06:44 +00:00
Povilas Kanapickas c59f9a037b Merge branch 'genesys-default-scan-method' into 'master' 
genesys: Add a way to specify default scan method

See merge request sane-project/backends!173
 2019-09-27 20:55:51 +00:00
Povilas Kanapickas 17dc1aee81 Merge branch 'genesys-desegmentation-refactor' into 'master' 
genesys: Simplify desegmentation state (part 6)

See merge request sane-project/backends!172
 2019-09-27 20:44:47 +00:00
Povilas Kanapickas e0974ab74a stv: Fix macro constant redefinition 2019-09-27 23:23:19 +03:00
Povilas Kanapickas 661aa3bcdb genesys: Make GenesysRegisterSettingSet generic 2019-09-13 15:56:44 +03:00
Povilas Kanapickas d4e4bf35c1 genesys: Fix a bug in segmented sensors when scanning 16-bit data 2019-09-13 15:37:33 +03:00
Povilas Kanapickas af17797d3c genesys: Use new image pipeline for handling segmented sensors 2019-09-13 15:37:32 +03:00
Povilas Kanapickas 7f852e0417 genesys: Fix depth calculation for segmented sensors in lineart mode 2019-09-13 15:37:31 +03:00
Povilas Kanapickas e89c6a0aab genesys: Remove accidental uses of C++14 APIs 2019-09-13 15:37:30 +03:00
Povilas Kanapickas 9a844e1ede genesys: Compute what image processing will be needed in session 2019-09-13 11:36:56 +03:00
Povilas Kanapickas a5efb96978 genesys: Replace uses of Genesys_Color_Order with ColorOrder 2019-09-13 11:36:55 +03:00
Povilas Kanapickas 05ed63fa34 genesys: Move setup of read buffer to a single function 2019-09-13 11:36:54 +03:00
Povilas Kanapickas 28d15784e4 genesys: Remove unused code 2019-09-13 11:36:53 +03:00
Povilas Kanapickas 8ed2cd991b genesys: Initialize frontend state from the outset 2019-09-13 11:36:52 +03:00
Povilas Kanapickas d73915ba19 genesys: Implement gain calibration for Analog-Devices ADC 2019-09-13 11:01:48 +03:00
Povilas Kanapickas e45e668326 genesys: Extract gain computation into a separate function 2019-09-13 11:01:47 +03:00
Povilas Kanapickas 94c1cf1d5a genesys: Add clamp() utility function 2019-09-13 11:01:46 +03:00
Povilas Kanapickas ad1067ad03 genesys: Add support for segmented sensors on gl843 2019-09-13 10:52:35 +03:00
Povilas Kanapickas 1c7ef4b55e genesys: Implement image data source that mimics current reading from USB 2019-09-13 10:38:05 +03:00
Povilas Kanapickas 7d7a395277 genesys: Implement library for image manipulation 2019-09-13 10:38:04 +03:00
Povilas Kanapickas 2f3d9e9d76 genesys: Don't crash when default scan method is not supported 2019-09-12 23:48:16 +03:00
Povilas Kanapickas 4c18ef27a2 genesys: Raise exception when device structs are not found 2019-09-12 23:48:15 +03:00
Povilas Kanapickas c2115543db genesys: Implement a way to set default scan method used internally 2019-09-12 23:48:14 +03:00
Povilas Kanapickas c0010fcd9f genesys: Fix incorrect scan method in move function on gl646 2019-09-12 23:48:13 +03:00
Povilas Kanapickas 9b7ab93727 genesys: Add unit test for genesys_fill_segmented_buffer() 2019-09-12 22:39:22 +03:00
Povilas Kanapickas 502478a40d genesys: Reindent genesys_fill_segmented_buffer() 2019-09-12 22:39:21 +03:00
Povilas Kanapickas c2c65f29c9 genesys: Simplify genesys_fill_segmented_buffer() 2019-09-12 22:39:20 +03:00
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
Povilas Kanapickas 453a6b75be genesys: Use common code path to compute session num_staggered_lines 2019-09-12 17:59:47 +03:00
Vladislav Bogdanov 8f1615f333 ricoh2: Add support for Aficio SG3110SFNw 2019-09-04 13:13:36 +03:00
Mikael Vallerie 7f491519d1 Removing MF635_PID, using MF630_PID instead 2019-08-27 15:34:47 +02:00
Mikael Vallerie 13008723cd Right PIDs for MF633C/MF635C and MF645C 2019-08-26 18:41:29 +02:00
Olaf Meeuwissen 2baee4914d umax_pp: Drop reference to ChangeLog in code comment 2019-08-26 21:48:52 +09:00
Olaf Meeuwissen eb5382c753 mustek_pp: Drop unused ChangeLog: references from comments 2019-08-26 21:48:09 +09: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
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 510b6d0d86 genesys: Remove gl646-specific get_ccd_size_divisor 2019-08-31 19:02:15 +03:00
Povilas Kanapickas e0efbd37b8 genesys: Use sensor functionality instead of compute_ccd_size_divisor() 2019-08-31 19:02:15 +03:00
Povilas Kanapickas a6a785e28d genesys: Use common path to compute ccd_size_divisor on gl646 2019-08-31 19:02:15 +03:00
Povilas Kanapickas e2e1efae80 genesys: Use the sensor passed to gl646_setup_registers() 2019-08-31 19:02:15 +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 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 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 0cd26a8adf genesys: Extract resolution filtering to separate class 2019-08-17 11:56:45 +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
Povilas Kanapickas b19720cfa1 genesys: Simplify sensor register desc by matching ccd_size_divisor 2019-08-17 11:49:04 +03:00
Povilas Kanapickas e36d6b8fb5 genesys: Simplify exposure setting on gl646 2019-08-17 11:49:03 +03:00
Povilas Kanapickas a4a1003ffc genesys: Rename Sensor_Master::{exposure->exposure_lperiod} 2019-08-17 11:49:02 +03:00
Povilas Kanapickas a3a3647006 genesys: Compute dpiset instead of storing it in tables on gl646 2019-08-17 11:49:01 +03:00
Povilas Kanapickas d2d43d5ed8 genesys: Make sensor table initialization more generic on gl646 2019-08-17 11:49:00 +03:00
Povilas Kanapickas 1330d2289b genesys: Correctly initialize Sensor_Master struct 2019-08-17 11:48:59 +03:00
Povilas Kanapickas eb4fb44048 genesys: Fix missing return from a previous refactor 2019-08-17 11:30:33 +03:00
Povilas Kanapickas 107404dcd0 genesys: Move ccd_size_divisor computation to compute_session() 2019-08-17 11:11:15 +03:00
Povilas Kanapickas 92412a90b2 genesys: Create compute_session() for common session computation 2019-08-17 11:11:14 +03: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 86ac877d82 genesys: Remove unused code 2019-08-17 11:05:38 +03:00
Povilas Kanapickas eb1c4fadb9 genesys: Pick correct sensors during option parsing 2019-08-17 11:05:37 +03:00
Povilas Kanapickas 1902c9fbcb genesys: Fix sensor const safety in *_search_start_position() 2019-08-17 11:05:36 +03:00
Povilas Kanapickas f019f9e7b8 genesys: Don't modify sensor in *_led_calibration() 2019-08-17 11:05:35 +03:00
Povilas Kanapickas 53d447b6dc genesys: Move GL846 sensor profiles to a common sensor array 2019-08-17 11:02:39 +03:00
Povilas Kanapickas 4978eceda3 genesys: Move GL847 sensor profiles to a common sensor array 2019-08-17 11:02:38 +03:00
Povilas Kanapickas 63cc11bce1 genesys: Move GL124 sensor profiles to a common sensor array 2019-08-17 11:02:37 +03:00
Povilas Kanapickas 4348451e47 genesys: Add sensor profile to the sensor struct 
This will allow moving per-chip sensor profile tables to a common
configuration
 2019-08-17 11:02:36 +03:00
Povilas Kanapickas ba546d5370 genesys: Store segment order as a std::vector 2019-08-17 11:02:35 +03: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 503797c248 genesys: Simplify shading computation by using enum for color order 2019-08-17 10:53:56 +03:00
Povilas Kanapickas 3a1163480a genesys: Store calibration data using correct type internally 2019-08-17 10:53:55 +03: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
Povilas Kanapickas 7872f87475 genesys: Move all gpio settings to a single struct on GL843 2019-08-17 10:38:58 +03:00
Povilas Kanapickas 8fce6b624c genesys: Don't perform offset and gain calibration on unknown frontends 2019-08-17 10:27:42 +03:00
Povilas Kanapickas 5580fc0db1 genesys: Add frontend type to the layout struct 2019-08-17 10:27:41 +03:00
Povilas Kanapickas a76a2a096e genesys: Implement a way to override DPISET on GL124 and GL843 2019-08-17 10:21:04 +03:00
Povilas Kanapickas db15a75504 genesys: Add a way to override dpihw 2019-08-17 10:21:03 +03:00
Povilas Kanapickas 458e31a0c0 genesys: Extract setting of DPIHW to a separate function 2019-08-17 10:21:02 +03:00
Povilas Kanapickas 759e450b6b genesys: Reduce logical duplication in GenesysRegisterSettingSet 2019-08-17 10:02:40 +03:00
Povilas Kanapickas 543ba367bc genesys: Rename GenesysRegisterSettingSet::{regs_->registers_} 2019-08-17 10:02:39 +03:00
Olaf Meeuwissen f37326784d Merge branch 'ci-tweaks' into 'master' 
CI tweaks

See merge request sane-project/backends!125
 2019-08-12 09:16:37 +00:00
Olaf Meeuwissen 08bff060f8 CI: Fix make distclean target 
Implicit compile dependencies prevent automake from adding dependency
tracking files to the list of files to clean up.
 2019-08-11 17:20:47 +09:00
Olaf Meeuwissen 21bb96d61e Merge branch 'fix-warnings' into 'master' 
Fix -Wimplicit-fallthrough warnings

See merge request sane-project/backends!85
 2019-08-11 01:48:16 +00:00
Olaf Meeuwissen 9344a957ed apple: Fix [-Wimplicit-fallthrough] compiler warning 
It doesn't make sense to log a value as both `Fixed` *and* `Int`.
 2019-08-11 10:16:00 +09:00
Olaf Meeuwissen 797cd1fb37 epson2, epsonds, kodakaio, magicolor: Don't set invalid value 
If the value to be set is not valid, it should not change the sval
structure (even if doing so has no negative side effects).

This also makes the fallthrough less confusing by removing the first
cast of two for the br-x and br-y values.
 2019-08-11 10:04:19 +09:00
Olaf Meeuwissen fcd537e207 sm3600: Fix [-Wimplicit-fallthrough] warning 
This fixes the warning for both #define SM3600_SUPPORT_EXPOSURE values.
 2019-08-10 20:49:09 +09:00
Povilas Kanapickas 6912400cf4 genesys: Move motor profile tables to a single file 2019-08-04 18:21:08 +03:00
Povilas Kanapickas aa4ee9c49e genesys: Split genesys_devices.cc file to separate files for each table 2019-08-04 18:21:07 +03:00
Povilas Kanapickas 6592692448 genesys: Compile genesys_devices.cc as a separate translation unit 2019-08-04 18:21:06 +03:00
Povilas Kanapickas 7159bbee32 Merge branch 'genesys-cleanup-gpo' into 'master' 
genesys: Cleanup the gpo setup

See merge request sane-project/backends!123
 2019-08-10 15:33:38 +00:00
Povilas Kanapickas 8a48e87741 Merge branch 'genesys-simplify-gl843-dpi' into 'master' 
genesys: Simplify GL843 DPI calculation

See merge request sane-project/backends!122
 2019-08-10 12:28:50 +00:00
Povilas Kanapickas b5ff3b4f43 Merge branch 'genesys-cleanup-motors' into 'master' 
genesys: Cleanup motor definitions

See merge request sane-project/backends!121
 2019-08-10 12:23:20 +00:00
Povilas Kanapickas ae525fb91b genesys: Remove trailing whitespace 2019-08-10 15:10:31 +03:00
Povilas Kanapickas 8cb6130cfe genesys: Cleanup the gpo setup 2019-08-04 14:01:50 +03:00
Povilas Kanapickas ca54462bd2 genesys: Simplify shading upload on gl843 2019-08-04 13:17:52 +03:00
Povilas Kanapickas 2df86f551f genesys: Fix incorrect dpi computation for G4050 2019-08-04 13:17:51 +03:00
Povilas Kanapickas d365637dfc genesys: Simplify optical regs setup on gl843 2019-08-04 13:17:50 +03:00
Povilas Kanapickas 3e09ba18fa genesys: Move pixel coordinate calculation to gl843_compute_session() 2019-08-04 13:17:49 +03:00
Povilas Kanapickas 6a0f17cecc genesys: Raise an exception if input resolution is out of bounds 2019-08-04 13:17:48 +03:00
Povilas Kanapickas 1c61d3692a genesys: Rewrap extremely long lines in motor step definitions 2019-08-04 12:01:52 +03:00
Povilas Kanapickas ea602f7ebc genesys: Rewrite and document sanei_genesys_calculate_zmod() 2019-08-04 12:01:51 +03:00
Povilas Kanapickas 6f20e6d341 genesys: Use std::vector for the motor slope tables 2019-08-04 12:01:50 +03:00
Povilas Kanapickas 510e8123f3 genesys: Remove support for multiple motor power modes 2019-08-04 12:01:49 +03:00
Povilas Kanapickas 239eab6ea6 genesys: Simplify motor setup to make it easier to expand 2019-08-04 12:01:48 +03:00
Povilas Kanapickas 7d6897ecb4 Merge branch 'genesys-fix-search-reference-point' into 'master' 
genesys: Fix search reference point to update all sensors

See merge request sane-project/backends!118
 2019-08-10 11:55:49 +00:00
Povilas Kanapickas b85a83f6af genesys: Remove no longer used optical flags variables 2019-08-04 10:52:58 +03:00
Povilas Kanapickas 306b160f00 genesys: Pass OPTICAL_FLAG_DISABLE_SHADING flag via session 2019-08-04 10:52:57 +03:00