Wykres commitów

11952 Commity (145e16008e7479ea58278e55f71d6dfcd4db714b)

Autor SHA1 Wiadomość Data
Peter Seiderer 145e16008e backend/microtek: fix uclibc compile (include stdarg.h for va_list/va_start/va_end)
Fixes:

  microtek.c: In function ‘MDBG_INIT’:
  microtek.c:163:3: error: unknown type name ‘va_list’
    163 |   va_list ap;
        |   ^~~~~~~
  microtek.c:78:1: note: ‘va_list’ is defined in header ‘<stdarg.h>’; did you forget to ‘#include <stdarg.h>’?
     77 | #include "microtek.h"
    +++ |+#include <stdarg.h>
     78 |
  microtek.c:164:3: warning: implicit declaration of function ‘va_start’; did you mean ‘sane_start’? [-Wimplicit-function-declaration]
    164 |   va_start(ap, format);
        |   ^~~~~~~~
        |   sane_start
  microtek.c:165:54: warning: passing argument 4 of ‘vsnprintf’ makes pointer from integer without a cast [-Wint-conversion]
    165 |   vsnprintf(_mdebug_string, MAX_MDBG_LENGTH, format, ap);
        |                                                      ^~
        |                                                      |
        |                                                      int
  In file included from ../include/sane/sanei_config.h:50,
                   from microtek.c:70:
  .../host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/stdio.h:359:57: note: expected ‘__va_list_tag *’ but argument is of type ‘int’
    359 |         const char *__restrict __format, __gnuc_va_list __arg)
        |                                          ~~~~~~~~~~~~~~~^~~~~
  microtek.c:166:3: warning: implicit declaration of function ‘va_end’ [-Wimplicit-function-declaration]
    166 |   va_end(ap);
        |   ^~~~~~

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
2021-06-18 19:51:45 +02:00
Ordissimo 980bb29cb8 Merge branch 'full-location-header' into 'master'
The job URL is adapted to the information provided by the value of the Location property.

See merge request sane-project/backends!635
2021-06-12 12:41:05 +00:00
thierry1970 667d8f7acc The job URL is adapted to the information provided by the value of the Location property. 2021-06-12 00:57:07 +02:00
Wolfram Sang a78abbbdba Merge branch 'epson2/cleanup-desc' into 'master'
epson2: cleanup desc and remove BUILD versioning

See merge request sane-project/backends!631
2021-06-08 16:58:30 +00:00
Wolfram Sang cadc4de1a7 descriptions: remove unneeded false :new flags
It is the default
2021-06-08 11:52:00 +02:00
Wolfram Sang be5b247180 epson2: desc: remove unneeded URL
No need for a generic URL at a specific scanner
2021-06-08 11:52:00 +02:00
Wolfram Sang 65b7e317a6 epson2: remove BUILD versioning
Makes no sense these days. Sane version is good enough.
2021-06-08 11:52:00 +02:00
Wolfram Sang cd1733c345 Merge branch 'epson2-new-usbids' into 'master'
epson2: improve sorting of usbids and add new ones provided by Epson

See merge request sane-project/backends!630
2021-06-08 05:14:40 +00:00
Wolfram Sang 53641f8342 epson2: add usb ids provided by Epson
This patch is based on the file "epson2_fix.patch" from the archive
"SANE-patch-for-epsonds-epson2-20210518-5.zip" sent to the sane-devel
mailing list. The following changes have been made on top of the
original patch:

* in epson2.desc, the upstream entry for ET-2600 has been dropped
  because a better version was provided in the new additions
* the seperate entry for XP-240 has been merged into the combined entry
  for XP-243/245/247
* the new entries have been sorted into the existing entries
* original changes to epson2_usb.c have been dropped and were recreated
  using the updated epson2.desc and epson2usb.pl
2021-06-02 22:40:21 +02:00
Ralph Little ffa7a82900 po: remove trailing blank line, breaks pipeline 2021-05-31 21:57:37 -07:00
Ralph Little 19b9b41e4d po: Add zh_CN locale to build. 2021-05-31 21:54:23 -07:00
Ralph Little 257529d39e Merge branch 'master' into 'master'
Added SANE backend translation for Simplified Chinese.

See merge request sane-project/backends!629
2021-06-01 04:45:06 +00:00
Wolfram Sang db7a285e74 epson2: use 4 digits for USB IDs
Use the output of the updated epson2usb helper. Affects only the
sorting, no functional change. Also, fix minor whitespace issues at the
end of the file.
2021-05-29 12:22:55 +02:00
Wolfram Sang 28176df499 tools: epson2usb: always use 4 digits for USB IDs
Otherwise the sorting is too confusing when 3- and 4-digits are mixed.
2021-05-29 12:13:35 +02:00
pimvantend 075bd9b7e9 canon_lide70: faster and brighter scanning at 600dpi for the lide600 2021-05-25 14:25:28 +02:00
Tyson Tan b7055f4859 Corrected some entries from Ustushi's S-Chinese translations. 2021-05-21 13:55:05 +00:00
Tyson Tan 99f3783608 Added SANE backend translation for Simplified Chinese. 2021-05-21 08:34:57 +00:00
Ralph Little 2b0e4bc497 Merge branch 'scanimage_man_patch_update' into 'master'
doc: add man change clarification to deal with debian patch.

See merge request sane-project/backends!627
2021-05-13 15:44:34 +00:00
Ralph Little 28ad82bd42 doc: add man change clarification to deal with debian patch. 2021-05-13 15:44:33 +00:00
Ralph Little 8e85691dd9 Merge branch 'reformat-scanimage-options' into 'master'
doc: reformatted the main options of scanimage

See merge request sane-project/backends!626
2021-05-12 16:57:41 +00:00
Ralph Little 4fef6d6da1 doc: reformatted the main options of scanimage
Following the update of saned's man page, I have reformatted the
scanimage options section for consistency and to correct some omissions
and improve readability and grammar.
2021-05-12 09:29:04 -07:00
Ralph Little e81f6b5a57 doc: fix trailing whitespace issue 2021-05-07 11:05:48 -07:00
Ralph Little 37fe11acd2 Merge branch 'saned_man_option_update' into 'master'
doc: updated saned manpage to reflect saned.

See merge request sane-project/backends!624
2021-05-07 16:25:40 +00:00
Ralph Little 7f21e4cac8 doc: updated saned manpage to reflect saned.
saned supports long options and some clarification was necessary for
correctness. Also I reformatted the options section to be more
standard and consistent with other pages.
2021-05-07 09:23:28 -07:00
Ralph Little 28f7bbfb87 Merge branch 'master' into 'master'
Fix manpage typo

See merge request sane-project/backends!623
2021-05-07 16:07:36 +00:00
Rodrigo Osorio dde45eed5e Fix manpage typo
There is no such switch as -B in scanned
2021-05-07 10:18:22 +02:00
pimvantend 3f80ebae93 lide70 and 600: many simplifications 2021-04-18 17:47:49 +02:00
Wolfram Sang 0943bf00bd Merge branch 'epson2/better_timeouts' into 'master'
epson2: better timeouts

See merge request sane-project/backends!605
2021-04-09 19:36:06 +00:00
Ralph Little 75575e0888 epson2: Wolfram Sang is now the maintainer for this backend. 2021-04-08 09:37:24 -07:00
Ralph Little 7b7b36e593 Merge branch '464-genesys-backend-crashes-during-exception-handling' into 'master'
Resolve "genesys backend crashes during exception handling"

Closes #464

See merge request sane-project/backends!621
2021-04-07 16:24:08 +00:00
Ralph Little 730e4ada37 genesys: fixed indentation again.
Hopefully, I will get it right this time. Uses 4 space indents rather
than 2 as used elsewhere in the code base.
2021-04-07 09:06:39 -07:00
Ralph Little 5702046a9c genesys: fix indentation 2021-04-07 09:01:29 -07:00
Ralph Little d9412740ac Merge branch 'mention-advanced-in-scanimage' into 'master'
scanimage: mention when an option is advanced

See merge request sane-project/backends!613
2021-04-07 03:24:46 +00:00
Ralph Little 7ce23d05e2 genesys: ensure that vector ptr is initialized 2021-04-06 08:41:41 -07:00
Klaus Kämpf c5d84e5f17 Merge branch 'digitdia4000_slide' into 'master'
Enable Slide advance on DigitDia 4000 and correct misspelling

See merge request sane-project/backends!620
2021-04-06 13:39:11 +00:00
pimvantend df34fa403a canon_lide70
approximate slope tables with formula a/(1+b*(x-c))
2021-04-04 16:15:10 +02:00
grmpl 696ccd2d7b Enable Slide on DigitDia 4000, correct misspelling 2021-04-03 18:41:06 +02:00
Povilas Kanapickas e16d023b2b Merge branch 'ps-devel-fix-thread-less-compile-001' into 'master'
genesys: use usleep instead of std::this_thread::sleep_for to re-enable thread less compile

See merge request sane-project/backends!619
2021-03-31 23:54:18 +00:00
Peter Seiderer 691d774f75 genesys: use usleep instead of std::this_thread::sleep_for to re-enable thread less compile
Fixes:

  genesys/scanner_interface_usb.cpp: In member function ‘virtual void genesys::ScannerInterfaceUsb::sleep_us(unsigned int)’:
  genesys/scanner_interface_usb.cpp:484:10: error: ‘std::this_thread’ has not been declared
    484 |     std::this_thread::sleep_for(std::chrono::microseconds{microseconds});
        |          ^~~~~~~~~~~

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
2021-03-31 22:57:48 +02:00
Ordissimo eb702d33c4 Merge branch 'fix-escl-resolution-with-jpeg' into 'master'
Fix scan all resolution with JPEG.

See merge request sane-project/backends!617
2021-03-31 16:12:51 +00:00
Ordissimo de5b27c995 Merge branch 'add-escl-models' into 'master'
Add models Canon TR455X

See merge request sane-project/backends!618
2021-03-31 16:11:24 +00:00
thierry1970 9539027f24 Add models Canon TR455X 2021-03-31 17:47:16 +02:00
Thierry HUCHARD f99687b3cc Fix scan all resolution with JPEG. 2021-03-31 17:35:40 +02:00
Povilas Kanapickas 69df00d00c Merge branch 'restore_plustek_opticfilm_v2' into 'master'
genesys: add back Plustek Optifilm 7200 V2 config.

See merge request sane-project/backends!612
2021-03-30 16:00:15 +00:00
Andrew Sayers a6ffa6c8f8 scanimage: mention when an option is advanced 2021-03-30 11:51:21 +01:00
Ralph Little 0bbbf85528 genesys: add back Plustek Optifilm 7200 V2 config.
This has support in the backend and user reports works. I think this
might just be an oversight.
2021-03-28 21:07:21 -07:00
pimvantend 0ef485d189 lide70: more white balance, less slope tables 2021-03-25 13:55:13 +01:00
Ralph Little 1d30150c3c Merge branch 'epson2/disable_focus_properly' into 'master'
epson2: disable focus properly

See merge request sane-project/backends!604
2021-03-20 16:51:18 +00:00
Ralph Little 82117153f5 Merge branch 'epson2/fix-descs' into 'master'
epson2: improve descs

See merge request sane-project/backends!606
2021-03-20 16:46:52 +00:00
Ralph Little bb90aa9d95 Merge branch '454-hp-scanjet-4200c-backend-causes-segmentation-violation' into 'master'
Resolve "HP ScanJet 4200C backend causes segmentation violation"

Closes #454

See merge request sane-project/backends!607
2021-03-14 18:41:17 +00:00