Wykres commitów

11813 Commity (7b602c1d6b12ab48ce0dea5095f2359fa051c0f2)

Autor SHA1 Wiadomość Data
Olaf Meeuwissen 7b602c1d6b Merge branch 'sync-utsushi-desc-with-upstream' into 'master'
utsushi.desc: Sync with upstream

See merge request sane-project/backends!573
2021-01-16 06:30:56 +00:00
Olaf Meeuwissen 957a4fcb8f
utsushi.desc: Sync with upstream 2021-01-16 15:14:22 +09:00
Ordissimo c26e9acd79 Merge branch 'escl-fix-alloc' into 'master'
escl: fix char_to_array memory allocation calculations

Closes #425

See merge request sane-project/backends!571
2021-01-15 15:16:45 +00:00
Timo Teräs 891ccac3b6 escl: fix char_to_array memory allocation calculations
Too little memory allocated due to incorrect calculation.

Fixes #425
2021-01-15 16:46:12 +02:00
Ordissimo d46fbd9d79 Merge branch 'escl-check-poppler-glib' into 'master'
Fix check poppler-glib, (see issue #422).

See merge request sane-project/backends!570
2021-01-14 12:46:22 +00:00
thierry1970 0293e662cf Fix check poppler-glib, (see issue #422). 2021-01-14 13:20:17 +01:00
Gerhard Jaeger b0655dc03e Fix issue with '--enable-locking': Do not require sub-directory for locking. 2021-01-07 12:34:34 +01:00
Ordissimo f0f7e43d7f Merge branch 'escl-fix-orders' into 'master'
The order of the parameters does not change the result.

See merge request sane-project/backends!568
2021-01-04 19:07:25 +00:00
Thierry HUCHARD fefc6f1818 The order of the parameters does not change the result. 2021-01-04 19:47:08 +01:00
Ordissimo adbfcd1696 Merge branch 'escl-devices-list-properties' into 'master'
Adds to the list of detected devices the different supported trays

See merge request sane-project/backends!564
2021-01-04 18:40:43 +00:00
Olaf Meeuwissen 2e41482e01 Merge branch '409-autoconf-2.70-causes-resulting-configure-file-to-fail' into 'master'
Drop use of obsoleted autoconf AC_HEADER_STDC macro.  Fixes #409

Closes #409

See merge request sane-project/backends!566
2021-01-01 07:19:07 +00:00
Olaf Meeuwissen 445b5bd7e1
Drop use of obsoleted autoconf AC_HEADER_STDC macro. Fixes #409
Use of the STDC_HEADER pre-processor macro that the autoconf macro
used to define has been removed.  Conditionalized code is now used
unconditionally.  This should be fine as the macro checks for ANSI
C, i.e. C89 (ISO C90), compliant headers.  We already require C99.
2021-01-01 16:02:52 +09:00
Thierry HUCHARD 17023afb99 Get device informations with avahi. 2020-12-29 11:33:55 +01:00
Povilas Kanapickas 0c2fa6bea6 Merge branch 'fix_crash' into 'master'
Fix crash in scanimage when must_buffer is true

Closes #408

See merge request sane-project/backends!563
2020-12-26 22:19:45 +00:00
James Ring b4be10c5a2 Fix crash in scanimage when must_buffer is true
Fixes https://gitlab.com/sane-project/backends/-/issues/408.
2020-12-26 14:04:26 -08:00
Povilas Kanapickas 422425d740 Merge branch 'port' into 'master'
allow saned to listen on specified port, or an ephemeral port

See merge request sane-project/backends!549
2020-12-26 17:26:42 +00:00
James Ring ea50fb683c allow saned to listen on specified port, or an ephemeral port 2020-12-26 09:10:55 -08:00
Povilas Kanapickas 5af7850ba6 Merge branch 'sanei-usb-configure-record-open-clear' into 'master'
sanei_usb: Allow backends to specify when USB recording is cleared

See merge request sane-project/backends!392
2020-12-26 14:16:19 +00:00
Povilas Kanapickas e9d2cdf67b sanei_usb: Allow backends to modify when USB recording is cleared 2020-12-26 16:01:04 +02:00
Povilas Kanapickas ee7f913974 Merge branch 'pixma-add-models' into 'master'
Add models

See merge request sane-project/backends!553
2020-12-26 13:56:49 +00:00
Povilas Kanapickas 9c00d111e6 Merge branch 'fix_leak' into 'master'
fix small memory leak in scanimage option processing

See merge request sane-project/backends!551
2020-12-26 13:41:52 +00:00
Thierry HUCHARD ffc2bbb1ff pixma: Add models 2020-12-26 15:40:07 +02:00
Olaf Meeuwissen e0be6fc892 Merge branch '395-add-epson-et-2600-support' into 'master'
Resolve "Epson ET-2600 works with libusb configuration"

Closes #395

See merge request sane-project/backends!562
2020-12-26 05:17:54 +00:00
Olaf Meeuwissen 4d347512eb
epson2.desc: Fix formatting error 2020-12-26 13:44:42 +09:00
Olaf Meeuwissen be8b841057
utsushi.desc: Sync with upstream 2020-12-26 12:04:11 +09:00
Olaf Meeuwissen 77a3173e90
epson2: Add ET-2600 as supported
See https://gitlab.com/sane-project/backends/-/issues/395
2020-12-26 12:03:15 +09:00
Ordissimo 1ae3197f00 Merge branch 'escl-fix-messages-and-variable' into 'master'
Fix messages and variable.

See merge request sane-project/backends!561
2020-12-22 15:58:19 +00:00
thierry1970 1dbc316327 Fix messages and variable. 2020-12-22 16:14:44 +01:00
Ordissimo 87d9a86742 Merge branch 'escl-fix-documentformat' into 'master'
Choose the format according to availability and options.

See merge request sane-project/backends!560
2020-12-21 20:54:27 +00:00
Ordissimo 4aa767327d Choose the format according to availability and options. 2020-12-21 20:17:03 +00:00
Ordissimo 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
thierry1970 c0dae7e8f5 refactoring options code 2020-12-21 18:16:31 +01:00
Ralph Little 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
Ralph Little e111c48562 avision: added increment of the line variable in non-interpolated case 2020-12-19 17:28:36 -08:00
Ralph Little 15e200a981 avision: added some brackets to silence warnings about precedence ambiguity 2020-12-19 17:27:23 -08:00
Ordissimo 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
Thierry HUCHARD a5181be71b Fix a crash when asking for the list of options: scanimage -A 2020-12-19 22:04:30 +01:00
Ordissimo 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
thierry1970 3ad2f011ca Add model version scangearmp2 4.0 and 4.10. 2020-12-18 08:48:27 +01:00
Olaf Meeuwissen 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
thierry1970 6ad6352342 Add model HP Deskjet 3760. 2020-12-16 13:50:24 +01:00
thierry1970 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
James Ring aa228faa13 fix small memory leak in scanimage option processing 2020-12-07 14:55:32 -08:00
Povilas Kanapickas 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
Olaf Meeuwissen f1154375f5 Merge branch 'master' into 'master'
drop CVS keywords

See merge request sane-project/backends!547
2020-11-30 11:07:40 +00:00
m. allan noah 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
Mikolaj Kucharski cbf9627fd8 final Revision CVS keyword removal 2020-11-29 09:19:26 +00:00
Mikolaj Kucharski 4196d204f1 drop more tricky Revision CVS keyword 2020-11-29 09:17:33 +00:00
Mikolaj Kucharski 7de7c051fa more CVS keywords removed, Log and Revision 2020-11-29 09:06:48 +00:00
Ralph Little a388c3abc1 pixma: avoid structure copy on every read by using cinfo address. 2020-11-28 19:34:52 -08:00