ae06e017f4
Merge branch 'remotes/origin/escl-fix-adv-options' into 'master'
...
refactoring options code
See merge request sane-project/backends!559
2020-12-21 19:42:45 +00:00
c0dae7e8f5
refactoring options code
2020-12-21 18:16:31 +01:00
c8e1c9595e
Merge branch '402-hp-scanjet-5370c-produces-double-height-image-and-cannot-preview' into 'master'
...
Resolve "HP Scanjet 5370C produces double height image and cannot preview"
Closes #402
See merge request sane-project/backends!558
2020-12-20 03:35:57 +00:00
e111c48562
avision: added increment of the line variable in non-interpolated case
2020-12-19 17:28:36 -08:00
15e200a981
avision: added some brackets to silence warnings about precedence ambiguity
2020-12-19 17:27:23 -08:00
6652aa42a8
Merge branch 'escl-fix-segfault' into 'master'
...
Fix a crash when asking for the list of options: scanimage -A
See merge request sane-project/backends!557
2020-12-19 21:22:20 +00:00
a5181be71b
Fix a crash when asking for the list of options: scanimage -A
2020-12-19 22:04:30 +01:00
a03e0106a1
Merge branch 'update-external-model-scangearmp2' into 'master'
...
Add model version scangearmp2 4.0 and 4.10.
See merge request sane-project/backends!556
2020-12-18 08:16:26 +00:00
3ad2f011ca
Add model version scangearmp2 4.0 and 4.10.
2020-12-18 08:48:27 +01:00
fc1c5667da
Merge branch 'escl-device-crash-without-flatbed' into 'master'
...
Escl device crash without flatbed
See merge request sane-project/backends!554
2020-12-17 10:57:02 +00:00
6ad6352342
Add model HP Deskjet 3760.
2020-12-16 13:50:24 +01:00
841680f610
Fix : Fixes the crash of devices that do not have a tray, discovered on the HP Deskjet 3760 device.
2020-12-16 13:41:31 +01:00
bb84652c3c
Merge branch 'origin/pixma_bug_fixes' into 'master'
...
General pixma backend fixes
See merge request sane-project/backends!548
2020-12-07 13:21:30 +00:00
f1154375f5
Merge branch 'master' into 'master'
...
drop CVS keywords
See merge request sane-project/backends!547
2020-11-30 11:07:40 +00:00
7f7a4778be
canon_dr backend v60
...
- add new gray and color interlacing options for DR-C120
- initial support for DR-C120 and C130
- enable fine calibration for P-208 (per @sashacmc in !546 )
2020-11-29 18:03:23 -05:00
cbf9627fd8
final Revision CVS keyword removal
2020-11-29 09:19:26 +00:00
4196d204f1
drop more tricky Revision CVS keyword
2020-11-29 09:17:33 +00:00
7de7c051fa
more CVS keywords removed, Log and Revision
2020-11-29 09:06:48 +00:00
a388c3abc1
pixma: avoid structure copy on every read by using cinfo address.
2020-11-28 19:34:52 -08:00
410f954f3b
pixma: assignment must be inside the loop to be effective.
2020-11-28 19:29:06 -08:00
08eaf1a22e
pixma: MX490 series returns JPEG from ADF scans.
2020-11-28 19:19:26 -08:00
65f1131541
drop CVS keywords
2020-11-28 12:48:32 +00:00
e5bd31c882
utsushi.desc: Sync with upstream
2020-11-25 20:05:28 +09:00
8a8595808d
Merge branch 'master' into 'master'
...
Fixed Artec AstraSlim SE configuration.
See merge request sane-project/backends!545
2020-11-23 01:39:29 +00:00
862ca098ae
Fixed Artec AstraSlim SE configuration.
2020-11-21 11:58:17 +01:00
a7f42db900
Merge branch 'add-new-modele' into 'master'
...
Add model Canon TS-5351
See merge request sane-project/backends!544
2020-11-08 19:31:12 +00:00
c7dd86c7e7
Add model Canon TS-5351
2020-11-08 20:16:05 +01:00
eae1e9068a
Revert "Add model Canon wqTS-5351."
...
This reverts commit 9ec62a4780
2020-11-08 20:11:50 +01:00
9ec62a4780
Add model Canon wqTS-5351.
2020-11-08 20:02:55 +01:00
7699e1a098
Merge branch 'pixma-calibrate' into 'master'
...
pixma: Add --calibrate option
See merge request sane-project/backends!542
2020-11-02 22:07:21 +00:00
d0695c1470
pixma: Add --calibrate option
...
Feature was discussed in https://gitlab.com/sane-project/backends/-/issues/321
2020-11-02 22:50:48 +02:00
e4ef0548bf
Merge branch 'leak_fix' into 'master'
...
Fix memory leaks in dll and test backends
See merge request sane-project/backends!537
2020-10-20 09:01:15 +00:00
6fe222ed29
test: do not leak initial values of string options
...
The default values for string options are set using static (i.e.
non-malloced) strings. Later, if new values are loaded from the config
file, those SANE_Strings will then point to dynamically allocated memory
which is eventually leaked.
Change the initial values for the string options to NULL, and initialize
them to the proper values within sane_init() using strdup(). This way,
whenever the value for the string is changed, we can safely free() the
previous value.
This eliminates the other main source of memory leaks in the test backend.
This patch also updates sane_init for the test backend to properly cleanup
memory if it fails.
2020-10-19 09:48:49 -06:00
f71ac6126f
test: free memory used for string options
...
Inside Test_Device, track whether we've already called init_options().
If we have, don't call it again when calling sane_open() again.
Add a function cleanup_options() which frees the memory used for these
options, and call it in sane_exit() if we previously called
init_options().
Change Test_Devices to be initialized with calloc instead of malloc,
so that we can assume that uninitialized fields are NULL, and can safely
call free() on them unconditionally.
This eliminates some larger memory leaks within the test backend.
2020-10-19 09:48:36 -06:00
016271ebdc
Merge branch '362-lexmark-mc3200-mc3224adwe-network-scanner-crash-due-to-null-constraints' into 'master'
...
Resolve "Lexmark MC3200 / MC3224adwe Network scanner crash due to NULL constraints"
Closes #362
See merge request sane-project/backends!534
2020-10-18 17:36:24 +00:00
bc64c8f549
scanimage: check also for negative word_list length which is nonsensical.
2020-10-18 09:51:35 -07:00
519c300ff0
Merge branch 'brightness_on_12000xl' into 'master'
...
epson2: fix lower brightness limit for DS-G20000/12000XL
See merge request sane-project/backends!529
2020-10-18 01:47:29 +00:00
730982bd6b
Merge branch '364-pixma-mx320-cannot-do-1200dpi-in-adf' into 'master'
...
Resolve "Pixma MX320 cannot do 1200dpi in ADF"
Closes #364
See merge request sane-project/backends!538
2020-10-15 21:20:20 +00:00
014c307e02
pixma: MX320 machine will not perform 1200 dpi scan from the ADF
...
600 dpi maximum from ADF.
2020-10-13 09:03:45 -07:00
de903b84c4
dll: fix memory leak in load
...
In the case where we are unable to get a path for loading libs, and
instead just use LIBDIR, we set 'src = strdup(LIBDIR)'. However, we
never update orig_src to point to src before tokenizing the path with
strsep(), so the memory is never freed.
Update load to always set orig_src to src so that we don't leak memory.
2020-10-12 16:25:07 -06:00
7f38f0f71c
Merge branch 'canoscan_n650u_plustek_usb_workaround' into 'master'
...
[plustek] Add 1ms delay before writing to register 0x59 during reseting registers
Closes #137
See merge request sane-project/backends!535
2020-10-12 09:14:04 +00:00
7e6231fe57
Merge branch '358-gt68xx-1-0-31-breaks-mustek-1248ub-after-first-scan' into 'master'
...
Resolve "gt68xx: 1.0.31 breaks Mustek 1248UB after first scan"
Closes #358
See merge request sane-project/backends!533
2020-10-10 19:22:41 +00:00
42520aeaa9
gt68xx: added flag to fix stop scan bug
...
Some scanners (notably the Mustek 1248UB) doesn't like receiving a
STOP scan command when it is not scanning. Flag prevents it my making
sure that START/STOP commands are only ever paired up.
2020-10-10 12:01:33 -07:00
b75e39af8c
Merge branch 'escl-avahi-resolve' into 'master'
...
Fixes device discovery
See merge request sane-project/backends!536
2020-10-10 16:51:52 +00:00
8885312711
Fixes device discovery
2020-10-10 18:01:55 +02:00
6af85ec669
plustek-usbhw.c: Add 1ms sleep before writing to register 0x59
...
Works around discovery problem for CanoScan N650U, fixes #137 .
2020-10-09 08:55:41 +02:00
9ac6ee6cd6
desc and news lide 600
2020-10-07 15:06:07 +02:00
968add6706
scanimage: added checks for null constraints.
...
We have seen this from buggy backends that present NULL for constraint
string_lists. This is probably illegal behaviour from backends but we
don't want to crash.
2020-10-06 20:16:13 -07:00
6886cf6e80
gt68xx: Added temporary fix to avoid stop scan during cancel.
...
Calling this function upsets some scanners in this family.
This temporary sticking plaster permits the Mustek 1248UB scanner to
scan after cancelling. We need to look into this much more when a
scanner becomes available for investigation.
2020-10-03 10:38:50 -07:00
81227d1d40
Merge branch 'avision_add_av186plus_av188_support' into 'master'
...
add ID information for Avision AV186+ and AV188 sheetfed USB scanners
See merge request sane-project/backends!532
2020-09-29 09:38:15 +00:00
Ordissimo