Wykres commitów

12523 Commity (707-xerox_mfp-scx-4521-fixes-are-not-merged)

Autor SHA1 Wiadomość Data
Ralph Little 2fb8eb90cf Merge branch 'pixma-add-model' into 'master'
pixma:  add 2023 model

See merge request sane-project/backends!795
2023-09-26 15:32:00 +00:00
ThierryFR 3094f4a0dc Merge branch 'canon_pixma-add-model' into 'master'
canon_pixma :  add 2023 models

See merge request sane-project/backends!796
2023-09-26 04:34:45 +00:00
ThierryFR cd5443eec8 canon_pixma : add 2023 models 2023-09-26 04:34:44 +00: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
ThierryFR 353e089ff4 Merge branch 'scanimage-pdf-error' into 'master'
Fix qpdfview error : Invalid XRef entry 0

See merge request sane-project/backends!794
2023-09-20 18:47:27 +00:00
Ordissimo 5978899b54 Fix qpdfview error : Invalid XRef entry 0 2023-09-20 08:58:49 +02:00
ThierryFR 0c1cbc1b6a Merge branch 'jpeg_fix' into 'master'
escl: Fix crash in libjpeg when cropping the scanned image

See merge request sane-project/backends!793
2023-09-19 19:41:43 +00:00
Sebastian Parborg ba7d24bf30 escl: Fix crash in libjpeg when cropping the scanned image
jpeg_crop_scanline will adjust the x offset and the width of the image
to make it line up with the nearest iMCU boundary.

Before, this was not taken into account and it would make SANE
potentially allocate a too small buffer for the final image.

This would lead to segfaults because libjpeg would try to write outside
of the allocated memory region as it assumes that the buffer was
allocated with the new cinfo.output_width size after cropping.
2023-09-19 15:54:22 +02:00
ThierryFR 9bf2415fe6 Merge branch 'escl-fix-build' into 'master'
escl - Fix #690 use constant build .

See merge request sane-project/backends!792
2023-08-05 16:52:45 +00:00
Ordissimo f9951e3b31 escl - Fix constant build . 2023-08-05 17:55:14 +02:00
m. allan noah 9d721e4610 canon_dr backend v65
- fix imprinter support (#672)
- update attach_one and other init functions
2023-06-06 21:48:56 -04:00
Ralph Little 820ce39e94 Merge branch 'matkoniecz-master-patch-83655' into 'master'
apt install also requires sudo

See merge request sane-project/backends!789
2023-05-08 15:30:38 +00:00
Mateusz Konieczny cfb3ab1bbd apt install also requires sudo 2023-05-08 11:00:00 +00:00
Ordissimo b171aa7d87 Merge branch 'escl-fix-pwg-version' into 'master'
escl: Fix version of pwf:Version

Closes #675

See merge request sane-project/backends!788
2023-04-16 19:49:45 +00:00
Ordissimo aa3fc1cad8 escl: Fix version of pwf:Version 2023-04-16 19:49:45 +00:00
m. allan noah 90cc6b1fb7 fujitsu/ricoh.desc file updates
Sort model numbers to be more readable on our website.
Remove 'ricoh' from model names.
2023-03-28 08:29:02 -04:00
m. allan noah 44f96adb33 fujitsu.desc: remove trailing blank line 2023-03-27 21:03:39 -04:00
m. allan noah 9ce70f06c8 fujitsu backend v140
add initial support for Ricoh scanners
2023-03-27 20:59:03 -04:00
m. allan noah f4fcbb59f2 fujitsu.desc: add new line of Ricoh scanners
Fujitsu has transfered their line of scanners to Ricoh, initially
keeping the same USB VID and PID. So we duplicate all current
models into a Ricoh section.
2023-03-24 19:33:30 -04:00
Ralph Little 4f9300d1ae Merge branch 'epsonds-cleanups' into 'master'
epsonds: Add some missing entries

See merge request sane-project/backends!785
2023-03-17 05:11:38 +00:00
Benjamin Gordon c5c329ce24 epsonds: Give names to group options
The group options currently do not have names set.  Since only the title
is supposed to be valid for group options, this isn't a violation of
the SANE standard.  Regardless, it causes scanimage (and maybe other
frontends) to skip them.  Add empty name values so that they can be
processed properly.

Before:
Options specific to device `epsonds:net:n.n.n.n':
  Standard:
    --source Flatbed|ADF Front|ADF Duplex [Flatbed]
        Selects the scan source (such as a document-feeder).
    --mode Lineart|Gray|Color [Color]
        Selects the scan mode (e.g., lineart, monochrome, or color).
    --depth 1|8bit [8]
        Number of bits per sample, typical values are 1 for "line-art" and 8
        for multibit scans.
    --resolution 75|150|300|600|1200dpi [75]
        Sets the resolution of the scanned image.
    -l 0..215.9mm [0]
        Top-left x position of scan area.
    -t 0..297.18mm [0]
        Top-left y position of scan area.
    -x 0..215.9mm [215.9]
        Width of scan-area.
    -y 0..297.18mm [297.18]
        Height of scan-area.
    --eject [inactive]
        Eject the sheet in the ADF
    --load [inactive]
        Load a sheet in the ADF
    --adf-skew[=(yes|no)] [inactive]
        Enables ADF skew correction
    --adf-crp[=(yes|no)] [inactive]
        Enables ADF auto cropping

After:
Options specific to device `epsonds:net:n.n.n.n':
  Standard:
    --source Flatbed|ADF Front|ADF Duplex [Flatbed]
        Selects the scan source (such as a document-feeder).
    --mode Lineart|Gray|Color [Color]
        Selects the scan mode (e.g., lineart, monochrome, or color).
    --depth 1|8bit [8]
        Number of bits per sample, typical values are 1 for "line-art" and 8
        for multibit scans.
    --resolution 75|150|300|600|1200dpi [75]
        Sets the resolution of the scanned image.
  Geometry:
    -l 0..215.9mm [0]
        Top-left x position of scan area.
    -t 0..297.18mm [0]
        Top-left y position of scan area.
    -x 0..215.9mm [215.9]
        Width of scan-area.
    -y 0..297.18mm [297.18]
        Height of scan-area.
  Optional equipment:
    --eject [inactive]
        Eject the sheet in the ADF
    --load [inactive]
        Load a sheet in the ADF
    --adf-skew[=(yes|no)] [inactive]
        Enables ADF skew correction
    --adf-crp[=(yes|no)] [inactive]
        Enables ADF auto cropping
2023-03-13 10:57:18 -06:00
Benjamin Gordon 12ef54b087 epsonds: Allow querying OPT_ADF_CRP
The OPT_ADF_CRP (adf-crp) option is detectable from the hardware and is
settable as an option, but can't be queried.  This appears to just be an
oversight, so add it to the list of handled options.
2023-03-09 10:20:51 -07:00
Ralph Little 79962f324d Merge branch '664-pixma-backend-resets-mode-when-source-selected' into 'master'
Resolve "Pixma backend resets --mode when --source selected"

Closes #664

See merge request sane-project/backends!784
2023-03-08 06:22:58 +00: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 596f708c96 changelog: Add changelog missed from the 1.2.1 release 2023-02-27 20:04:50 -08:00
Ralph Little 3ab4342ce7 doc: remove "new" markers from lide70 and "template" backends. 2023-02-27 19:36:12 -08:00
Ralph Little 49943e7e45 Merge branch '570-issues-in-man-pages' into 'master'
Resolve "Issues in man pages"

See merge request sane-project/backends!692
2023-02-21 04:26:29 +00:00
Ralph Little 2b20ad5b12 doc: merge changes from default, related to removal of init system config. 2023-02-20 20:14:58 -08:00
Ralph Little 536e486ff7 Merge branch 'saned-doc' into 'master'
doc/saned: Improve service configuration details and security warnings

See merge request sane-project/backends!717
2023-02-21 04:00:50 +00:00
Ralph Little dd145a2383 Merge branch '410-sane-terminates-on-flatbed-scanning-xerox-3225-xerox_mfp-with-not-a-jpeg-file-starts-with-0x00' into 'master'
Resolve "sane terminates on flatbed-scanning (Xerox 3225, xerox_mfp) with : Not a JPEG file: starts with 0x00 0x00"

Closes #410

See merge request sane-project/backends!567
2023-02-21 00:48:34 +00:00
Ralph Little 5f99edda9f Resolve "sane terminates on flatbed-scanning (Xerox 3225, xerox_mfp) with : Not a JPEG file: starts with 0x00 0x00" 2023-02-21 00:48:34 +00:00
Ralph Little 06280f15c1 Merge branch 'master' into '570-issues-in-man-pages'
# Conflicts:
#   doc/sane-epjitsu.man
#   doc/sane-plustek_pp.man
2023-02-21 00:13:33 +00:00
Ralph Little e584a8c503 scanimage: fix for merge failure.
Two changes were made recently for the batch processing component
in scanimage. It's not too bad, just a couple of unused local vars.
Conflict was between some refactoring that I did and a change to
the processing for --batch-prompt.
2023-02-20 16:07:17 -08:00
Ralph Little 189c5361b7 Merge branch 'plustek7600i_8100_vidpid' into 'master'
genesys: Add VID:PID for Plustek OpticFilm 7600i and 8100

See merge request sane-project/backends!767
2023-02-20 23:54:45 +00:00
Ralph Little e147d111e3 Merge branch 'warmar-master-patch-05014' into 'master'
xerox_mfp: Add Dell 1135n

See merge request sane-project/backends!770
2023-02-20 23:52:42 +00:00
Warren Mar 9a190804dd xerox_mfp: Add Dell 1135n 2023-02-20 23:52:42 +00:00
Ralph Little 10b3345a1c Merge branch '16-low-default-buffer-size-results-in-poor-scanner-performance' into 'master'
Resolve "Low default buffer size results in poor scanner performance"

Closes #16

See merge request sane-project/backends!773
2023-02-20 23:51:26 +00:00
Ralph Little 30eb01674a saned: new header stdint.h required for SIZE_MAX. 2023-02-20 15:39:57 -08:00
Ralph Little 9d26edac5f sanei_wire: updated diag for size_t variables using %zu format
(u_long) casts sometimes generate incorrect values in diag.
%zu is pretty standard now so we should be using it for size_t args.
2023-02-20 15:25:46 -08:00
Ralph Little b5058ff5ed saned: increase default buffer size for backend comms to 1MB
Also added an option to change it.
2023-02-20 15:25:21 -08:00
Ralph Little 8ac72560ff Merge branch '646-scanimage-hangs-on-exit' into 'master'
Resolve "scanimage hangs on exit"

See merge request sane-project/backends!783
2023-02-20 20:31:18 +00: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
Ralph Little 1f22e0dadd avision: added ADF and lightbox installed options.
Also sorted out the options texts to make them translatable.
2023-02-19 15:08:59 -08:00
Ralph Little 9387e9b35c avision: match also USB vendor and product ids for USB devices.
We always know the USB vendor and product ids for USB devices and
there are multiple entries with the same SCSI details shared by
different USB models. We should pick the correct one at least to
get the right model name to the user.
2023-02-18 13:41:02 -08:00
Ralph Little d88920ffb6 avision: correction for ADF presence detect.
Scanjet 8300 has an ADF port but does not necessarily have an ADF
fitted. In the test case, there is a lightbox instead. Trying to
reset/probe for an ADF that isn't there is futile.
2023-02-18 13:02:29 -08:00
Ralph Little 2e5fffb036 Merge branch 'B-promptReturn' into 'master'
Scanimage Batch Prompt: Discard Extraneous Input Properly

See merge request sane-project/backends!781
2023-02-13 21:26:35 +00:00
Ralph Little 660547e33c Merge branch 'master' into 'B-promptReturn'
# Conflicts:
#   frontend/scanimage.c
2023-02-13 21:15:18 +00:00
Ralph Little bd9771939f Merge branch '634-llvm-15-on-freebsd-support-for-sane-backends-1-1-1_v2' into 'master'
Resolve "LLVM 15 on FreeBSD support for sane-backends 1.1.1"

Closes #634

See merge request sane-project/backends!782
2023-02-13 20:45:38 +00:00
Ralph Little 373dceaa36 scanimage: more generic fix for selecting a common basename function.
We have been specially including libgen.h to get a version in other
platforms such as macOS and FreeBSD. However, it is dangerous to
make assumptions about which version of basename that we will get.
So this change reverts to asking for the version that modifies the
argument and creates a copy of the arg that we *can* modify.
2023-02-13 12:32:35 -08:00