Commit Graph

  • 09aed67df6 Merge branch 'escl-check-poppler-glib' into 'master' Ordissimo 2021-01-14 12:46:22 +00:00
  • 85f160c2f2 Fix check poppler-glib, (see issue #422). thierry1970 2021-01-14 13:20:17 +01:00
  • 92953cb0a1 Fix issue with '--enable-locking': Do not require sub-directory for locking. Gerhard Jaeger 2021-01-07 12:34:34 +01:00
  • ba8a3d874c Merge branch 'escl-fix-orders' into 'master' Ordissimo 2021-01-04 19:07:25 +00:00
  • 7ea34eee5c The order of the parameters does not change the result. Thierry HUCHARD 2021-01-04 19:47:08 +01:00
  • 341769d925 Merge branch 'escl-devices-list-properties' into 'master' Ordissimo 2021-01-04 18:40:43 +00:00
  • 8e4b21ea4f Merge branch '409-autoconf-2.70-causes-resulting-configure-file-to-fail' into 'master' Olaf Meeuwissen 2021-01-01 07:19:07 +00:00
  • 952023abd4 Drop use of obsoleted autoconf AC_HEADER_STDC macro. Fixes #409 Olaf Meeuwissen 2021-01-01 15:53:11 +09:00
  • d26cab411d Get device informations with avahi. Thierry HUCHARD 2020-12-29 11:33:55 +01:00
  • 1c79c5e90b Merge branch 'fix_crash' into 'master' Povilas Kanapickas 2020-12-26 22:19:45 +00:00
  • 738d27b160 Fix crash in scanimage when must_buffer is true James Ring 2020-12-26 13:55:54 -08:00
  • 40c762ef98 Merge branch 'port' into 'master' Povilas Kanapickas 2020-12-26 17:26:42 +00:00
  • 45adc2a907 allow saned to listen on specified port, or an ephemeral port James Ring 2020-12-05 09:16:18 -08:00
  • 9461ea956e Merge branch 'sanei-usb-configure-record-open-clear' into 'master' Povilas Kanapickas 2020-12-26 14:16:19 +00:00
  • bee114a4ef sanei_usb: Allow backends to modify when USB recording is cleared Povilas Kanapickas 2020-04-09 00:47:41 +03:00
  • f26d58f596 Merge branch 'pixma-add-models' into 'master' Povilas Kanapickas 2020-12-26 13:56:49 +00:00
  • b04caac790 Merge branch 'fix_leak' into 'master' Povilas Kanapickas 2020-12-26 13:41:52 +00:00
  • fb77e35975 pixma: Add models Thierry HUCHARD 2020-12-15 07:21:21 +01:00
  • 469d092dc5 Merge branch '395-add-epson-et-2600-support' into 'master' Olaf Meeuwissen 2020-12-26 05:17:54 +00:00
  • 7f74f3e6f6 epson2.desc: Fix formatting error Olaf Meeuwissen 2020-12-26 13:44:42 +09:00
  • 320532f210 utsushi.desc: Sync with upstream Olaf Meeuwissen 2020-12-26 12:04:11 +09:00
  • e13502d730 epson2: Add ET-2600 as supported Olaf Meeuwissen 2020-12-26 12:03:15 +09:00
  • 0826452980 Merge branch 'escl-fix-messages-and-variable' into 'master' Ordissimo 2020-12-22 15:58:19 +00:00
  • 0cf909e200 Fix messages and variable. thierry1970 2020-12-22 16:14:44 +01:00
  • 07856ff69c Merge branch 'escl-fix-documentformat' into 'master' Ordissimo 2020-12-21 20:54:27 +00:00
  • a6a69e7d7e Choose the format according to availability and options. Ordissimo 2020-12-21 20:17:03 +00:00
  • 8178ab2727 Merge branch 'remotes/origin/escl-fix-adv-options' into 'master' Ordissimo 2020-12-21 19:42:45 +00:00
  • 32e6d1d739 refactoring options code thierry1970 2020-12-21 18:16:31 +01:00
  • 82627f7a00 Merge branch '402-hp-scanjet-5370c-produces-double-height-image-and-cannot-preview' into 'master' Ralph Little 2020-12-20 03:35:57 +00:00
  • 9bedfa49b4 avision: added increment of the line variable in non-interpolated case Ralph Little 2020-12-19 17:28:36 -08:00
  • 4be3850b70 avision: added some brackets to silence warnings about precedence ambiguity Ralph Little 2020-12-19 17:27:23 -08:00
  • dafeee20db Merge branch 'escl-fix-segfault' into 'master' Ordissimo 2020-12-19 21:22:20 +00:00
  • b1ed2ad03d Fix a crash when asking for the list of options: scanimage -A Thierry HUCHARD 2020-12-19 22:04:30 +01:00
  • cf07b1e6ea Merge branch 'update-external-model-scangearmp2' into 'master' Ordissimo 2020-12-18 08:16:26 +00:00
  • a66a14d177 Add model version scangearmp2 4.0 and 4.10. thierry1970 2020-12-18 08:48:27 +01:00
  • 96d7736c62 Merge branch 'escl-device-crash-without-flatbed' into 'master' Olaf Meeuwissen 2020-12-17 10:57:02 +00:00
  • 972fd8dc1f Add model HP Deskjet 3760. thierry1970 2020-12-16 13:50:24 +01:00
  • 6bb00f98f3 Fix : Fixes the crash of devices that do not have a tray, discovered on the HP Deskjet 3760 device. thierry1970 2020-12-16 13:41:31 +01:00
  • b63e47adbc fix small memory leak in scanimage option processing James Ring 2020-12-07 14:55:32 -08:00
  • 6fdd15753f Merge branch 'origin/pixma_bug_fixes' into 'master' Povilas Kanapickas 2020-12-07 13:21:30 +00:00
  • 1d30e287bd Merge branch 'master' into 'master' Olaf Meeuwissen 2020-11-30 11:07:40 +00:00
  • 27841524cf canon_dr backend v60 m. allan noah 2020-11-28 18:48:50 -05:00
  • 032b3c63e2 final Revision CVS keyword removal Mikolaj Kucharski 2020-11-29 09:19:26 +00:00
  • f0d984e77b drop more tricky Revision CVS keyword Mikolaj Kucharski 2020-11-29 09:17:33 +00:00
  • cfd93b3b75 more CVS keywords removed, Log and Revision Mikolaj Kucharski 2020-11-29 09:06:48 +00:00
  • dca521c9e1 pixma: avoid structure copy on every read by using cinfo address. Ralph Little 2020-11-28 19:34:52 -08:00
  • 49253c39c0 pixma: assignment must be inside the loop to be effective. Ralph Little 2020-11-28 19:29:06 -08:00
  • d5bccfde1a pixma: MX490 series returns JPEG from ADF scans. Ralph Little 2020-11-28 19:19:26 -08:00
  • 1f09b625bd drop CVS keywords Mikolaj Kucharski 2020-11-28 10:01:56 +00:00
  • d447af3692 utsushi.desc: Sync with upstream Olaf Meeuwissen 2020-11-25 20:05:28 +09:00
  • 8cb5d83738 Merge branch 'master' into 'master' Olaf Meeuwissen 2020-11-23 01:39:29 +00:00
  • 6fff457765 Fixed Artec AstraSlim SE configuration. RICCIARDI-Adrien 2020-11-21 11:58:17 +01:00
  • dced7accd0 Merge branch 'add-new-modele' into 'master' Ordissimo 2020-11-08 19:31:12 +00:00
  • 90fbc704cb Add model Canon TS-5351 Thierry HUCHARD 2020-11-08 20:16:05 +01:00
  • df4a829521 Revert "Add model Canon wqTS-5351." Thierry HUCHARD 2020-11-08 20:11:50 +01:00
  • 42af1db691 Add model Canon wqTS-5351. Thierry HUCHARD 2020-11-08 20:02:55 +01:00
  • 10a6bf065a Merge branch 'pixma-calibrate' into 'master' Povilas Kanapickas 2020-11-02 22:07:21 +00:00
  • a56029db2d pixma: Add --calibrate option Iskren Chernev 2020-11-02 21:44:08 +02:00
  • 0eb4523c23 Trigger udev rules parsing on all kernel events except of "remove" - fix tests - udev.ref Marcin Kocur 2020-10-28 18:09:33 +00:00
  • a6466edb84 Trigger udev rules parsing on all kernel events except of "remove" - fix test udev+hwdb Marcin Kocur 2020-10-28 17:52:59 +00:00
  • 8333bd8ca8 Trigger udev rules parsing on all kernel events except of "remove" - fix tests. Marcin Kocur 2020-10-28 17:29:19 +00:00
  • e440ee7efe Trigger udev rules parsing on all kernel events except of "remove". Marcin Kocur 2020-10-26 21:15:29 +00:00
  • cbf9b3ec39 Merge branch 'leak_fix' into 'master' Olaf Meeuwissen 2020-10-20 09:01:15 +00:00
  • 224a920219 test: do not leak initial values of string options Fletcher Woodruff 2020-10-12 11:20:49 -06:00
  • fc31e1e906 test: free memory used for string options Fletcher Woodruff 2020-10-12 09:14:35 -06:00
  • 2ccd27f6f1 Merge branch '362-lexmark-mc3200-mc3224adwe-network-scanner-crash-due-to-null-constraints' into 'master' Ralph Little 2020-10-18 17:36:24 +00:00
  • f9a19856bb scanimage: check also for negative word_list length which is nonsensical. Ralph Little 2020-10-18 09:51:35 -07:00
  • f126e5458a Merge branch 'brightness_on_12000xl' into 'master' Olaf Meeuwissen 2020-10-18 01:47:29 +00:00
  • bc5f27d94e Merge branch '364-pixma-mx320-cannot-do-1200dpi-in-adf' into 'master' Povilas Kanapickas 2020-10-15 21:20:20 +00:00
  • 5d6ee52d00 pixma: MX320 machine will not perform 1200 dpi scan from the ADF Ralph Little 2020-10-13 09:03:45 -07:00
  • 4c2d2c16a5 dll: fix memory leak in load Fletcher Woodruff 2020-10-12 16:22:40 -06:00
  • 7284249487 Merge branch 'canoscan_n650u_plustek_usb_workaround' into 'master' Gerhard Jäger 2020-10-12 09:14:04 +00:00
  • 78a387a1a1 Merge branch '358-gt68xx-1-0-31-breaks-mustek-1248ub-after-first-scan' into 'master' Ralph Little 2020-10-10 19:22:41 +00:00
  • 690617675a gt68xx: added flag to fix stop scan bug Ralph Little 2020-10-10 12:01:33 -07:00
  • 4dad88f3df Merge branch 'escl-avahi-resolve' into 'master' Ordissimo 2020-10-10 16:51:52 +00:00
  • 9f71a4be30 Fixes device discovery Thierry HUCHARD 2020-10-10 18:01:55 +02:00
  • cec7efadc2 plustek-usbhw.c: Add 1ms sleep before writing to register 0x59 Zdenek Dohnal 2020-10-09 08:55:41 +02:00
  • 17df91c48e desc and news lide 600 pimvantend 2020-10-07 15:06:07 +02:00
  • c200485738 scanimage: added checks for null constraints. Ralph Little 2020-10-06 20:16:13 -07:00
  • e57677bfcb gt68xx: Added temporary fix to avoid stop scan during cancel. Ralph Little 2020-10-03 10:38:50 -07:00
  • 7118771a9a Merge branch 'avision_add_av186plus_av188_support' into 'master' Olaf Meeuwissen 2020-09-29 09:38:15 +00:00
  • b5d6a45d97 add ID information for Avision AV186+ and AV188 sheetfed USB scanners Nikolai Kostrigin 2020-06-25 18:13:41 +03:00
  • d17519585c Merge branch 'epson2/rework_focus' into 'master' Olaf Meeuwissen 2020-09-28 09:16:31 +00:00
  • 60edc2c9d6 Merge branch 'esci_set_focus_retval' into 'master' Olaf Meeuwissen 2020-09-27 08:01:36 +00:00
  • 7fa14121eb epson2: add autofocus Wolfram Sang 2020-09-26 13:22:57 +02:00
  • 8c2f5b7afa epson2: implement full range manual focus settings Wolfram Sang 2020-09-19 11:24:37 +02:00
  • fedb9e1930 saneopts: add entries for focus/autofocus Wolfram Sang 2020-09-19 10:13:43 +02:00
  • 9d64a352b3 epson2: enable focus for all scanner types Wolfram Sang 2020-09-26 11:32:49 +02:00
  • 760a66465f Merge branch 'zdohnal/esci_set_focus_retval' into focus_on_12000XL Wolfram Sang 2020-09-26 11:47:57 +02:00
  • c64e410434 pixma: backend version 0.28.6 Rolf Bensch 2020-09-25 16:40:07 +02:00
  • b7b599b31c pixma: add comment for last merge Rolf Bensch 2020-09-25 16:38:38 +02:00
  • 1a3b953e25 Merge branch 'patch-1' into 'master' Rolf Bensch 2020-09-25 14:35:40 +00:00
  • 55564acaee introduce Povilas Kanapickas as pixma maintainer Rolf Bensch 2020-09-25 16:20:58 +02:00
  • 0530675de8 canon_dr v59: fine calibration updates m. allan noah 2020-08-11 19:28:11 -04:00
  • ed4aff9c84 fujitsu v137b: brightness/contrast improvements m. allan noah 2020-09-23 21:03:45 -04:00
  • f169b26283 fujitsu v137a: fix JPEG duplex memory corruption m. allan noah 2020-09-23 20:57:26 -04:00
  • e19fe5dd3a epson2: check for return value of e2_esc_cmd Zdenek Dohnal 2020-09-22 11:34:56 +02:00
  • 0ad2cd944c epson2: fix lower brightness limit for DS-G20000/12000XL Wolfram Sang 2020-09-18 20:37:40 +02:00
  • 8ffc9855f0 Merge branch 'escl-check-scan-options' into 'master' Ordissimo 2020-09-18 14:03:22 +00:00
  • 969c04bd93 Check options scan and fix xml. thierry1970 2020-09-18 15:47:45 +02:00