Ralph Little
1f22e0dadd
avision: added ADF and lightbox installed options.
...
Also sorted out the options texts to make them translatable.
2023-02-19 15:08:59 -08:00
Ralph Little
9387e9b35c
avision: match also USB vendor and product ids for USB devices.
...
We always know the USB vendor and product ids for USB devices and
there are multiple entries with the same SCSI details shared by
different USB models. We should pick the correct one at least to
get the right model name to the user.
2023-02-18 13:41:02 -08:00
Ralph Little
d88920ffb6
avision: correction for ADF presence detect.
...
Scanjet 8300 has an ADF port but does not necessarily have an ADF
fitted. In the test case, there is a lightbox instead. Trying to
reset/probe for an ADF that isn't there is futile.
2023-02-18 13:02:29 -08:00
Ralph Little
2e5fffb036
Merge branch 'B-promptReturn' into 'master'
...
Scanimage Batch Prompt: Discard Extraneous Input Properly
See merge request sane-project/backends!781
2023-02-13 21:26:35 +00:00
Ralph Little
660547e33c
Merge branch 'master' into 'B-promptReturn'
...
# Conflicts:
# frontend/scanimage.c
2023-02-13 21:15:18 +00:00
Ralph Little
bd9771939f
Merge branch '634-llvm-15-on-freebsd-support-for-sane-backends-1-1-1_v2' into 'master'
...
Resolve "LLVM 15 on FreeBSD support for sane-backends 1.1.1"
Closes #634
See merge request sane-project/backends!782
2023-02-13 20:45:38 +00:00
Ralph Little
373dceaa36
scanimage: more generic fix for selecting a common basename function.
...
We have been specially including libgen.h to get a version in other
platforms such as macOS and FreeBSD. However, it is dangerous to
make assumptions about which version of basename that we will get.
So this change reverts to asking for the version that modifies the
argument and creates a copy of the arg that we *can* modify.
2023-02-13 12:32:35 -08:00
Matthew Gilmore
3222d342eb
Less stack diddling
2023-02-10 04:13:13 +00:00
Matthew Gilmore
8072c2e895
batch-prompt - handle EOF and \n more accurately
2023-02-09 20:06:30 -08:00
Ralph Little
971a5a2e92
Merge branch 'master' into 'master'
...
po: add initial Georgian translation
See merge request sane-project/backends!780
2023-02-09 17:29:36 +00:00
NorwayFun
36d204e3fd
po: add Georgian translation
2023-02-09 12:12:00 +00:00
NorwayFun
b4ad09be99
Update LINGUAS: add Georgian
2023-02-09 12:11:10 +00:00
Ralph Little
53e227d171
Merge branch 'clang-16' into 'master'
...
acinclude.m4: fix -Wimplicit-function-declaration
See merge request sane-project/backends!763
2023-02-07 05:38:09 +00:00
Ralph Little
103c2b5d8e
NEWS: release notes for 1.2.1 added.
2023-02-04 19:01:14 -08:00
Ralph Little
b9fbe0b82e
scanimage: handle backends that provide options with null attributes
...
HPAIO backend in some instances provides options that have NULL name.
It might be that it is using SETTABLE flag to disable options rather
than removing them from the options list. Or it might just be a
backend bug.
2023-02-04 16:16:54 -08:00
Ralph Little
e3c1c0e000
doc: Updates to en_GB translations.
...
Not much to add, just confirming new messages.
2023-02-04 09:40:07 -08:00
Ralph Little
6b588b0d93
Merge branch 'uk_update2' into 'master'
...
Update Ukrainian translation
See merge request sane-project/backends!779
2023-02-01 17:19:56 +00:00
Yuri Chornoivan
6220b21429
Update Ukrainian translation
2023-02-01 18:53:17 +02:00
m. allan noah
573ca4b453
update canon_dr.desc for #552
...
Several canon scanners can operate as a mass storage device, holding
the windows software. They have a different USB PID in that case.
2023-01-27 18:09:57 -05:00
Ralph Little
7ee6327d3c
Merge branch '634-llvm-15-on-freebsd-support-for-sane-backends-1-1-1' into 'master'
...
Resolve "LLVM 15 on FreeBSD support for sane-backends 1.1.1"
Closes #634
See merge request sane-project/backends!777
2023-01-07 07:48:17 +00:00
Ralph Little
370547fc60
scanimage, jpegtopdf: fixes for FreeBSD header definitions.
2023-01-06 23:36:43 -08:00
Ordissimo
4033ea23b6
Merge branch 'escl-add-espon-L3160' into 'master'
...
escl: add Epson EcoTank L3160 support.
Closes #632
See merge request sane-project/backends!776
2023-01-06 13:57:39 +00:00
Ordissimo
109a82f0fe
escl: add Epson EcoTank L3160 support.
2023-01-06 14:42:11 +01:00
Ralph Little
7e85f737d0
Merge branch 'master' into 'master'
...
Update Russian translation
See merge request sane-project/backends!775
2022-12-28 18:11:42 +00:00
Mariya Shikunova
e840ad7fa3
update translation
2022-12-28 08:50:11 +03:00
Ralph Little
fea8ad2b99
Merge branch 'mg5700_buttons' into 'master'
...
pixma: MG5700 button-controlled scan
See merge request sane-project/backends!774
2022-12-21 17:37:30 +00:00
András Wacha
6352b00d6c
Made scan buttons work for Canon Pixma MG5700
2022-12-21 17:12:42 +01:00
Ralph Little
f15a40c1bb
scanimage: default buffer size increased to 1MB
...
Because -B argument was optional and specified 1MB if left out I have
made the argument mandatory now and updated the man page to match.
2022-12-04 10:00:47 -08:00
Ralph Little
fc77717507
scanimage: some prep clean up work.
...
- reduce scope of some variables
- move full_optstring to global so that scanimage_exit can clean it up
- initialize global variables. Global statics are not initialized.
- some other more minor things
2022-12-04 09:29:02 -08:00
Ralph Little
f9fe6d0ced
Merge branch 'it-translation' into 'master'
...
Update 2 IT translations
See merge request sane-project/backends!772
2022-12-04 00:54:15 +00:00
Giovanni Cappellotto
506f539eda
Update 2 IT translations
...
"Brightness" is "Luminosità", I'm 99.9% sure.
"Quality calibration" should be translated as "Calibrazione della
qualità" instead of "Qualità della calibrazione" because the subject is
"quality".
2022-12-03 16:23:38 -05:00
Ralph Little
15e1d83b9d
Merge branch 'no_embedded_ldflags' into 'master'
...
sane-backends.pc.in: Don't embed LDFLAGS into libs.private
See merge request sane-project/backends!768
2022-11-30 18:19:16 +00:00
Zdenek Dohnal
b3b44f1188
sane-backends.pc.in: Drop ldflags from the file
...
The ldflags variable is no longer used in the file because it embedded
LDFLAGS from build environment and LibGPhoto2 LDFLAGS, where the former
contains flags from the environment and can cause problems, and the
latter is empty.
With the state above, we can drop ldflags from pkgconfig file
completely.
2022-11-30 15:31:19 +01:00
Benoit Juin
1549f87198
handle cancel
2022-11-27 16:40:35 +01:00
Benoit Juin
2503ec8497
tweak options
2022-11-27 09:55:40 +01:00
Benoit Juin
f8bd456aa5
remove useless edit
2022-11-26 22:23:28 +01:00
Benoit Juin
65c341b9d5
remove useless edit
2022-11-26 22:22:25 +01:00
Benoit Juin
6e488f3891
fix missing define
2022-11-26 22:20:26 +01:00
Benoit Juin
d739ffb8f0
remove trailing whitepaces
2022-11-26 21:57:19 +01:00
Benoit Juin
185807a335
fix packet empty skip
2022-11-26 19:49:21 +01:00
Benoit Juin
0f9135def2
basic backend working
2022-11-26 15:05:49 +01:00
Benoit Juin
eec401f5c3
data copy in progress
2022-11-26 08:45:57 +01:00
Benoit Juin
8efa358740
fix warnings
2022-11-26 08:16:54 +01:00
Benoit Juin
21f163e797
fix warnings
2022-11-26 08:15:11 +01:00
Benoit Juin
68d6519b6e
fix packet forging
2022-11-26 07:43:23 +01:00
Benoit Juin
e6cb0cf07e
update packet forging
2022-11-26 07:14:45 +01:00
Benoit Juin
a44127d1bc
protocol implementation in progress
2022-11-26 06:36:57 +01:00
Benoit Juin
d343dc963b
protocol implementation in progress
2022-11-26 06:24:49 +01:00
Benoit Juin
315fe1fdf5
fix trailing whitespaces
2022-11-25 17:39:07 +01:00
Benoit Juin
51ba313173
backend in progress
2022-11-25 17:35:10 +01:00