a786d013e1
New with 1.0.25, released 2015-10-03: * New backends: epsonds (Epson DS, PX and WF series), pieusb (PIE and Reflecta film/slide scanners). * Support for JPG and PNG output format in scanimage. * Significant enhancements to avision, canon_dr, epjitsu, fujitsu, genesys, kodakaio and pixma backends. * Minor updates, bugfixes or scanners added in several backends. * 300 new scanner models supported. * Workaround for USB3 problems in Linux kernel. * Added code for IR functionality. * Documentation and translation updates. * Bugfixes (threading, networking, udev rules).
24 lines
751 B
Text
24 lines
751 B
Text
$NetBSD: patch-ai,v 1.3 2015/10/25 10:39:13 wiz Exp $
|
|
|
|
Avoid duplicate symbols in libepson and libepson2.
|
|
|
|
--- backend/epson_usb.c.orig 2015-09-20 11:55:39.000000000 +0000
|
|
+++ backend/epson_usb.c
|
|
@@ -4,7 +4,7 @@
|
|
|
|
/* generated with epson2usb.pl doc/descriptions/epson.desc */
|
|
|
|
-SANE_Word sanei_epson_usb_product_ids[] = {
|
|
+static SANE_Word sanei_epson_usb_product_ids[] = {
|
|
0x101, /* Perfection 636U */
|
|
0x103, /* Perfection 610 */
|
|
0x104, /* Perfection 1200U, Perfection 1200Photo */
|
|
@@ -45,7 +45,7 @@ SANE_Word sanei_epson_usb_product_ids[]
|
|
in the config file as "usb <vendor> <product>" */
|
|
};
|
|
|
|
-int
|
|
+static int
|
|
sanei_epson_getNumberOfUSBProductIds (void)
|
|
{
|
|
return sizeof (sanei_epson_usb_product_ids) / sizeof (SANE_Word);
|