Wykres commitów

12332 Commity (03bfd4232c7bf7a9951a20a38d256a02581cff90)

Autor SHA1 Wiadomość Data
David Ward 03bfd4232c Makefile: Utilize Automake macros for silent rules output
Building with --enable-silent-rules makes it easier to identify errors
or warnings in the build output. Automake provides macros for custom
rules to use, so that they will print a similar message to rules which
run the compiler or linker:

...
  CC       libpieusb_la-pieusb.lo
  CCLD     libpieusb.la
  CCLD     libsane-pieusb.la
  CC       libsane_pixma_la-pixma-s.lo
  GEN      pixma/pixma_sane_options.h
  GEN      pixma/pixma_sane_options.c
  CC       pixma/libpixma_la-pixma.lo
...

This does not change the current output if silent rules are disabled.
2022-04-17 20:16:19 -04:00
David Ward 939d62f836 backend/Makefile: Remove unneeded references to $(srcdir)
Adjust these rules to use relative pathnames, like the other rules.
2022-04-17 20:14:15 -04:00
Ralph Little 602b4f8d3d genesys: add full button support for the Canon 5600F
This model spreads their GPIO buttons lines over 3 different registers:
0x6c, 0xa6 and 0x6d
2022-04-15 11:50:56 -07:00
Ordissimo 785a935e9e Merge branch 'FixEsclTiffSupport' into 'master'
Fix inversed logic in escl_tiff.c:get_TIFF_data

See merge request sane-project/backends!715
2022-04-14 13:50:58 +00:00
Raphael Isemann 877871443d Fix inversed logic in escl_tiff.c:get_TIFF_data
malloc returns NULL on error, but this code errors out on the non-NULL pointer
indicating success (which essentially makes this function always fail).

Signed-off-by: Raphael Isemann <teemperor@gmail.com>
2022-04-14 08:29:43 +02:00
Ralph Little ea8d0eb91e Merge branch 'genesys_8400f_sensors' into 'master'
Genesys 8400f sensors

See merge request sane-project/backends!712
2022-04-13 18:24:57 +00:00
Ralph Little b3a04eae1a genesys: added special PDF function definitions for Canon 4400f 2022-04-13 11:07:45 -07:00
Ralph Little 54766358b5 genesys: corrections for 4400f buttons.
Additional special PDF buttons not yet included.
We need a strategy to deal with them.
2022-04-13 11:06:02 -07:00
Ordissimo 804e936a65 Merge branch 'escl-fix-type-ip' into 'master'
escl: Fix ipv6 detection.

See merge request sane-project/backends!714
2022-04-09 15:49:47 +00:00
Ordissimo b5d5b01886 escl: Fix ipv6 detection. 2022-04-09 17:31:36 +02:00
Ralph Little ab7b3a38e2 genesys: added button definitions for Canoscan 8400F. 2022-04-03 14:47:51 -07: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
Ralph Little 49dfefe8c0 Merge branch 'portable-filenames' into 'master'
Rename doc/*/template.desc. for Windows compatibility

See merge request sane-project/backends!711
2022-03-27 22:44:16 +00:00
David Ward 732fc8cad7 Rename doc/*/template.desc. for Windows compatibility
Windows does not allow filenames ending in a period ("."), preventing
this git repository from even being checked out on a Windows system.

Drop the trailing period in these two filenames. Both files will still
be skipped during the build, since they are not included in DESC_FILES
or DESC_EXT_FILES in doc/Makefile.am.
2022-03-27 17:11:56 -04:00
Ralph Little c1c77436f4 Merge branch '578-remove-linux-kernel-driver-for-plustek_pp-backend' into 'master'
Resolve "Remove Linux kernel driver for plustek_pp backend"

Closes #578

See merge request sane-project/backends!708
2022-03-25 03:49:57 +00:00
Ralph Little 3513af029e plustek-pp: Removed module build files from dist make rules. 2022-03-23 13:26:53 -07:00
Ralph Little 27a7c4518e plustek-pp: removed conditionally compiled code for Linux driver.
Mainly consists of removing code for #ifdef __KERNEL__
In order to keep it really clear what code has been removed, I have
not corrected any formatting issues.
2022-03-23 13:15:27 -07:00
Povilas Kanapickas e87bd848df Merge branch 'merge-release-1.1.x' into 'master'
Merge release-1.1.x branch to master.

See merge request sane-project/backends!709
2022-03-21 20:41:50 +00:00
Povilas Kanapickas aba8c30c92 Merge branch 'release-1.1.x' into merge-release-1.1.x 2022-03-21 22:26:33 +02:00
Ralph Little 6054620c69 Merge branch '583-samsung-scx-4824fn-support' into 'master'
Resolve "Samsung SCX-4824FN Support"

Closes #583

See merge request sane-project/backends!707
2022-03-19 16:20:34 +00:00
Ralph Little ad08e768be Merge branch 'resolve-compiler-warnings' into 'master'
Resolve compiler warnings (including fixes for actual bugs)

See merge request sane-project/backends!701
2022-03-19 16:19:54 +00:00
Ralph Little 3635176eb9 plustek_pp: Removed references to the kernel driver from doc. 2022-03-15 18:57:51 -07:00
Ralph Little 2cf41870b9 xerox_mfp: added fix for Samsung SCX-4824FN and friends for broken JPEg support 2022-03-14 16:35:19 -07:00
Ralph Little 95e2498fe9 Merge branch 'canon_pp-weights-file' into 'master'
canon_pp: Avoid buffer overflow if pathname exceeds PATH_MAX

See merge request sane-project/backends!702
2022-03-14 00:25:02 +00:00
Ralph Little 7cdd2ad268 Merge branch '580-canoscan-lide-220-aborts-before-end-of-4800dpi-colour-scan' into 'master'
Resolve "Canoscan LiDE 220 aborts before end of 4800dpi colour scan"

Closes #580

See merge request sane-project/backends!697
2022-03-10 01:31:01 +00:00
Ralph Little 2d49a2af65 Merge branch 'pixma-fix-max-resolution' into 'master'
pixma:Fix max resolution

See merge request sane-project/backends!703
2022-03-10 01:29:59 +00:00
Ordissimo e5ff5d06e5 pixma:Fix max resolution 2022-03-10 01:29:59 +00:00
Ralph Little 84e907f87c Merge branch 'resolve-sane-desc-warnings' into 'master'
descriptions: Resolve multiple warnings from sane-desc

See merge request sane-project/backends!698
2022-03-09 03:51:08 +00:00
David Ward 9cd0b1809c lexmark_low: Adjust calculation of bytes available in read buffer
GCC warns that an unsigned value is passed to abs(), which may not be
intended. To resolve this warning, adjust the code so abs() is not used
and the behavior is more explicit.
2022-03-08 19:00:00 -05:00
David Ward 0c70fd560c canon_pp: Avoid buffer overflow if pathname exceeds PATH_MAX
If the weights file pathname is longer than PATH_MAX, it may be written
past the end of the buffer on the stack; or it may be truncated when it
is written to allocated memory (such that it is not null-terminated).

Adjust the code to fix both issues. Dynamically allocate memory for the
actual length of the pathname so that it is not constrained by PATH_MAX.
2022-03-08 19:00:00 -05:00
David Ward 2efdd5a334 plustek: Adjust gain calculation to avoid calling labs()
labs() has a signed parameter. However the argument to it here was the
difference between two unsigned values, which itself remains unsigned.
GCC warned that using this in labs() might not have the intended result.

By definition though, dwInc >= m_dwIdealGain >= dwDec, so labs() is not
even needed in this expression.
2022-03-08 19:00:00 -05:00
David Ward 5576d03afd genesys: Fix forward declaration for type UsbDeviceEntry
This did not match the definition, causing a compiler warning.
2022-03-08 19:00:00 -05:00
David Ward 6048724f22 coolscan2, coolscan3: Fix initialization of enum members in struct
GCC warns when setting an enum member to 0 without an explicit cast.
Use the corresponding value in the enum type instead.
2022-03-08 19:00:00 -05:00
David Ward 47fd7538bc Remove set but unused variables which cause compiler warnings 2022-03-08 19:00:00 -05:00
David Ward a82a312d85 Remove unused functions which cause compiler warnings 2022-03-08 19:00:00 -05:00
David Ward 0d032cd982 Remove useless conditionals which cause compiler warnings
These always evaluate to true in the context of the surrounding code.
2022-03-08 19:00:00 -05:00
David Ward b3d105cba5 Use snprintf() instead of strncpy() for space-padded strings
The output from the SCSI inquiry command uses fixed-length space-padded
strings, which are copied into null-terminated strings before use.

This is currently done using strncpy(), with the count parameter set to
the string's fixed length. Because a null terminator is not encountered
in the input, strncpy() does not write one in the output, and GCC warns
about potential string truncation. A null terminator is added manually,
but this is error prone (as shown by the fix for the microtek backend).

Use snprintf() instead, which guarantees a null-terminated result and
resolves the warnings from GCC.
2022-03-08 19:00:00 -05:00
David Ward 6a16e78788 Use strdup()/strndup() instead of direct allocation and string copy
Otherwise, GCC warns about possible string truncation. This simplifies
the code here as well.
2022-03-08 19:00:00 -05:00
David Ward 3c3a247d25 Replace deprecated uint32 with uint32_t 2022-03-08 19:00:00 -05: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 f3162bafa8 Replace variable self-assignments to avoid Clang warnings
These were intended to suppress GCC warnings about unused variables.
However, this leads to different warnings from Clang instead.

Use another approach that suppresses warnings from both compilers.
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
David Ward 6cc15e2b81 Adjust conditional expressions to resolve compiler warnings 2022-03-08 19:00:00 -05:00
David Ward 2955089cd9 Fix conditional expressions with unintended behavior 2022-03-08 19:00:00 -05:00
David Ward 1458d23c42 umax: Fix unintended string concatenation in array definition
This causes the wrong error message to be used in the log.
2022-03-08 19:00:00 -05:00
David Ward bfa69c26e6 snapscan: Fix debug logging in sense_handler()
Remove an extraneous log message.

Ensure that a separate log message is only printed when the preceding
if-statement is true (and its string argument has actually been set).

Both issues were identified from GCC warnings about indentation.
2022-03-08 19:00:00 -05:00
David Ward 23addf5590 sm3840: Fix argument types for variadic function
Values of type unsigned char are automatically promoted to a larger
integer type, so they cannot be used as variadic function arguments.
2022-03-08 19:00:00 -05:00
David Ward 4cf3b09e49 rts8822, rts8891: Replace abs() with fabs() where needed
abs() has an integer parameter and returns an integer value. Floating-
point values should be passed to fabs() instead.

In particular, this affected calculations for gain and offset, where a
value with floating-point precision is clearly expected.
2022-03-08 19:00:00 -05:00
David Ward e859ea4d89 pieusb: Add missing calls to sanei_pieusb_convert_status()
Fix cases where values of type PIEUSB_Status were used or returned when
the expected type was SANE_Status.
2022-03-08 19:00:00 -05:00