Povilas Kanapickas
a287f4945c
genesys: Extract computation of session setup to callers
2019-06-02 11:47:34 +03:00
Povilas Kanapickas
d688429ccd
genesys: Fix use of wrong dpi when computing output pixel count
2019-06-02 11:47:33 +03:00
Povilas Kanapickas
1a9e05b291
genesys: Extract params to gl843_init_scan_regs to a struct
2019-06-02 11:47:32 +03:00
Povilas Kanapickas
836a78bef5
genesys: Extract exposure to separate variable in sensor definition
2019-06-02 11:47:31 +03:00
Povilas Kanapickas
e9419d5e33
genesys: Make per-sensor register override list generic
2019-06-02 11:47:30 +03:00
Povilas Kanapickas
7f22e35e2c
genesys: Use internal sleep wrapper for remaining sleep calls
2019-06-02 11:47:29 +03:00
Povilas Kanapickas
90814ac7d3
genesys: Move half CCD property to sensor definition
2019-06-02 11:47:28 +03:00
Povilas Kanapickas
7359412548
genesys: Remove dead code
2019-06-02 11:47:27 +03:00
Povilas Kanapickas
04c5b4afde
genesys: Improve type safety of Genesys_Register_Set
2019-06-02 11:47:26 +03:00
Olaf Meeuwissen
4c05fb4742
Merge branch 'backend/as6e' into 'master'
...
as6e: Avoid out of bound access
See merge request sane-project/backends!31
2019-06-15 06:50:27 +00:00
Olaf Meeuwissen
cadf5a9b1a
Prevent segfault in case strndup cannot allocate memory
...
This complements 18f9e5598c
2019-06-15 14:45:36 +09:00
Olaf Meeuwissen
f9eb32317a
Merge branch 'sanei-usb-testing-mode-prep' into 'master'
...
sanei: Preparation to support capture and replay of USB data for testing
See merge request sane-project/backends!74
2019-06-15 05:43:06 +00:00
Olaf Meeuwissen
d22516c76a
Merge branch 'remove-autoconf-generated-files' into 'master'
...
Remove autoconf generated files
See merge request sane-project/backends!72
2019-06-12 10:48:14 +00:00
Bernard B Badeer
1f383b3795
Add options for reading LCD counter and LED indicator.
...
* Add command line parameters for readling LCD counter and LED indicator.
* Code refactoring: Use static parameter strings instead of dynamically
allocated string in order to avoid memory leak.
2019-06-03 06:10:26 +00:00
Povilas Kanapickas
1c3e1aa184
autotools: Remove files generated by autotools from version control
2019-06-01 14:38:36 +03:00
Povilas Kanapickas
916d4e0db9
genesys: Fix sanei_genesys_{read,set}_reg_from_set()
...
There can be registers in the register set with zero address. In
particular, the 0x0b register's address is set to zero on most
sub-backends to prevent writes to it. This leads to the functions in
question not do anything in most scenarios.
2019-06-01 05:24:58 +03:00
Povilas Kanapickas
18f9e5598c
dll: Don't unnecessarily use alloca
2019-05-27 18:56:01 +03:00
Povilas Kanapickas
58ee13d057
genesys: Fix warning
2019-05-24 21:13:37 +03:00
Olaf Meeuwissen
be9736020f
autofoo: Sync generated files
...
The AX_CXX_COMPILE_STDCXX* macros that were embedded in aclocal.m4
have been replaced with the versions found in the autoconf-archive
package from Debian 9.
2019-05-21 22:14:46 +09:00
Povilas Kanapickas
16a3945ce6
Merge branch 'genesys-sleep' into 'master'
...
genesys: Add wrapper for sleep that can be turned off when testing
See merge request sane-project/backends!70
2019-05-20 09:47:38 +00:00
Olaf Meeuwissen
f498e5fa66
genesys: Add missing pointer cast on malloc call
...
Fixes build on Fedora 29 and 30.
2019-05-20 18:32:48 +09:00
Olaf Meeuwissen
2bb5ed655a
Merge branch 'genesys-enable-cxx' into 'master'
...
Use C++ for the genesys backend
See merge request sane-project/backends!61
2019-05-20 09:10:53 +00:00
Stanislav Yuzvinsky
2a11622967
Merge branch 'teardown' into 'master'
...
ricoh2: Rearrange init/deinit code of ricoh2 to correctly support "code flow"
See merge request sane-project/backends!65
2019-05-19 18:18:57 +00:00
Olaf Meeuwissen
7585538595
epson2: Add XP-255 as supported. Fixes #81
2019-05-19 21:41:16 +09:00
Povilas Kanapickas
71bf2daec6
Merge branch 'genesys-remove-static' into 'master'
...
genesys: Remove uses of GENESYS_STATIC
See merge request sane-project/backends!68
2019-05-19 12:02:50 +00:00
Povilas Kanapickas
a4ab69376c
genesys: Remove uses of GENESYS_STATIC
2019-05-19 14:49:44 +03:00
Povilas Kanapickas
4c2c4eb639
genesys: Remove duplicate definition of DBGSTART and DBGCOMPLETED
2019-05-19 14:46:46 +03:00
Povilas Kanapickas
6f617e9889
genesys: Don't define different backend names in source files
2019-05-19 14:46:45 +03:00
Povilas Kanapickas
873e82c0a0
genesys: Remove logging of the build number
...
A git commit would be much more useful in log messages
2019-05-19 14:46:44 +03:00
Povilas Kanapickas
c536f3cf70
genesys: Fix calibration size calculation for 8600F
...
The current approach of marking the scanner as
GENESYS_FLAG_FULL_HWDPI_MODE is counter-productive, because only the
register value is always full DPI, the actual resolution is different.
For now, let's just work around this by having a special case for the
scanner.
2019-05-18 14:56:12 +03:00
Povilas Kanapickas
0a0a140423
genesys: Correctly adjust pixels per line during calibration
2019-05-18 14:56:11 +03:00
Povilas Kanapickas
190361b724
genesys: Work around first line having artifacts during calibration
2019-05-18 14:56:10 +03:00
Povilas Kanapickas
3a4f67feef
genesys: Fix lockups on GL843 during calibration
2019-05-18 14:56:09 +03:00
Povilas Kanapickas
ed582c5858
genesys: Fix gain calibration on GL843
2019-05-18 14:56:08 +03:00
Povilas Kanapickas
b220512172
genesys: Add a separate shading line count param for TA mode
...
q
2019-05-18 14:56:07 +03:00
Povilas Kanapickas
b7ef75d63f
genesys: Implement transparency support for 8600F
2019-05-18 14:56:06 +03:00
Povilas Kanapickas
126e98524a
genesys: Remove special ADF handling for G4050
2019-05-18 14:56:05 +03:00
Povilas Kanapickas
091fdbe6d6
genesys: Use correct offsets for transparency scan
2019-05-18 14:56:04 +03:00
Povilas Kanapickas
d0c4f87ac7
genesys: Don't set exposure to zero on 8600F
2019-05-18 14:56:03 +03:00
Povilas Kanapickas
33a60dcc7b
genesys: Implement support for 8600F
2019-05-18 14:56:02 +03:00
Povilas Kanapickas
41e2029e4b
genesys: Initialize 0x7e register on GL843
2019-05-18 14:56:01 +03:00
Povilas Kanapickas
966ef33710
genesys: Fix pixel calculation during calibration on gl843
2019-05-18 14:56:00 +03:00
Povilas Kanapickas
df889c96f5
genesys: Deduplicate pixel count computation during calibration
2019-05-18 14:55:59 +03:00
Povilas Kanapickas
695addaafd
genesys: Fix pixel count when scanning in half-ccd mode on GL843
2019-05-18 14:55:58 +03:00
Povilas Kanapickas
d2b4a1b838
genesys: Extract gl843_compute_physical_params()
2019-05-18 14:55:57 +03:00
Povilas Kanapickas
76bf1ad072
genesys: Improve documentations for registers in various places
2019-05-18 14:55:56 +03:00
Povilas Kanapickas
aeefb37072
genesys: Fix read pixel count calc during calibration on GL843
2019-05-30 23:42:33 +03:00
Povilas Kanapickas
50b27fe836
genesys: Use std::string for Genesys_Device::calib_file
2019-05-25 11:15:42 +03:00
Povilas Kanapickas
38986c2c6f
genesys: Use std::vector for Genesys_Device::img_buffer
2019-05-25 11:15:41 +03:00
Povilas Kanapickas
eb93267fa9
genesys: Use std::vector instead of custom vector implementation
2019-05-25 11:15:40 +03:00
Povilas Kanapickas
69485e9f11
genesys: Remove unused new device list
2019-05-25 11:15:39 +03:00
Povilas Kanapickas
3096dcee0e
genesys: Use s_devices.size() for num_devices
2019-05-25 11:15:38 +03:00
Povilas Kanapickas
9c2fdeeb3d
genesys: Use proper containers for device lists
2019-05-25 11:15:37 +03:00
Povilas Kanapickas
5a90b7bb8f
genesys: Convert Genesys_Buffer to C++ class
2019-05-25 11:15:36 +03:00
Povilas Kanapickas
247658f23e
genesys: Return std::vector from GL646 simple_scan()
2019-05-25 11:15:35 +03:00
Povilas Kanapickas
e48b6c4e2d
genesys: Store global Genesys_Scanner instances in std::list
2019-05-25 11:15:34 +03:00
Povilas Kanapickas
15b373a5cc
genesys: Use std::vector for calibration cache average data
2019-05-25 11:15:33 +03:00
Povilas Kanapickas
64ca298d02
genesys: Store calibration class using std::list
2019-05-25 11:15:32 +03:00
Povilas Kanapickas
52b1989eda
genesys: Remove no longer used RIEF and RIEF2 macros
2019-05-25 11:15:31 +03:00
Povilas Kanapickas
3d44c89f1e
genesys: Use std::vector for Genesys_Device::{dark,white}_average_data
2019-05-25 11:15:30 +03:00
Povilas Kanapickas
2dc4e5d1fc
genesys: Use std::vector for Genesys_Sensor::gamma_table
2019-05-25 11:15:29 +03:00
Povilas Kanapickas
555be1c3eb
genesys: Use Genesys_Device as C++ class
2019-05-25 11:15:28 +03:00
Povilas Kanapickas
cb189cfe2d
genesys: Rewrite sensor table to use std::vector
2019-05-25 11:15:27 +03:00
Povilas Kanapickas
e5eff5d76f
genesys: Add facility for auto releasing static data on backend exit
2019-05-25 11:15:26 +03:00
Povilas Kanapickas
9cea33b53c
genesys: Use std::vector instead of malloc for local allocations
2019-05-25 11:15:25 +03:00
Povilas Kanapickas
896385a082
genesys: Ensure that functions passed to C API don't throw
2019-05-25 10:03:15 +03:00
Povilas Kanapickas
23f3ebf612
genesys: Wrap exported functions to always catch exceptions
2019-05-25 10:03:14 +03:00
Stanislav Yuzvinsky
7a8ae92862
ricoh2: Rearrange init/deinit code of ricoh2 to correctly support "code flow"
...
The backend worked incorrectly when scanning process was interrupted before the
current page was scanned completely. For example, scanimage tool could not scan
the next page if the previous one was interrupted. Now this issue is fixed.
See also "4.4. Code Flow" in SANE API specification v.1.06.
Also debug levels was changed to have better control over what should be
logged.
2019-05-13 23:44:07 +03:00
Olaf Meeuwissen
e13b80fa6f
Merge branch 'add_sg3100' into 'master'
...
Add support for Aficio SG3100SNw
See merge request sane-project/backends!57
2019-05-12 03:11:00 +00:00
Stanislav Yuzvinsky
0273c05c95
Fix review comments; add the backend to dll.conf
2019-05-11 16:17:40 +03:00
Povilas Kanapickas
4df63ef548
Merge branch 'genesys-debug-improvements' into 'master'
...
genesys: Miscellaneous debug improvements
See merge request sane-project/backends!64
2019-05-11 09:20:45 +00:00
Povilas Kanapickas
3c8b9b9167
Merge branch 'genesys-reduce-duplication' into 'master'
...
genesys: Reduce duplication in low level functions
See merge request sane-project/backends!63
2019-05-11 09:14:06 +00:00
Povilas Kanapickas
988a91aec4
genesys: Write all offset calibration debug to a single file on gl843
2019-05-11 12:12:29 +03:00
Povilas Kanapickas
36bc194405
genesys: Add a small C array implementation
2019-05-11 12:12:28 +03:00
Povilas Kanapickas
5321427e55
genesys: Don't write identical debug pnm files
2019-05-11 12:12:27 +03:00
Povilas Kanapickas
882741d78a
genesys: Prepend file identifier to debug image filenames
2019-05-11 12:12:26 +03:00
Povilas Kanapickas
d3b25a5966
genesys: Don't write identical debug pnm files
2019-05-11 12:12:25 +03:00
Povilas Kanapickas
8de5a1fdb1
genesys: Remove unused code
2019-05-11 12:05:26 +03:00
Povilas Kanapickas
da81a523fa
genesys: Reuse sanei_genesys_bulk_write_register() on GL841
2019-05-11 12:05:25 +03:00
Povilas Kanapickas
2b1f13fddb
genesys: Reuse sanei_genesys_bulk_write_register() on GL646
2019-05-11 12:05:24 +03:00
Povilas Kanapickas
b683a40fdd
genesys: Reuse common genesys register functions on GL646
2019-05-11 12:05:23 +03:00
Povilas Kanapickas
58e1eb8ac4
genesys: Reuse sanei_genesys_bulk_write_data() on GL646
2019-05-11 12:05:22 +03:00
Povilas Kanapickas
80efacab10
genesys: Reuse sanei_genesys_bulk_write_data() on GL841
2019-05-11 12:05:21 +03:00
Povilas Kanapickas
d62d4f0d16
genesys: Use sanei_genesys_get_bulk_max_size() for max bulk out size
2019-05-11 12:05:20 +03:00
Povilas Kanapickas
7ee139bd4b
genesys: Pass device to sanei_genesys_write_ahb() as ptr not number
2019-05-11 12:05:19 +03:00
Povilas Kanapickas
d7bff42cba
genesys: Add generic sanei_genesys_bulk_write_data() out of GL843 impl
2019-05-11 12:05:18 +03:00
Povilas Kanapickas
98258549cb
genesys: Extract sanei_genesys_get_bulk_max_size()
2019-05-11 12:05:17 +03:00
Povilas Kanapickas
5b9d014592
genesys: Remove commented out code for buffer size alignment
2019-05-11 12:05:16 +03:00
Povilas Kanapickas
9dc8bbfac9
genesys: Reuse sanei_genesys_bulk_read_data() on GL847
2019-05-11 12:05:15 +03:00
Povilas Kanapickas
4af3557bbf
genesys: Reuse sanei_genesys_bulk_read_data() on GL846
2019-05-11 12:05:14 +03:00
Povilas Kanapickas
216c18f9ff
genesys: Reuse sanei_genesys_bulk_read_data() on GL843
2019-05-11 12:05:13 +03:00
Povilas Kanapickas
55e5c7b7ac
genesys: Reuse sanei_genesys_bulk_read_data() on GL841
2019-05-11 12:05:12 +03:00
Povilas Kanapickas
8e8511a49e
genesys: Reuse sanei_genesys_bulk_read_data() on GL646
2019-05-11 12:05:11 +03:00
Povilas Kanapickas
69435b3bb2
genesys: Revert 512-byte bulk transfer alignment workaround
...
It should be handled by libusb.
2019-05-11 12:05:10 +03:00
Povilas Kanapickas
4a899d26f3
genesys: Create generic sanei_genesys_bulk_read_data out of gl124 impl
2019-05-11 12:05:09 +03:00
Povilas Kanapickas
887759192b
genesys: Add option to force calibration ignoring caches
2019-05-11 12:00:25 +03:00
Olaf Meeuwissen
15fd9bc9ce
Merge branch 'log-messages-no-git-conflict-markers' into 'master'
...
Don't use strings that are similar to conflict markers in debug msgs
See merge request sane-project/backends!60
2019-05-11 08:13:18 +00:00
Povilas Kanapickas
ca051cc227
genesys: Compile library as C++ code
2019-05-11 00:03:26 +03:00
Povilas Kanapickas
72121bc7d8
sanei: Use C linkage for internal functions in C++ mode
2019-05-11 00:03:26 +03:00
Povilas Kanapickas
9e3b5d6381
Update generated files
2019-05-11 00:03:26 +03:00
Povilas Kanapickas
856391100f
Merge branch 'genesys-explicit-casts' into 'master'
...
genesys: Perform type casts explicitly
See merge request sane-project/backends!59
2019-05-10 18:23:32 +00:00
Povilas Kanapickas
47e7f087c6
genesys: Perform type casts explicitly
2019-05-10 21:11:01 +03:00
Povilas Kanapickas
16a8d55480
Don't use strings that are similar to conflict markers in debug msgs
2019-05-10 21:05:51 +03:00
Olaf Meeuwissen
296542905e
avision: Fix threaded ADF flipping duplex handling. Re #24
2019-05-04 23:39:33 +09:00
Olaf Meeuwissen
25feb1be0c
genesys: Fix use of uninitialized variable
...
See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=869673
2019-05-01 11:32:14 +09:00
Stanislav Yuzvinsky
3514d06156
Add support for Aficio SG3100SNw
2019-05-01 01:27:10 +03:00
Povilas Kanapickas
0a66ed1dbc
genesys: Use a function to sleep ms to reduce chance of errors
2019-04-28 17:47:45 +03:00
Povilas Kanapickas
d9f65eefc0
genesys: Fix a bug in sleep duration calculation
2019-04-28 17:47:44 +03:00
Povilas Kanapickas
baaa934dce
genesys: Use a wrapper of usleep()
2019-04-28 17:47:43 +03:00
Rolf Bensch
916ce82f00
pixma: backend version 0.23.0
2019-04-25 21:31:27 +02:00
Rolf Bensch
28d87cb6e5
Merge remote-tracking branch 'origin/master'
2019-04-25 21:27:53 +02:00
Rolf Bensch
9fe7d99089
Merge branch 'master' into 'master'
...
Added Imageclass MF634Cdw
See merge request sane-project/backends!49
2019-04-25 19:26:50 +00:00
Rolf Bensch
392beeec74
pixma: new scanners Canon i-SENSYS MF110, MF260, MF420, MF510, MF520, MF640 and MF740 Series
2019-04-25 21:24:40 +02:00
Povilas Kanapickas
a814df3343
genesys: Prefer numeric model IDs instead of string comparisons
2019-04-23 00:55:46 +03:00
Povilas Kanapickas
ad164ce9c6
genesys: Fix a typo in LiDE 120 gpio setup
2019-04-23 00:55:45 +03:00
Povilas Kanapickas
f240a77e92
genesys: Add numeric model IDs to model tables
2019-04-23 00:55:44 +03:00
Povilas Kanapickas
a569bfbf02
Merge branch 'genesys-misc' into 'master'
...
genesys: Miscellaneous changes/improvements
See merge request sane-project/backends!53
2019-04-22 21:38:29 +00:00
Povilas Kanapickas
3cd8a4cd01
genesys: Use hex to print USB vendor and product IDs to debug log
2019-04-23 00:28:17 +03:00
Povilas Kanapickas
d7c17f7540
genesys: Limit maximum bulk transfer size to allow data capture
2019-04-23 00:14:48 +03:00
Povilas Kanapickas
f04119b126
genesys: Remove support for fake USB mode
...
WIP implement support for 8600F
2019-04-23 00:14:47 +03:00
Povilas Kanapickas
902610132b
genesys: Include genesys_low.h
2019-04-23 00:14:46 +03:00
Povilas Kanapickas
2341618720
genesys: Work around reads from non-initialized memory in gamma setup
2019-04-23 00:05:35 +03:00
Povilas Kanapickas
88c22e38be
genesys: Fix double free in sanei_genesys_send_gamma_table()
2019-04-23 00:05:34 +03:00
Povilas Kanapickas
621c9799fe
genesys: Fix use of uninitialized memory
2019-04-23 00:05:33 +03:00
Povilas Kanapickas
c9ebf2b560
Merge branch 'genesys-remove-unneeded-function-names-in-dbg-args' into 'master'
...
genesys: Remove unneeded function name in DBG macro args
See merge request sane-project/backends!51
2019-04-22 20:56:38 +00:00
Povilas Kanapickas
2fd3b5622b
genesys: Remove unneeded function name in DBG macro args
2019-04-22 23:48:23 +03:00
Olaf Meeuwissen
4f5eb745ac
epson2_usb.c: Sync USB product IDs with epson2.desc content
2019-04-17 21:00:47 +09:00
MackPi
a3c64bc0ca
Added Imageclass MF634Cdw
...
Added MF634Cdw using MF733Cdw as reference
2019-04-03 16:37:03 -07:00
Louis Lagendijk
155248dde2
pixma_bjnp: change default timeout from 1 to 10 seconds (10000)
2019-03-27 19:09:43 +01:00
Louis Lagendijk
d15aa248c7
pixma_bjnp.c: corrected url-rewrite as it set bjnp:// unconditionally rather than honor the received method
...
function renamed to add_default_timeout() to clarify its purpose
2019-03-27 18:46:17 +01:00
Povilas Kanapickas
276670f3c2
Merge branch 'rerun-autoreconf' into 'master'
...
Rerun autoreconf and automake
See merge request sane-project/backends!44
2019-03-22 14:27:53 +00:00
Povilas Kanapickas
e92a3d6eba
Merge branch 'remove-unused-unit-testing' into 'master'
...
Remove uses of unused UNIT_TESTING ifdef
See merge request sane-project/backends!45
2019-03-22 14:25:39 +00:00
Povilas Kanapickas
265f4a96ea
genesys: Prefer enums to #defines
2019-03-22 14:50:03 +02:00
Povilas Kanapickas
2653cbaec7
Run autoreconf and automake
2019-03-20 23:09:07 +02:00
Povilas Kanapickas
d866998f10
genesys: Remove uses of unused UNIT_TESTING ifdef
2019-03-20 23:09:05 +02:00
Povilas Kanapickas
b7b5ca79c8
rts8891: Remove uses of unused UNIT_TESTING ifdef
2019-03-20 23:09:04 +02:00
Rolf Bensch
13350ba4ba
pixma: backend version 0.22.0
2019-03-11 17:46:18 +01:00
Rolf Bensch
dfc5f5ed76
pixma: new scanners Canon PIXUS XK50, XK70, XK80 Series
2019-03-11 17:45:27 +01:00
Rolf Bensch
6f4440152f
pixma: new scanners PIXMA TS6130, TS6180, TS6230, TS6280, TS8100,
...
TS8130, TS8180, TS8200, TS8230, TS8280,
TS9180, TS9580 Series
2019-03-11 17:44:19 +01:00
Rolf Bensch
adef553799
pixma: new scanners Canon PIXMA TR4500, TR7350, TR8530, TR8580, TR9530 Series
2019-03-11 17:26:29 +01:00
Rolf Bensch
83ddbd0fc4
pixma: new scanners Canon PIXMA G3010, G4010 Series
2019-03-11 17:23:20 +01:00
Rolf Bensch
953562ae8e
pixma: new scanner Canon PIXMA E4200 Series
2019-03-11 17:17:45 +01:00
Thierry
2915756ae4
Add Driver Canon Pixma TS 6200 Serie.
2019-03-05 08:43:31 +01:00
m. allan noah
9c4ac1f07f
canon_dr backend v57
...
- complete support for X-10, including hardware cropping (by manuarg)
- minor comments and move a bit of code for consistency
2019-02-24 20:40:25 -05:00
m. allan noah
81faeb46f2
Merge branch 'canon_drx10c' into 'master'
...
Add support for Canon DR-X10C scanner
See merge request sane-project/backends!12
2019-02-25 01:37:03 +00:00
Rolf Bensch
2d0912afdc
pixma: backend version 0.21.1
2019-02-24 12:40:16 +01:00
Rolf Bensch
d0e4f0fa52
pixma: add comment for MF733C
2019-02-24 12:38:37 +01:00
Rolf Bensch
73645abba0
Merge branch 'mikef-MF733C' into 'master'
...
Mikef mf733 c
See merge request sane-project/backends!42
2019-02-24 11:22:07 +00:00
m. allan noah
5ae6f698ae
remove trailing whitespace
2019-02-23 15:46:59 -05:00
m. allan noah
156f7c9bd4
fujitsu backend v134
...
rewrite init_vpd for scanners which fail to report overscan correctly
update description and man page to match
rebuild po files with updated line numbers
2019-02-23 15:16:32 -05:00