Ralph Little
bfa3e39de2
Merge branch 'scanjet_g4010' into 'master'
...
Updated button support for HP Scanjet G4010
See merge request sane-project/backends!622
2021-12-16 05:00:36 +00:00
Povilas Kanapickas
75801bffd3
genesys: Address wrong indentation warning
...
This is separate commit because the previous commit introducing this
warning is completely unrelated and would not benefit from this change
being included.
2021-12-15 23:59:28 +02:00
Ralph Little
8347191b5f
genesys: Added transparency button option
...
This is introduced primarily for the ScanJet G4010 which has "Scan Film"
buttons.
2021-12-15 23:59:28 +02:00
Ralph Little
fa414e46b1
genesys: updated button support for HP Scanjet G4010
2021-12-15 23:59:28 +02:00
Peter Seiderer
1db13a713f
genesys: fix gcc-4.8 compile
...
Fixes:
genesys/utilities.h:229:23: error: invalid initialization of non-const reference of type 'std::basic_ios<char>&' from an rvalue of type '<brace-enclosed initializer list>'
stream_{stream}
^
genesys/image_pipeline.cpp:715:19: error: invalid initialization of non-const reference of type 'genesys::ImagePipelineNode&' from an rvalue of type '<brace-enclosed initializer list>'
source_{source}
^
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
2021-12-15 23:56:23 +02:00
Ralph Little
9a0fa0da86
Merge branch '231-canon-lide-120-wrong-size-with-y-x-after-update-to-sane-backends-1-0-28-1078-g5747ffa9' into 'master'
...
Resolve "Canon LiDE 120: wrong size with -y -x after update to sane-backends 1.0.28-1078-g5747ffa9"
Closes #231
See merge request sane-project/backends!423
2021-07-17 22:40:54 +00:00
Ralph Little
730e4ada37
genesys: fixed indentation again.
...
Hopefully, I will get it right this time. Uses 4 space indents rather
than 2 as used elsewhere in the code base.
2021-04-07 09:06:39 -07:00
Ralph Little
5702046a9c
genesys: fix indentation
2021-04-07 09:01:29 -07:00
Ralph Little
7ce23d05e2
genesys: ensure that vector ptr is initialized
2021-04-06 08:41:41 -07:00
Peter Seiderer
691d774f75
genesys: use usleep instead of std::this_thread::sleep_for to re-enable thread less compile
...
Fixes:
genesys/scanner_interface_usb.cpp: In member function ‘virtual void genesys::ScannerInterfaceUsb::sleep_us(unsigned int)’:
genesys/scanner_interface_usb.cpp:484:10: error: ‘std::this_thread’ has not been declared
484 | std::this_thread::sleep_for(std::chrono::microseconds{microseconds});
| ^~~~~~~~~~~
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
2021-03-31 22:57:48 +02:00
Olaf Meeuwissen
e79adde8b2
Use URL to refer users to copies of the GPL and LGPL
...
With the exception of use in three quotes as well as our inlcuded copy
of the GPL, all use of the Free Software Foundation's postal address
has been removed.
Re #320 .
2021-02-12 17:41:38 +09:00
Peter Marschall
0cd9de9bef
spelling fixes for genesys backend
2020-08-29 09:18:03 +02:00
pobrn
45f84a569c
respect 'local_only' parameter of sane_get_devices()
...
Certain backends do network scans even if the 'local_only'
parameter for 'sane_get_devices()' is true. Fix that.
Changes:
1. Modify 'sanei_configure_attach()' so that backend specific
data may be passed to the 'attach()' function.
2. Use this in certain backends to pass the value of the
'local_only' parameter so that network related activities
are only carried out when the value is false.
2020-08-12 12:29:38 +02:00
Povilas Kanapickas
b0c42c0f5f
genesys: Implement support for LiDE 90
2020-06-27 00:48:06 +03:00
Povilas Kanapickas
ea15fb29b7
genesys: Simplify motor table upload on gl842
2020-06-27 00:47:19 +03:00
Povilas Kanapickas
d948f5eb69
genesys: Fix cis scanner support on gl842
2020-06-27 00:47:18 +03:00
Povilas Kanapickas
02782651a3
genesys: Add model option to disable fast feeding
2020-06-27 00:47:17 +03:00
Povilas Kanapickas
86c15ff4a0
genesys: Add option to fill dark calibration with constant
2020-06-27 00:47:16 +03:00
Povilas Kanapickas
6fdc5e6e1f
genesys: Throw an exception when motor speed is too low
2020-06-27 00:47:15 +03:00
Povilas Kanapickas
f6f891bd93
genesys: Call update_home_sensor_gpio() for all chip types
2020-06-27 00:47:14 +03: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
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
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
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