Peter Marschall
36b59bd2c1
epjitsu: introduce & use MAX() & MIN()
...
This change simplifies some expressions, and hence
allows for easier understanding of the intention.
Signed-off-by: Peter Marschall <peter@adpm.de>
2021-12-08 16:36:13 +02:00
Wolfram Sang
b183f6a055
Merge branch 'epson2/add_to_main_manpage' into 'master'
...
epson2: add driver to main sane manpage
See merge request sane-project/backends!660
2021-12-08 08:48:45 +00:00
Wolfram Sang
952976c6a6
Merge branch 'epson2/more_ids' into 'master'
...
epson2/epsonds: add new IDs provided by Epson
See merge request sane-project/backends!659
2021-12-08 08:47:29 +00:00
Ralph Little
5ecd4a9d3e
Merge branch 'canon_xk90_ts8030' into 'master'
...
pixma: Added testing information for Canon XK90 and added large image interleave.
See merge request sane-project/backends!661
2021-12-07 20:54:54 +00:00
Ralph Little
0bbf1155af
pixma: Added testing information for Canon XK90 and added large image interleave.
2021-12-07 20:54:54 +00:00
Wolfram Sang
bb94182982
epson2: add driver to main sane manpage
...
Reported missing by A E Lawrence via mail. Thanks!
2021-12-03 13:53:10 +01:00
Wolfram Sang
91c24b2955
epson2/epsonds: add new IDs provided by Epson
...
Sent by Nakamura Iwao via sane-devel mailing list on Nov, 29th. I only
sorted the epson2 descriptions alphabetically.
Subject: [sane-devel] Additional model support for epson2 / epsonds backend
Message-ID: <TYCPR01MB7872CDD0461B7572D5DBD7A8EB669@TYCPR01MB7872.jpnprd01.prod.outlook.com>
2021-12-03 12:36:33 +01:00
Ordissimo
3b47d1d26a
Merge branch 'escl-segfault' into 'master'
...
Fix segfault sane-escl.
See merge request sane-project/backends!653
2021-10-21 06:58:39 +00:00
Ordissimo
72992f4e25
Fix segfault sane-escl.
2021-10-20 22:25:10 +02:00
Ordissimo
3440ef60b3
Merge branch 'master' into 'master'
...
escl: Follow the 302 redirects
See merge request sane-project/backends!652
2021-10-18 11:45:22 +00:00
Jindřich Makovička
1b5344ba56
escl: Follow the 302 redirects
...
Recent ipp-usb redirects from http://127.0.0.1 to http://localhost
2021-10-14 20:05:19 +02:00
Ralph Little
0c1faae1de
Merge branch 'test_int_inexact_option' into 'master'
...
Add int_inexact option to test SANE_INFO_INEXACT.
See merge request sane-project/backends!633
2021-10-14 14:47:51 +00:00
Ralph Little
3a5f128e8a
Add int_inexact option to test SANE_INFO_INEXACT.
2021-10-14 14:47:51 +00:00
Ordissimo
65b6684984
Merge branch 'pdf-on' into 'master'
...
The name of the device, allows to disable the use of the PDF format.
See merge request sane-project/backends!651
2021-09-26 06:35:31 +00:00
Ordissimo
88934578ec
The name of the device, allows to disable the use of the PDF format.
2021-09-26 06:35:31 +00:00
Ordissimo
66f2673d71
Merge branch 'add-format-pdf' into 'master'
...
Add format pdf.
See merge request sane-project/backends!648
2021-09-22 15:14:15 +00:00
Ordissimo
d25f5db739
Add format pdf.
2021-09-22 15:14:15 +00:00
Wolfram Sang
55ac7b3060
Merge branch 'kkaempf/add_Reflecta_RPS_10M' into 'master'
...
Add Reflecta RPS 10M to pieusb
See merge request sane-project/backends!650
2021-09-22 10:18:26 +00:00
Klaus Kämpf
d12533fced
Add Reflecta RPS 10M to pieusb
...
(aka Pacific Image PrimeFilm XAs)
Thanks to Thomas Wilshaw for testing.
Signed-off-by: Klaus Kämpf <kkaempf@suse.de>
2021-09-21 14:25:16 +02:00
Ralph Little
8ad3b1127f
po: en_Gb translation.
...
Nothing much to do.
Just a couple of new msgs from the epsonds backend update.
2021-09-20 20:31:33 -07:00
Ralph Little
c540a3a354
po: update po files prior to translations for release 1.0.33
2021-09-20 20:09:29 -07:00
Ralph Little
66d65ba37d
Merge branch 'uk_update1' into 'master'
...
po: Update Ukrainian translation
See merge request sane-project/backends!649
2021-09-21 03:05:57 +00:00
Yuri Chornoivan
5698be8cce
po: Update Ukrainian translation
2021-09-20 19:47:14 +03:00
Wolfram Sang
a3558af0fc
Merge branch 'epson2-uninitialized' into 'master'
...
epson2: fix up uninitialized variables
See merge request sane-project/backends!636
2021-09-18 18:38:12 +00:00
pimvantend
54e3fb2094
Added the lide70 news to NEWS, in view of the upcoming release.
...
Removed gamma remark from lide70 manpage:
default color quality is getting better, though still not perfect.
2021-09-06 16:19:04 +02:00
Ordissimo
1d191ab801
Merge branch 'escl-add-models' into 'master'
...
Escl add models Epson ET-6100
See merge request sane-project/backends!647
2021-08-31 20:09:33 +00:00
Ordissimo
e1b5c43b56
Escl add models Epson ET-6100
2021-08-31 20:09:33 +00:00
Adriaan de Groot
0400e23d30
uninitialized: set *status on all returns out of e2_ssend()
2021-08-30 17:45:21 +02:00
Ralph Little
563afbe0fa
Merge branch '505-issues-in-man-pages' into 'master'
...
Resolve "Issues in man pages"
Closes #505
See merge request sane-project/backends!646
2021-08-29 23:16:42 +00:00
Ralph Little
e84dc47f73
doc: errors corrected by translator.
...
Many thanks to translator hmartink for raising these issues.
2021-08-29 16:00:23 -07:00
Ordissimo
c3cdf4102c
Update pixma.desc
2021-08-28 09:03:42 +00:00
Ordissimo
2ad66b6bec
Merge branch 'add-models' into 'master'
...
Add models
See merge request sane-project/backends!645
2021-08-27 19:00:26 +00:00
Ordissimo
fc99bbe784
Add models
2021-08-27 19:00:26 +00:00
Ordissimo
c798d85eaf
Merge branch 'cleaning-doc-escl' into 'master'
...
Alphabetical classification by make and model
See merge request sane-project/backends!644
2021-08-27 14:53:31 +00:00
thierry1970
94f25af5d8
Alphabetical classification by make and model
2021-08-27 16:09:09 +02:00
Ordissimo
26749cee53
Merge branch 'fix-redirection-curl' into 'master'
...
Fix redirect request.
See merge request sane-project/backends!643
2021-08-23 07:57:32 +00:00
Ordissimo
4929387246
Fix redirect request.
2021-08-23 07:57:32 +00:00
Ordissimo
1ba63878e4
Merge branch 'canon-pixma-new-model' into 'master'
...
Canon pixma new model
See merge request sane-project/backends!642
2021-08-10 20:32:29 +00:00
Ordissimo
47963e059e
Canon pixma new model
2021-08-10 20:32:29 +00:00
Wolfram Sang
f5b4e914c6
Merge branch 'epson-xp-455' into 'master'
...
epson2: Add XP-452 455 Series as supported
See merge request sane-project/backends!641
2021-08-03 20:21:38 +00:00
John Keeping
6ea78a79ca
epson2: Add XP-452 455 Series as supported
...
Tested via simple-scan with a device branded as XP-455 but which
identifies in the device descriptor's product string as "XP-452 455
Series".
2021-07-31 18:04:26 +01:00
Ordissimo
c6fd7de5f1
Merge branch 'escl-support-TR7500' into 'master'
...
Escl support tr4520 and tr7500
See merge request sane-project/backends!640
2021-07-29 15:34:30 +00:00
Ordissimo
4c99352dda
Escl support tr4520 and tr7500
2021-07-29 15:34:29 +00: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
7b2c4a0bf7
Merge branch 'epsonds_updates'
2021-07-03 15:59:39 -07:00
Ralph Little
1e88e1504e
epsonds: Merge to master
2021-07-03 15:55:25 -07:00
Ralph Little
bb8c0b088c
epsonds: Correction from Epson for unused parameter fail in pipeline.
2021-07-02 09:31:12 -07:00
Ralph Little
b74dfb3004
epsonds: corrections from Epson following first review.
...
Contains some rework to address concerns from pipeline build.
2021-06-22 12:41:44 -07:00
Ralph Little
9282aac9be
epsonds: Fix up white space issues in patch.;
2021-06-20 14:57:08 -07:00
Ralph Little
bc6035624d
epsonds: major product support update from Epson.
...
Patch provided by Nakamura Iwao at Epson Japan.
2021-06-20 14:49:56 -07:00