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

5796 Commity (a94c17175f2bd3bf541fc62ff1036351c44eefa0)

Autor SHA1 Wiadomość Data
Rolf Bensch dc25c9f48d pixma: backend version 0.28.0 2020-06-05 23:20:41 +02:00
Rolf Bensch d2ae0ee697 pixma: update coryright 2020-06-05 23:19:21 +02:00
Rolf Bensch edace214b2 Merge branch 'pixma/gamma_table' into 'master' 
Pixma: fix internal generated gamma table

See merge request sane-project/backends!295
 2020-06-05 20:58:07 +00:00
Rolf Bensch 4b9dddb763 remove debug outputs from send gamma table 2020-06-05 22:41:32 +02:00
Rolf Bensch 0118111c6f use capability to select gamma table size 2020-06-05 22:07:19 +02:00
thierry1970 f52f4917e5 Error syntax 2020-06-05 11:45:21 +02:00
thierry1970 641c736c37 Replacement of printf by DBG. 2020-06-05 10:20:21 +02:00
Rolf Bensch 16ddd3b972 get 1024 and 4096 size gamma tables from frontend 
Default gamma table has 1024 entries of 16 bits values. Only generation 1
scanners need a gamma table with 4096 entries of 8 bits values.
 2020-05-30 23:41:06 +02:00
Rolf Bensch 1486b81dd9 pixma: fix description of adf-wait 2020-05-30 16:22:00 +02:00
Rolf Bensch 16ff7c0bba generate gamma table from control option 
we need to generate gamma table only once, after getting gamma from the frontend
 2020-05-30 16:18:20 +02:00
Rolf Bensch 057aa02b34 new capability for scanner generation 1 4096 bytes gamma table 2020-05-30 16:04:25 +02:00
Rolf Bensch 11126468ef calculate 16-bit gamma table 
Generation 1 scanners need a 8-bit gamma table, with 4096 bytes size.
All other scanners need a 16-bit gamma table, with 1024 bytes size. For
these scanners values of the generated gamma table are close by the values
used from the manufacturers proprietary driver.
 2020-05-30 16:02:01 +02:00
Rolf Bensch 103c77ddee new global variable for gamma 
get gamma value from 'opt_gamma'
 2020-05-30 15:27:42 +02:00
Rolf Bensch 24c016f408 pixma_gen_options.py: fix print whitespace 2020-05-30 15:12:46 +02:00
Povilas Kanapickas 96f60115df genesys: Bump calibration version 2020-05-26 01:51:23 +03:00
Povilas Kanapickas 23079e0061 genesys: Increase timeout in wait_until_has_valid_words() 2020-05-26 01:51:20 +03:00
Povilas Kanapickas 3cca2593fc genesys: Add support for Canon 5600F 2020-05-26 01:51:19 +03:00
Povilas Kanapickas b9e4113ef0 genesys: Add functions to write to register according to mask 2020-05-26 01:51:18 +03:00
Povilas Kanapickas 7c74cb7ce9 genesys: Remove no longer used code 2020-05-26 01:32:45 +03:00
Povilas Kanapickas 8ec6bc2e5d genesys: Deduplicate move_to_ta() 2020-05-26 01:32:44 +03:00
Povilas Kanapickas c4135d63a7 genesys: Simplify move_to_ta() on gl843 2020-05-26 01:32:43 +03:00
Povilas Kanapickas bc973a21c2 genesys: Simplify move_to_ta() on gl842 2020-05-26 01:32:42 +03:00
Povilas Kanapickas b8a24ee409 genesys: Remove useless debug statements 2020-05-26 01:32:41 +03:00
Povilas Kanapickas 57a398888d genesys: Deduplicate init_regs_for_scan() 2020-05-26 01:32:40 +03:00
Povilas Kanapickas 66ba92cfb6 genesys: Don't throw exception in non-exceptional circumstances 2020-05-26 01:32:39 +03:00
Povilas Kanapickas 7c378476e8 Merge branch 'genesys-gl847-transparency' into 'master' 
genesys: Implement transparency support on gl847

See merge request sane-project/backends!475
 2020-05-25 22:30:48 +00:00
Povilas Kanapickas 64b69331d3 Merge branch 'genesys-misc-fixes' into 'master' 
genesys: Miscellaneous fixes

See merge request sane-project/backends!474
 2020-05-25 22:29:03 +00:00
Povilas Kanapickas 786442d9c7 Merge branch 'genesys-pixel-offsets' into 'master' 
genesys: Pixel offset calculation adjustments

See merge request sane-project/backends!473
 2020-05-25 22:26:23 +00:00
Povilas Kanapickas 6bf26b3882 Merge branch 'genesys-host-side-calibration' into 'master' 
genesys: Reimplement simplier host-side calibration

See merge request sane-project/backends!472
 2020-05-25 22:25:47 +00:00
Povilas Kanapickas f3b04b374a genesys: Implement transparency support on gl847 2020-05-26 01:14:43 +03:00
Povilas Kanapickas 8a66829057 genesys: Simplify access to nodes that are newly added to image pipeline 2020-05-26 01:13:20 +03:00
Povilas Kanapickas c9182dc606 genesys: Ensure ImagePipelineStack nodes are destroyed in reverse order 2020-05-26 01:13:19 +03:00
Povilas Kanapickas 3282c5a654 genesys: Fix TIFF file writing 2020-05-26 01:13:18 +03:00
Povilas Kanapickas ba91fc844d genesys: Fix start pixel calculation when optical resolution is not max 2020-05-26 01:10:52 +03:00
Povilas Kanapickas 56db2b988a genesys: Adjust host side calibration by shading pixel offset 2020-05-26 01:10:51 +03:00
Povilas Kanapickas 8a10e33a13 genesys: Move all pixel adjustment calculations to a single function 2020-05-26 01:10:50 +03:00
Povilas Kanapickas b569e6cbb9 genesys: Reimplement simplier host-side calibration 2020-05-26 01:09:23 +03:00
Olaf Meeuwissen 08613aad26 gt68xx: Remove @PACKAGEVERSION@ from configuration filey 2020-05-25 20:48:35 +09:00
Povilas Kanapickas 92bf0c6623 genesys: Remove broken interpolation support 2020-05-24 20:44:26 +03:00
Povilas Kanapickas 6a495f9725 genesys: Remove duplicate align_int_up() 2020-05-24 20:44:25 +03:00
Povilas Kanapickas e7e5322003 genesys: Remove dead code 2020-05-24 20:44:24 +03:00
Povilas Kanapickas 33fc7cfb29 genesys: Retrieve output parameters out of the actual pipeline 2020-05-24 18:36:48 +03:00
Povilas Kanapickas a12083c8c4 genesys: Remove support for generating lineart within the backend 2020-05-24 18:20:17 +03:00
Povilas Kanapickas a23d61c26b genesys: Allow pipeline to be created without mutating device 2020-05-24 18:02:03 +03:00
Povilas Kanapickas 28e6ad89b8 genesys: Simplify read buffer size calculation 2020-05-24 16:35:59 +03:00
Povilas Kanapickas ec5af18239 genesys: Remove no longer used ImageBufferGenesysUsb 2020-05-24 16:35:59 +03:00
Povilas Kanapickas d172b9cc4d genesys: Remove read buffer after image processing 2020-05-24 16:35:59 +03:00
Povilas Kanapickas f5af633263 genesys: Simplify data buffering in main image pipeline 2020-05-23 10:39:09 +03:00
Povilas Kanapickas 9873fdf922 genesys: Don't read too much data when segment count is more than one 2020-05-23 10:39:08 +03:00
Povilas Kanapickas 55691ece2c genesys: Merge ImagePipelineNodeBuffered{CallableSource and GenesysUsb} 2020-05-23 10:39:07 +03:00
Povilas Kanapickas 8981e583e2 genesys: Move math utilities to utilities.h 2020-05-23 10:39:06 +03:00
Povilas Kanapickas fe323f19cb genesys: Add a way to push constructed nodes to pipeline 2020-05-23 10:39:05 +03:00
Povilas Kanapickas afa798d71a genesys: Simplify ImagePipelineNodeArraySource 2020-05-23 10:39:04 +03:00
Povilas Kanapickas d680724f9e Merge branch 'genesys-debug-tiff' into 'master' 
genesys: Use TIFF files for debugging

See merge request sane-project/backends!464
 2020-05-23 11:18:34 +00:00
Povilas Kanapickas d770012132 genesys: Use TIFF files for debugging 2020-05-23 14:03:01 +03:00
Povilas Kanapickas aa937c5b4c genesys: Simplify pixel positioning for unstaggering 2020-05-23 14:02:32 +03:00
Povilas Kanapickas 5a455e741b genesys: Fix align_multiple_{floor,ceil} for zero multiple 2020-05-23 14:02:31 +03:00
Povilas Kanapickas bb05afdbfd genesys: Fix erroneous multiplication by channels on gl646 cis 2020-05-23 14:02:30 +03:00
Povilas Kanapickas 5f0abce90f genesys: Add support for unstaggering in X direction 2020-05-22 01:23:50 +03:00
Povilas Kanapickas 95d7196fca genesys: Implement image pipeline node to shift columns 2020-05-22 01:23:49 +03:00
Povilas Kanapickas 1bae94fd1e genesys: Support more than 2 columns in ImagePipelineNodePixelShiftLines 2020-05-22 01:23:48 +03:00
Povilas Kanapickas d980da1ff7 genesys: Improve vertical staggering to support more than 2 lines 2020-05-22 01:23:47 +03:00
Povilas Kanapickas 4b0f3ed02c genesys: Warn if output and requested widths don't match 2020-05-21 23:40:59 +03:00
Povilas Kanapickas a6f023fee1 genesys: Reuse Genesys_Settings::requested_pixels for bytes per line 2020-05-21 23:40:58 +03:00
Povilas Kanapickas c50bfb8493 genesys: Simplify calc_parameters() by making data flow explicit 2020-05-21 23:40:57 +03:00
Povilas Kanapickas 90a2386c01 genesys: Fix const safety of sensor retrieval functions 2020-05-21 23:40:56 +03:00
Povilas Kanapickas 0957103cc3 genesys: Prefer to have a local `dev` variable for Genesys_Device* 2020-05-21 23:40:55 +03:00
Povilas Kanapickas 83f7520fe7 genesys: Remove obsolete comment 2020-05-21 20:51:17 +03:00
Povilas Kanapickas 0d97c3d195 genesys: Simplify genesys_read_ordered_data() 2020-05-21 20:51:16 +03:00
Povilas Kanapickas 1eccbf5aef genesys: Remove no longer used buffers 2020-05-21 20:51:15 +03:00
Povilas Kanapickas 3cd0914f67 Merge branch 'genesys-remove-image-enhancement' into 'master' 
genesys: Remove image enhancement functionality

See merge request sane-project/backends!460
 2020-05-21 17:38:18 +00:00
Povilas Kanapickas b42ed0343a genesys: Fix uninitialized variable 2020-05-21 20:21:05 +03:00
Povilas Kanapickas 78ed723f38 genesys: Fix invalid writes in ImagePipelineNodeInvert for 1-bit data 2020-05-21 20:21:04 +03:00
Povilas Kanapickas 2986d95ee7 genesys: Fix potential out of bounds access in line shift pipeline nodes 2020-05-21 20:21:03 +03:00
Povilas Kanapickas 657de7d72a genesys: Remove image enhancement functionality from the backend 2020-05-21 20:16:36 +03:00
Povilas Kanapickas 59abadd065 genesys: Fix debug statement logging directly to stderr 2020-05-21 20:16:35 +03:00
Povilas Kanapickas 5a727324f9 genesys: Update enum formatters for OpticFilm 7200 2020-05-20 22:00:16 +03:00
Povilas Kanapickas 4fea56dfe8 genesys: Add function to format SensorId 2020-05-20 22:00:15 +03:00
Olaf Meeuwissen bfea8a1a82 Merge branch 'master' into 'release/1.0.30' 
# Conflicts:
#   NEWS
 2020-05-18 12:08:28 +00:00
Povilas Kanapickas e62f130523 genesys: Replace ccd_size_divisor with explicit optical resolution 2020-05-18 06:35:20 +03:00
Povilas Kanapickas b5430cc039 genesys: Rename Genesys_Sensor::{optical_res => full_resolution} 2020-05-18 06:35:19 +03:00
Povilas Kanapickas c2851ff61f genesys: Slow fast movements on higher resolutions on LiDE 35,50 2020-05-18 04:34:28 +03:00
Povilas Kanapickas b35345ae7a genesys: Use quarter step for high-resolution scans on LiDE 35,50 2020-05-18 04:34:28 +03:00
Povilas Kanapickas cf8f9c75f9 genesys: Add missing register writes on gl841 2020-05-18 04:34:28 +03:00
Povilas Kanapickas 96a5f963a3 genesys: Make sure full-step tables are used on gl841 2020-05-18 04:34:28 +03:00
Povilas Kanapickas e5fa8dd3cc genesys: Simplify motor mode selection on gl841 2020-05-18 04:34:28 +03:00
Povilas Kanapickas 69202b2b56 genesys: Add separate sensor definition for LiDE 60 2020-05-18 04:34:28 +03:00
Povilas Kanapickas 341fdbbee7 genesys: Add missing register writes on LiDE 60 2020-05-18 04:34:28 +03:00
Povilas Kanapickas bb04101990 genesys: Use scan table for back table on gl841 2020-05-18 04:34:28 +03:00
Povilas Kanapickas 5820e1e0bd genesys: Restore full motor table writes on gl841 2020-05-18 04:34:28 +03:00
Povilas Kanapickas 51f97b1b97 genesys: Fix invalid step count when feeding on gl841 2020-05-18 04:34:28 +03:00
Povilas Kanapickas 8435be213f genesys: Support non-FULL steps for fast tables on gl841 2020-05-18 04:34:28 +03:00
Povilas Kanapickas 4f0bab0bfa genesys: Don't write zero values to step count tables 2020-05-18 04:34:28 +03:00
Povilas Kanapickas 1633022fda genesys: Simplify motor setup on LiDE 80 2020-05-18 04:34:28 +03:00
Povilas Kanapickas 7932c68d03 genesys: Simplify slope table size calculations 2020-05-18 04:34:28 +03:00
Povilas Kanapickas 288dd82a6f genesys: Pass motor profile directly to exposure calculation utils 2020-05-18 04:34:28 +03:00
Povilas Kanapickas 049e69aa79 genesys: Fix step multiplier handling in motor table manipulation utils 2020-05-18 04:34:28 +03:00
Povilas Kanapickas b8ced2861a genesys: Always write the same set of tables on gl841 2020-05-18 04:34:28 +03:00
Povilas Kanapickas 12641bd6ca genesys: Don't send empty tables unnecessarily on gl841 2020-05-18 04:34:28 +03:00
Povilas Kanapickas 88b49704b2 genesys: Use create_slope_table() directly on gl841 2020-05-18 04:34:28 +03:00
Povilas Kanapickas 16fa00c13b genesys: Extract scanner_send_slope_table() 2020-05-18 03:53:10 +03:00
Povilas Kanapickas 11c3a67e47 genesys: Remove redundand argument out of *_send_slope_table() 2020-05-18 03:53:09 +03:00
Povilas Kanapickas 253bd0ffe4 genesys: Regenerate motor table total duration when it is updated 2020-05-18 03:53:08 +03:00
Povilas Kanapickas 9c4f84f91a genesys: Don't generate excessive amount of steps for the motor tables 2020-05-18 03:53:07 +03:00
Povilas Kanapickas 8e76d4ede9 genesys: Upload only required part of motor slope table on gl841 2020-05-18 03:53:06 +03:00
Povilas Kanapickas 412beaeb19 genesys: Simplify motor setup on gl646 2020-05-18 03:53:05 +03:00
Olaf Meeuwissen 1fe94e6674 Merge branch '279-confidential-issue' into release/1.0.30 2020-05-17 16:26:00 +09:00
Povilas Kanapickas 800cf3beaf genesys: Use ModelFlag::DISABLE_*_CALIBRATION instead of NO_CALIBRATION 2020-05-17 01:02:28 +03:00
Povilas Kanapickas 04b91dc4c9 genesys: Implement a way to selectively disable calibration steps 2020-05-17 01:02:27 +03:00
Povilas Kanapickas 71eeeb0ca6 genesys: Remove dead code 2020-05-17 01:02:26 +03:00
Povilas Kanapickas d6570c86ff genesys: Remove debug messages that are no longer useful 2020-05-16 23:43:47 +03:00
Povilas Kanapickas 6e398bc7bf genesys: Write debug images only if step was enabled 2020-05-16 23:05:21 +03:00
Povilas Kanapickas 6092e2d682 genesys: Enable image data logging as a separate environment variable 2020-05-16 23:05:20 +03:00
Povilas Kanapickas 5d441bdd3e Merge branch 'genesys-print-error-when-config-file-unavailable' into 'master' 
genesys: Print debug message if configuration file can't be accessed

Closes #101

See merge request sane-project/backends!451
 2020-05-16 19:51:50 +00:00
Povilas Kanapickas 10b126a65e Merge branch 'genesys-lide60-abrt' into 'master' 
Fix abort in genesys backend during sending slope table

See merge request sane-project/backends!346
 2020-05-16 19:39:23 +00:00
Povilas Kanapickas 909a78a0c7 Merge branch 'genesys-simplify-gpio-gl847' into 'master' 
genesys: Simplify GPIO setup on gl847

See merge request sane-project/backends!450
 2020-05-16 19:36:33 +00:00
Povilas Kanapickas 9f46845f95 genesys: Print debug message if configuration file can't be accessed 2020-05-16 22:36:28 +03:00
Povilas Kanapickas d3b9178d6b genesys: Simplify GPIO setup on gl847 2020-05-16 22:21:13 +03:00
Povilas Kanapickas 69a249e000 genesys: Simplify ADC setup on gl847 2020-05-16 22:04:52 +03:00
Povilas Kanapickas 0d2a4b5244 genesys: Fix incorrect ADC definition on gl847 2020-05-16 22:04:51 +03:00
Povilas Kanapickas c9beb6b0ba Merge branch 'genesys-simplify-motor-profile-setup-gl841' into 'master' 
genesys: Simplify motor profile setup on gl841

See merge request sane-project/backends!448
 2020-05-16 18:52:33 +00:00
Povilas Kanapickas fbb60d4d52 Merge branch 'genesys-simplify-gl646' into 'master' 
genesys: Simplify miscellaneous gl646 code

See merge request sane-project/backends!447
 2020-05-16 18:46:21 +00:00
Povilas Kanapickas a3284ab5e0 Merge branch 'genesys-simplify-motor-setup' into 'master' 
genesys: Simplify motor setup

See merge request sane-project/backends!446
 2020-05-16 18:42:21 +00:00
Povilas Kanapickas 16a9bddf59 genesys: Remove dead code on gl646 2020-05-16 21:30:21 +03:00
Povilas Kanapickas edb375fbcc genesys: Remove duplicated coarse calibration on gl646 2020-05-16 21:30:21 +03:00
Povilas Kanapickas 256a90e29d genesys: Simplify coarse_gain_calibration() on gl646 2020-05-16 21:30:21 +03:00
Povilas Kanapickas a4145e2eda genesys: Only set requested_pixels when it's not default on gl646 2020-05-16 21:30:21 +03:00
Povilas Kanapickas 35ffd57586 Merge branch 'genesys-use-flags-to-setup-scan-gl646' into 'master' 
genesys: Use flags to setup scans on gl646

See merge request sane-project/backends!445
 2020-05-16 18:29:17 +00:00
Povilas Kanapickas aee51c9dec genesys: Fix crash in led_calibration() when image is completely black 2020-05-16 20:57:19 +03:00
Povilas Kanapickas ccf1cbd3ab Merge branch 'genesys-simplify-gl646' into master 2020-05-16 20:56:19 +03:00
Povilas Kanapickas e4d0b7b357 Merge branch 'genesys-pipeline-invert' into 'master' 
genesys: Add pipeline to invert pixel values

See merge request sane-project/backends!442
 2020-05-16 15:15:49 +00:00
Olaf Meeuwissen 898ab18348 Really remove libxml2 linker/loader flags from dependencies. Re #239 2020-05-14 20:41:52 +09:00
Olaf Meeuwissen 76bf742aba Remove libxml2 linker/loader flags from dependencies. Re #239 2020-05-14 20:41:04 +09:00
Olaf Meeuwissen 30b1831a28 epsonds: Mitigate potential network related security issues. Re #279 
This pre-empts the possibility of triggering GHSL-2020-079, GHSL-2020-080
and GHSL-2020-081.
 2020-05-11 21:07:12 +09:00
Povilas Kanapickas 09eaba9606 genesys: Add model flag for inverted output 2020-05-09 13:29:53 +03:00
Povilas Kanapickas ab1d86d74a genesys: Rename {INVERTED->SWAP}_16_BIT_DATA model flag 2020-05-09 13:29:52 +03:00
Povilas Kanapickas 52cd02d78c genesys: Add image pipeline to invert pixel values 2020-05-09 13:29:51 +03:00
thierry1970 0abdfa483f If no data then the status is NO-DOCS. 2020-05-15 10:21:56 +02:00
thierry1970 1027e8aae0 Fix build. 2020-05-14 15:31:10 +02:00
thierry1970 bd8cb0e6aa Code cleanup. 2020-05-14 14:03:20 +02:00
thierry1970 287a6bb88a Test status device before scan and after. 2020-05-14 13:05:08 +02:00
Thierry HUCHARD d9c377cf09 Fix style 2020-05-13 22:24:51 +02:00
Thierry HUCHARD c66efc0faf Allows the X and Y offset to be set to 0. 2020-05-13 22:20:55 +02:00
Thierry HUCHARD 29866b0b19 Fix status sane_read. 2020-05-13 20:33:01 +02:00
Louis Lagendijk 080ac870ee pixma_bjnp.c: fix incorrect return from SANE_STATUS_INVAL to BJNP_STATUS_INVAL 
as pointed out on F32 compile in CI
 2020-05-11 17:14:37 +02:00
Ordissimo 5ad7708381 Merge branch 'escl-fix-status-adf' into 'master' 
Refactoring of the adf status.

See merge request sane-project/backends!434
 2020-05-11 14:58:38 +00:00
Louis Lagendijk 767a289fd2 pixma_bjnp: fix ADF scanning for laser/mfnp scanners. mfnp devices require a single TCP session 
for ADF scans, while bjnp requires a TCP session per page.

Squashed commit of the following:

commit 8ee0a23d6b2920bc344bf76fd39f4b556222190b
Author: Louis Lagendijk <louis.lagendijk@gmail.com>
Date:   Sat May 9 16:47:23 2020 +0200

    Make pixma_bjnp work for both bjnp and mfnp

commit 3df6d0d5903ccf4de0d27301e65025209888d3c7
Author: Louis Lagendijk <louis.lagendijk@gmail.com>
Date:   Sat May 2 19:50:23 2020 +0200

    Move opening tcp connection to bjnp_open/close
 2020-05-11 16:42:33 +02:00
thierry1970 36ece1de84 Fix status for all vendors 2020-05-11 10:25:27 +02:00
Thierry HUCHARD dc2b9aeade JobState, if it exists, decides whether to proceed to the next page. 2020-05-10 22:20:30 +02:00
Thierry HUCHARD 70daed5132 Fix error name variable. 2020-05-10 15:11:30 +02:00