Wykres commitów

103 Commity (b31b82c8bd99e890835b0ab8f42cbf118481784e)

Autor SHA1 Wiadomość Data
Ben Olden-Cooligan ec3eacfbcb Remove obsolete pixma macOS workaround
Without this change, pixma scanning is currently broken (tested with Canon MP495). The stated reason for the workaround (libusb not supporting timeouts for interrupts) hasn't been true since 2010:
67d9ef7b68
2024-01-11 20:21:36 -08:00
Ralph Little 651fc3419a pixma: Added speculative definitions for MF750 imageclass machines.
Also corrected descrption file entry for TS8700.
2023-11-06 14:48:38 -08:00
Ordissimo 14dbdc759e pixma: add models October 2023 2023-11-03 10:15:17 +01:00
Ordissimo b1f6bea394 pixma: add 2023 models 2023-09-25 23:18:15 +02:00
Ordissimo 766162cad6 pixma: add 2023 models 2023-09-25 23:13:59 +02:00
Ralph Little 59885e039e pixma: don't change resolution or mode when changing source
If currently selected resolution and mode are still valid when changing
source then retain the selected value rather than picking defaults.
2023-03-07 22:10:54 -08:00
Ralph Little 1eff86953d Merge branch 'pixma-add-models' into 'master'
pixma: add new models

See merge request sane-project/backends!766
2023-02-20 17:24:49 +00:00
András Wacha 6352b00d6c
Made scan buttons work for Canon Pixma MG5700 2022-12-21 17:12:42 +01:00
thierry1970 42d1143c0a pixma: add new models 2022-11-21 11:04:03 +01:00
Michał Kopeć 6740b47bca
pixma: add support for imageRUNNER 1018/1022/1023
Add support for Canon imageRUNNER 1018/1022/1023 models, which all share the
same USB PID. Add it as a copy of MF6500.

Tested with an iR1022A model. Flatbed and ADF both work correctly.

Signed-off-by: Michał Kopeć <michal.kopec@3mdeb.com>
2022-10-06 11:09:58 +02:00
thierry1970 7ec4074fbd pixma: add 2 models 2022-08-16 11:20:02 +02:00
Ralph Little 586ff11af5 Merge branch 'pixma-sa-size' into 'master'
pixma: fix broadcast_sa size calculation

Closes #426

See merge request sane-project/backends!572
2022-03-29 05:45:03 +00:00
David Ward db573b74ed Fix format specifiers to match arguments' data types 2022-03-08 19:00:00 -05:00
David Ward 1a933bba7e Cast pointer arguments if needed when using "%p" format specifier
Pointer arguments must have type (void *) when printed with the format
specifier "%p".
2022-03-08 19:00:00 -05:00
David Ward 6be83f469b Resolve compiler warnings about misleading indentation
This change is targeted at specific lines of code reported by GCC or
Clang as potentially causing unintended behavior.
2022-03-08 19:00:00 -05:00
Ordissimo e5ff5d06e5 pixma:Fix max resolution 2022-03-10 01:29:59 +00:00
Ordissimo 584f16e2ee pixma: add 2021 models.
Fix white space

Fix build

Add descriptions

Reduces the length of the line
2021-12-27 16:33:37 +02:00
Konstantin Tcepliaev 0a038376a6 pixma: move MF56x0 to MP730 backend 2021-12-16 00:01:53 +02:00
Mikhail Remnev d32e6c4115 Added iclass_device for imageRUNNER1133A 2021-12-15 23:23:08 +02: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 911be8af68 Merge branch 'cleanup_major_minor' into 'master'
treewide: use SANE_CURRENT_* macros consistently

See merge request sane-project/backends!632
2021-06-19 19:43:38 +00:00
Peter Seiderer b1021e09e4 backend/pixma: fix compile with NDEBUG
Fixes:

  .../host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/9.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: ./.libs/libpixma.a(libpixma_la-pixma_common.o): in function `sanei_pixma_read_image':
pixma_common.c:(.text+0xc05): undefined reference to `DBG'
  .../host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/9.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: pixma_common.c:(.text+0xc38): undefined reference to `DBG'
  .../host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/9.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: pixma_common.c:(.text+0xcbf): undefined reference to `DBG'

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
2021-06-18 20:10:02 +02:00
Wolfram Sang eb42ad08d5 treewide: use SANE_CURRENT_* macros consistently
Backends use a mixture of SANE_CURRENT_{MAJOR | MINOR} and V_{MAJOR |
MINOR} with all kind of permutations. I was confused by this and one
comment in pieusb.c tells me I was not alone. Some items in old
changelogs suggest to use the SANE_CURRENT_ macros in backends, so let's
switch to do that with the exception of net.c and dll.c. Done with:

$ find backend -name '*.[ch]' | xargs sed -i '/nearly every/ ! { s/\<V_M/SANE_CURRENT_M/g }'
$ git checkout backend/net.c backend/dll.c

And manually removing the comment from pieusb.c. Everything still builds
fine.
2021-06-08 19:01:41 +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
Ralph Little 7946a14cfb po: Added en_GB translations.
Note: also fixed a minor grammar point in the pixma backend.
2021-01-24 10:04:47 -08:00
Timo Teräs baa26ffd95 pixma: fix broadcast_sa size calculation
The sa_size was incorrectly used on the destination buffer which
likely contains wrong address family.

Fixes #426
2021-01-15 16:49:52 +02:00
Thierry HUCHARD ffc2bbb1ff pixma: Add models 2020-12-26 15:40:07 +02:00
Ralph Little a388c3abc1 pixma: avoid structure copy on every read by using cinfo address. 2020-11-28 19:34:52 -08:00
Ralph Little 410f954f3b pixma: assignment must be inside the loop to be effective. 2020-11-28 19:29:06 -08:00
Ralph Little 08eaf1a22e pixma: MX490 series returns JPEG from ADF scans. 2020-11-28 19:19:26 -08:00
Iskren Chernev 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
Ralph Little 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
Rolf Bensch 429cc0efc0 pixma: backend version 0.28.6 2020-09-25 16:40:07 +02:00
Rolf Bensch 9db8fc305e pixma: add comment for last merge 2020-09-25 16:38:38 +02:00
Rolf Bensch e80612275e Merge branch 'patch-1' into 'master'
Added support for Canon Pixma MX340 buttons and ADF status

See merge request sane-project/backends!513
2020-09-25 14:35:40 +00:00
Olaf Meeuwissen a380fb0894
pixma: Restore old behaviour in case XML support is missing
Fixes #345.
2020-09-13 18:47:32 +09:00
Peter Marschall 3e33c9664a spelling fixes for pixma backend 2020-08-29 09:18:03 +02:00
Asela Fernando 4a76bbd162 Added support for Canon Pixma MX340 buttons buf[7] and ADF status buf[8] 2020-08-20 00:32:49 +00:00
Olaf Meeuwissen 245564dffe Merge branch 'respect_local_only' into 'master'
Respect 'local_only' parameter of sane_get_devices()

Closes #140 and #130

See merge request sane-project/backends!502
2020-08-16 09:55:14 +00:00
Rolf Bensch 65db792a14 pixma: backend version 0.28.5 2020-08-15 14:33:48 +02:00
Rolf Bensch 311bf867f9 pixma: MP495 is working
Pixma backend supports only symmetric scan resolutions, here 600dpi.

See issue sane-project/backends#32
2020-08-15 14:32:58 +02:00
Rolf Bensch d1fea9269d Revert "pixma: MP490 Series doesn't need special image formatting @ high dpi"
This reverts commit 1675697366.

See issue sane-project/backends#338
2020-08-14 20:28:26 +02:00
Rolf Bensch 34c25369e5 pixma: backend version 0.28.4 2020-08-14 19:58:15 +02:00
Rolf Bensch 584099c9c1 pixma: enable PIXMA_CAP_JPEG for Canon i-SENSYS MF260 Series 2020-08-14 19:52:05 +02:00
Rolf Bensch a384de5aea pixma: new capability PIXMA_CAP_JPEG 2020-08-14 19:45:23 +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
Rolf Bensch e390b351a0 pixma: backend version 0.28.3 2020-07-14 18:10:45 +02:00
Rolf Bensch 1da5ae889a pixma: add new button options
some scanners return more options from push-button:
document-type, adf-status and adf-orientation
2020-07-14 17:39:18 +02:00
Rolf Bensch ec918e5c74 pixma: TR4500 Series supports max. 600dpi 2020-07-14 17:28:06 +02:00
Rolf Bensch 0febc81665 pixma: add button support for TR4500 Series
this scanner provides additional button information
2020-07-14 17:27:48 +02:00