Merge branch 'release/1.0.31' into 'master'

Release/1.0.31

See merge request sane-project/backends!514

NEWS

@@ -1,16 +1,52 @@
 <!-- -*- Mode: markdown -*- -->
 
-## New with the next release
+## New with 1.0.31 (released 2020-08-23)
 
 ### Backends
 
-- adds an `canon_lide70` backend
+- adds the `canon_lide70` backend
+- `avision`: adds support for the KODAK i1120, fixes thread
+  cancellation issues, disables exposure option for non-filmscanners
+- `canon_dr`: improves error reporting
+- `dmc`: fixes compiler warnings on the scan area options
+- `epsonds`: rewrites the network I/O following changes made to the
+  `epson2` backend in 1.0.30 to fix security issues.  Network support
+  is still unsupported.
+- `escl`: adds ADF support, fixes many minor issues and improves error
+  handling.  Now also supports devices behind a proxy (needs explicit
+  configuration).
+- `fujitsu`: adds support for the fi-800R and a card scanning slot,
+  fixes a bug when reading hardware sensors on the first invocation.
+  Adds USB IDs for fi-7800 and fi-7900.
+- `genesys`: adds support for the Canon 5600F, Canon LiDE 90, Plustek
+  OpticFilm 7200 and 7200 (v2), 7400, 7600i, 8100 and 8200i.  Fixes
+  several issues with the Canon 8600F.  Adds 4800dpi support for the
+  Canon LiDE 210 and fixes 3200dpi flatbed support on the Canon 8400F.
+  Adds an option to fill dark calibration with a constant.  Adds
+  transparency support for gl847 chipset based devices.  Fixes CIS
+  scanner support for gl842 chipset based devices.  Removes lineart
+  and image enhancement emulation support.
+- `gphoto`: supports the PLANon DocuPen RC800 (with a recent enough
+  version of `gphoto2`)
+- `gt68xx`: modifies scan cancellation behaviour
+- `hp5400`: adds button support, fixes a scan cancellation crash issue
+- `pixma`: add supports for the i-SENSYS MF440 Series and untested
+  support for the PIXMMA G7000 Series and GM4000 Series as well as the
+  i-SENSYS MF720 Series.
+- `plustek`: fixes a potential buffer overrun
+- `test`: adds gamma options
 
 ### Documentation
 
 - removes the SANE Standard.  This is now maintained as a separate
   project at https://gitlab.com/sane-project/standard.  HTML and PDF
   versions can be found at https://sane-project.gitlab.io/standard/.
+- adds and updates information for multiple supported and unsupported
+  devices
+- translation updates for British English, French, German, Italian and
+  Ukranian
+- `scanimage`: documents the JPEG compression level
+- minor improvements documenting build requirements
 
 ### Build
 
@@ -19,6 +55,17 @@
   defaults to enabling if possible.  If the option is given and the
   required support is not available, `configure` will exit with an
   error.
+- improves checking for libjpeg version dependent requirements
+- has been made reproducable (#228)
+- fixes build issues on MinGW
+
+### Miscellaneous
+
+- fixes OpenBSD hotplugd scriptlets (!375)
+- fixes support for unconfigured USB scanners on MacOS (#38)
+- various fixes and improvements in the USB record/replay support
+- fixes a file descriptor validation test in sanei_pio
+- adds missing include in sanei_usb
 
 
 ## New with 1.0.30 (released 2020-05-17)

backend/avision.c

@@ -6747,7 +6747,7 @@ do_eof (Avision_Scanner *s)
 static SANE_Status
 do_cancel (Avision_Scanner* s)
 {
-  int status, release_type = 0;
+  int status;
 
   DBG (3, "do_cancel:\n");
 
@@ -6770,11 +6770,11 @@ do_cancel (Avision_Scanner* s)
     sanei_thread_invalidate (s->reader_pid);
   }
 
-  if (s->hw->hw->feature_type & AV_FASTFEED_ON_CANCEL)
-    release_type = 1;
-  status = release_unit (s, release_type);
-  if (status != SANE_STATUS_GOOD)
-    DBG (1, "do_cancel: release_unit failed\n");
+  if (s->hw->hw->feature_type & AV_FASTFEED_ON_CANCEL) {
+    status = release_unit (s, 1);
+    if (status != SANE_STATUS_GOOD)
+      DBG (1, "do_cancel: release_unit failed\n");
+  }
 
   return SANE_STATUS_CANCELLED;
 }

doc/descriptions/pixma.desc

@@ -31,8 +31,8 @@
 :model "PIXMA E410 Series"
 :interface "USB"
 :usbid "0x04a9" "0x181e"
-:status :untested
-:comment "Testers needed!"
+:status :complete
+:comment "All resolutions supported (up to 600DPI)."
 
 :model "PIXMA E460 Series"
 :interface "USB Ethernet"

doc/descriptions/snapscan.desc

@@ -311,38 +311,43 @@
 :interface "USB"
 :usbid "0x04b8" "0x0114"
 :status :good
+:comment "Requires firmware tail_058.bin."
 
 :model "Perfection 1270"
 :interface "USB"
 :usbid "0x04b8" "0x0120"
 :status :good
+:comment "Requires firmware esfw3e.bin."
 
 :model "Perfection 1670"
 :interface "USB"
 :usbid "0x04b8" "0x011f"
 :status :good
+:comment "Requires firmware esfw30.bin."
 
-:model "Perfection 2480"
+:model "Perfection 2480 PHOTO"
 :interface "USB"
 :usbid "0x04b8" "0x0121"
 :status :good
+:comment "Requires firmware esfw41.bin."
 
-:model "Perfection 2580"
+:model "Perfection 2580 PHOTO"
 :interface "USB"
 :status :basic
 :usbid "0x04b8" "0x0121"
-:comment "Film scanning unit unsupported"
+:comment "Requires firmware esfw41.bin, film scanning unit unsupported."
 
-:model "Perfection 3490"
+:model "Perfection 3490 PHOTO"
 :interface "USB"
 :usbid "0x04b8" "0x0122"
 :status :good
+:comment "Requires firmware esfw51.bin."
 
-:model "Perfection 3590"
+:model "Perfection 3590 PHOTO"
 :interface "USB"
 :usbid "0x04b8" "0x0122"
 :status :basic
-:comment "Film scanning unit unsupported"
+:comment "Requires firmware esfw52.bin, film scanning unit unsupported."
 
 :model "Stylus CX-1500"
 :interface "USB"

doc/sane-pixma.man

@@ -15,7 +15,7 @@ over IPv4 as well as IPv6 (MFNP over IPv6 is untested).
 Currently, the following models work with this backend:
 .PP
 .RS
-PIXMA E510
+PIXMA E410, E510
 .br
 PIXMA G2000, G2010, G2100, G4000
 .br
@@ -103,7 +103,7 @@ in the backend so that they get recognized and activated.
 Feedback in the sane\-devel mailing list welcome.
 .PP
 .RS
-PIXMA E400, E410, E460, E470, E480, E500, E560, E600, E610
+PIXMA E400, E460, E470, E480, E500, E560, E600, E610
 .br
 PIXMA E3100, E3300, E4200
 .br

po/en_GB.po

@@ -4,9 +4,9 @@
 # Andrew Coles <andrew_coles@yahoo.co.uk>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: sane-backends 1.0.29\n"
+"Project-Id-Version: sane-backends 1.0.31\n"
 "Report-Msgid-Bugs-To: sane-devel@alioth-lists.debian.net\n"
-"POT-Creation-Date: 2020-07-26 10:25-0700\n"
+"POT-Creation-Date: 2020-08-02 12:33+0000\n"
 "PO-Revision-Date: 2020-07-26 10:30-0700\n"
 "Last-Translator: Ralph Little <littlesincanada@yahoo.co.uk>\n"
 "Language-Team: British English <kde-i18n-doc@kde.org>\n"

sanei/sanei_usb.c

@@ -218,6 +218,14 @@ static int libusb_timeout = 30 * 1000;	/* 30 seconds */
 static libusb_context *sanei_usb_ctx;
 #endif /* HAVE_LIBUSB */
 
+#if defined (__APPLE__)
+/* macOS won't configure several USB scanners (i.e. ScanSnap 300M) because their
+ * descriptors are vendor specific.  As a result the device will get configured
+ * later during sanei_usb_open making it safe to ignore the configuration check
+ * on these platforms. */
+#define SANEI_ALLOW_UNCONFIGURED_DEVICES
+#endif
+
 #if defined (__linux__)
 /* From /usr/src/linux/driver/usb/scanner.h */
 #define SCANNER_IOCTL_VENDOR _IOR('U', 0x20, int)
@@ -1862,11 +1870,7 @@ static void libusb_scan_devices(void)
 	  continue;
 	}
 
-/* macOS won't configure several USB scanners (i.e. ScanSnap 300M) because their
- * descriptors are vendor specific.  As a result the device will get configured
- * later during sanei_usb_open making it safe to ignore the configuration check
- * here on these platforms. */
-#if !defined(__APPLE__)
+#if !defined(SANEI_ALLOW_UNCONFIGURED_DEVICES)
       if (config == 0)
 	{
 	  DBG (1,
@@ -2623,11 +2627,7 @@ sanei_usb_open (SANE_String_Const devname, SANE_Int * dn)
 	  return SANE_STATUS_INVAL;
 	}
 
-/* macOS won't configure several USB scanners (i.e. ScanSnap 300M) because their
- * descriptors are vendor specific.  As a result the device will get configured
- * later during sanei_usb_open making it safe to ignore the configuration check
- * here on these platforms. */
-#if !defined(__APPLE__)
+#if !defined(SANEI_ALLOW_UNCONFIGURED_DEVICES)
       if (config == 0)
 	{
 	  DBG (1, "sanei_usb_open: device `%s' not configured?\n", devname);