From f0f187f995c45226e95dfbeb3231a316f76e11ea Mon Sep 17 00:00:00 2001 From: Olaf Meeuwissen Date: Sat, 27 May 2017 15:37:14 +0900 Subject: [PATCH] .editorconfig: trim trailing blank lines --- ChangeLog | 1 - ChangeLogs/ChangeLog-1.0.1 | 1 - ChangeLogs/ChangeLog-1.0.2 | 1 - ChangeLogs/ChangeLog-1.0.3 | 1 - ChangeLogs/ChangeLog-1.0.4 | 1 - ChangeLogs/ChangeLog-1.0.5 | 1 - README.aix | 1 - README.os2 | 1 - backend/agfafocus.conf.in | 1 - backend/artec.conf.in | 1 - backend/artec_eplus48u.conf.in | 1 - backend/avision.conf.in | 1 - backend/bh.c | 1 - backend/canon_dr.c | 1 - backend/canon_pp.h | 1 - backend/dc25.h | 2 -- backend/dell1600n_net.conf.in | 2 -- backend/epjitsu-cmd.h | 1 - backend/epjitsu.c | 1 - backend/epjitsu.conf.in | 1 - backend/epson2.conf.in | 1 - backend/epsonds-cmd.h | 1 - backend/epsonds-io.c | 2 -- backend/epsonds-io.h | 1 - backend/epsonds-jpeg.c | 2 -- backend/epsonds-ops.c | 2 -- backend/epsonds-ops.h | 1 - backend/fujitsu.c | 1 - backend/fujitsu.conf.in | 1 - backend/hp-device.c | 1 - backend/hp3900.conf.in | 1 - backend/hp5400.c | 2 -- backend/hp5400_debug.c | 2 -- backend/hp5400_sanei.c | 1 - backend/hpljm1005.c | 1 - backend/kodakaio.conf.in | 1 - backend/leo.conf.in | 1 - backend/magicolor.conf.in | 1 - backend/microtek.h | 1 - backend/mustek_usb.conf.in | 1 - backend/pixma_bjnp_private.h | 1 - backend/pixma_sane_options.c | 1 - backend/pixma_sane_options.h | 1 - backend/scripts/pixma_gen_options.py | 1 - backend/sm3600-color.c | 1 - backend/sm3600-gray.c | 1 - backend/sm3600-homerun.c | 1 - backend/sm3600-scanusb.c | 1 - backend/snapscan-usb.c | 1 - backend/tamarack.c | 1 - backend/tamarack.conf.in | 1 - backend/umax-scanner.c | 1 - backend/umax-scanner.h | 1 - backend/umax-uc630.c | 1 - backend/umax-uc840.c | 1 - backend/umax-ug630.c | 1 - backend/umax-ug80.c | 1 - backend/umax-usb.c | 4 ---- backend/umax.conf.in | 1 - backend/xerox_mfp.conf.in | 1 - doc/canon/canon.changes | 3 --- doc/descriptions-external/brother-mfc4600.desc | 3 --- doc/descriptions-external/brother.desc | 1 - doc/descriptions-external/hp8200.desc | 1 - doc/descriptions-external/hpaio.desc | 1 - doc/descriptions-external/kodak-twain.desc | 1 - doc/descriptions-external/lhii.desc | 2 -- doc/descriptions-external/mustek_a3p1.desc | 4 ---- doc/descriptions-external/panamfs.desc | 1 - doc/descriptions-external/primax.desc | 4 ---- doc/descriptions-external/template.desc. | 2 -- doc/descriptions/avision.desc | 1 - doc/descriptions/bh.desc | 1 - doc/descriptions/canon.desc | 1 - doc/descriptions/canon_dr.desc | 1 - doc/descriptions/canon_pp.desc | 1 - doc/descriptions/cardscan.desc | 1 - doc/descriptions/dell1600n_net.desc | 1 - doc/descriptions/dmc.desc | 1 - doc/descriptions/epson.desc | 1 - doc/descriptions/epson2.desc | 1 - doc/descriptions/epsonds.desc | 1 - doc/descriptions/hp.desc | 1 - doc/descriptions/hp3500.desc | 3 --- doc/descriptions/hp3900.desc | 1 - doc/descriptions/hp5400.desc | 3 --- doc/descriptions/hp5590.desc | 1 - doc/descriptions/hpsj5s.desc | 1 - doc/descriptions/kodak.desc | 1 - doc/descriptions/kodakaio.desc | 3 --- doc/descriptions/kvs20xx.desc | 1 - doc/descriptions/kvs40xx.desc | 1 - doc/descriptions/leo.desc | 2 -- doc/descriptions/ma1509.desc | 1 - doc/descriptions/magicolor.desc | 1 - doc/descriptions/matsushita.desc | 3 --- doc/descriptions/microtek2.desc | 1 - doc/descriptions/niash.desc | 4 ---- doc/descriptions/plustek_pp.desc | 1 - doc/descriptions/ricoh.desc | 1 - doc/descriptions/sm3840.desc | 2 -- doc/descriptions/tamarack.desc | 1 - doc/descriptions/teco1.desc | 3 --- doc/descriptions/teco3.desc | 3 --- doc/descriptions/template.desc. | 2 -- doc/descriptions/test.desc | 1 - doc/descriptions/unsupported.desc | 1 - doc/descriptions/xerox_mfp.desc | 1 - doc/plustek/FAQ | 1 - doc/plustek/Makefile.kernel24 | 1 - doc/plustek/Plustek-PARPORT.txt | 3 --- doc/plustek/Plustek-USB-TODO.txt | 1 - doc/plustek/Plustek-USB.txt | 1 - doc/sane-agfafocus.man | 1 - doc/sane-artec_eplus48u.man | 1 - doc/sane-canon630u.man | 1 - doc/sane-canon_dr.man | 1 - doc/sane-canon_pp.man | 1 - doc/sane-cardscan.man | 1 - doc/sane-coolscan3.man | 1 - doc/sane-dc240.man | 1 - doc/sane-epjitsu.man | 1 - doc/sane-find-scanner.man | 1 - doc/sane-fujitsu.man | 1 - doc/sane-gphoto2.man | 1 - doc/sane-hp3500.man | 1 - doc/sane-hp3900.man | 1 - doc/sane-hp5400.man | 1 - doc/sane-kvs1025.man | 1 - doc/sane-kvs20xx.man | 1 - doc/sane-kvs40xx.man | 1 - doc/sane-microtek2.man | 5 ----- doc/sane-ricoh.man | 1 - doc/sane-sm3600.man | 1 - doc/sane-sm3840.man | 1 - doc/sane-stv680.man | 1 - doc/sane-xerox_mfp.man | 1 - doc/sceptre/s1200.txt | 2 -- doc/teco/teco2.txt | 1 - doc/teco/teco3.txt | 1 - doc/umax/negative-types.txt | 1 - doc/umax/sane-umax-mirage-doc.html | 1 - doc/umax/sane-umax-standard-options-doc.html | 1 - doc/umax/umax.BUGS | 1 - doc/umax/umax.CHANGES | 1 - doc/umax/umax.FAQ | 2 -- doc/umax/umax.TODO | 1 - frontend/tstbackend.c | 3 --- include/sane/sanei_lm983x.h | 1 - include/sane/sanei_pio.h | 1 - japi/Makefile.am | 1 - japi/SaneDevice.java | 2 -- japi/SaneOption.java | 1 - japi/SaneRange.java | 1 - ltmain.sh | 1 - po/POTFILES.in | 1 - sanei/sanei_DomainOS.h | 1 - sanei/sanei_magic.c | 1 - sanei/sanei_udp.c | 1 - testsuite/README | 2 -- testsuite/tools/data/hwdb.ref | 1 - testsuite/tools/data/testfile.desc | 1 - tools/README | 1 - tools/epson2usb.pl | 2 -- tools/hotplug/libusbscanner | 1 - tools/sane-config.in | 1 - 166 files changed, 219 deletions(-) diff --git a/ChangeLog b/ChangeLog index abbfe12f0..b1ad43e8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,4 +3,3 @@ messages. For the latest changes please refer to the output of `git log` or see: https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi?p=sane/sane-backends.git;a=log - diff --git a/ChangeLogs/ChangeLog-1.0.1 b/ChangeLogs/ChangeLog-1.0.1 index 62ebe8ab6..bcef80d55 100644 --- a/ChangeLogs/ChangeLog-1.0.1 +++ b/ChangeLogs/ChangeLog-1.0.1 @@ -446,4 +446,3 @@ s->val[foo].w not s->val[foo]. The latter compiles on gcc-2.7.2.3 without warning but causes an error on other compilers (e.g., egcs). - diff --git a/ChangeLogs/ChangeLog-1.0.2 b/ChangeLogs/ChangeLog-1.0.2 index b17f00db9..fbce098d8 100644 --- a/ChangeLogs/ChangeLog-1.0.2 +++ b/ChangeLogs/ChangeLog-1.0.2 @@ -560,4 +560,3 @@ * install-sh ltconfig ltmain.sh mkinstalldirs: Updated from automake 1.4 and libtool 1.3.3. - diff --git a/ChangeLogs/ChangeLog-1.0.3 b/ChangeLogs/ChangeLog-1.0.3 index 56e1e79dc..634c0cb4c 100644 --- a/ChangeLogs/ChangeLog-1.0.3 +++ b/ChangeLogs/ChangeLog-1.0.3 @@ -788,4 +788,3 @@ * Makefile.in (lsm) sane.lsm sane-1.0.1.lsm: New target to generate Linux Software Map (LSM) entry from template. Remove old file. - diff --git a/ChangeLogs/ChangeLog-1.0.4 b/ChangeLogs/ChangeLog-1.0.4 index b925f5e2a..924bc86fc 100644 --- a/ChangeLogs/ChangeLog-1.0.4 +++ b/ChangeLogs/ChangeLog-1.0.4 @@ -726,4 +726,3 @@ * backend/mustek_pp.c: fixed bug in config_ccd_1013 that prevents ASIC 1013 scanners from working - diff --git a/ChangeLogs/ChangeLog-1.0.5 b/ChangeLogs/ChangeLog-1.0.5 index a7fdabada..57ab7c956 100644 --- a/ChangeLogs/ChangeLog-1.0.5 +++ b/ChangeLogs/ChangeLog-1.0.5 @@ -1191,4 +1191,3 @@ (from ports@FreeBSD.org). * tools/Makefile.in: Use INSTALL_SCRIPT instead of INSTALL_PROGRAM for sane-config (from ports@FreeBSD.org). - diff --git a/README.aix b/README.aix index cfe50e418..f31abe4e9 100644 --- a/README.aix +++ b/README.aix @@ -10,4 +10,3 @@ Find this driver under: A version for AIX 4.3.3 and AIX 5.1 is also available. http://www.zago.net/aix/gsc-1.1.tar.gz - diff --git a/README.os2 b/README.os2 index eb42dcda9..ab6421dc6 100644 --- a/README.os2 +++ b/README.os2 @@ -258,4 +258,3 @@ History: =============================================================================== Yuri Dario http://www.quasarbbs.com/yuri - diff --git a/backend/agfafocus.conf.in b/backend/agfafocus.conf.in index 2648863d7..caa0783e0 100644 --- a/backend/agfafocus.conf.in +++ b/backend/agfafocus.conf.in @@ -1,2 +1 @@ /dev/scanner - diff --git a/backend/artec.conf.in b/backend/artec.conf.in index 371a17443..8b138805a 100644 --- a/backend/artec.conf.in +++ b/backend/artec.conf.in @@ -1,3 +1,2 @@ scsi ULTIMA /dev/scanner - diff --git a/backend/artec_eplus48u.conf.in b/backend/artec_eplus48u.conf.in index 0b20c6e55..03c9b5794 100644 --- a/backend/artec_eplus48u.conf.in +++ b/backend/artec_eplus48u.conf.in @@ -116,4 +116,3 @@ usb 0x05d8 0x4011 option artecFirmwareFile @DATADIR@/sane/artec_eplus48u/Artec48.usb option vendorString "Yakumo" option modelString "Scan50" - diff --git a/backend/avision.conf.in b/backend/avision.conf.in index 0862d5c22..33e2683a3 100644 --- a/backend/avision.conf.in +++ b/backend/avision.conf.in @@ -20,4 +20,3 @@ #scsi /dev/scanner # usb libusb:002:003 # usb 0x03f0 0x0701 - diff --git a/backend/bh.c b/backend/bh.c index 08ec5d8b8..60741cc85 100644 --- a/backend/bh.c +++ b/backend/bh.c @@ -3882,4 +3882,3 @@ sane_exit (void) if (devlist) free (devlist); } - diff --git a/backend/canon_dr.c b/backend/canon_dr.c index 18eb04e9c..b9105d042 100644 --- a/backend/canon_dr.c +++ b/backend/canon_dr.c @@ -7793,4 +7793,3 @@ load_lut (unsigned char * lut, DBG (10, "load_lut: finish\n"); return ret; } - diff --git a/backend/canon_pp.h b/backend/canon_pp.h index 57b66f385..2dfee9877 100644 --- a/backend/canon_pp.h +++ b/backend/canon_pp.h @@ -122,4 +122,3 @@ struct CANONP_Scanner_Struct #endif - diff --git a/backend/dc25.h b/backend/dc25.h index c198f20ae..b323835f7 100644 --- a/backend/dc25.h +++ b/backend/dc25.h @@ -266,5 +266,3 @@ static int zoom_x (struct pixmap *source, struct pixmap *dest); static int zoom_y (struct pixmap *source, struct pixmap *dest); static int comet_to_pixmap (unsigned char *, struct pixmap *); - - diff --git a/backend/dell1600n_net.conf.in b/backend/dell1600n_net.conf.in index 35d4eae4c..615549baa 100644 --- a/backend/dell1600n_net.conf.in +++ b/backend/dell1600n_net.conf.in @@ -10,5 +10,3 @@ #named_scanner: printer #named_scanner: 192.168.0.20 #named_scanner: myscanner.somewhere.else.org - - diff --git a/backend/epjitsu-cmd.h b/backend/epjitsu-cmd.h index 40a5c1abb..b71c7b008 100644 --- a/backend/epjitsu-cmd.h +++ b/backend/epjitsu-cmd.h @@ -720,4 +720,3 @@ static unsigned char setWindowScan_S1100_600_U[] = { 0x00, 0x80, 0x80, 0x01, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; - diff --git a/backend/epjitsu.c b/backend/epjitsu.c index f2323feba..bee4310ec 100644 --- a/backend/epjitsu.c +++ b/backend/epjitsu.c @@ -5018,4 +5018,3 @@ get_page_height(struct scanner *s) return s->page_height; } - diff --git a/backend/epjitsu.conf.in b/backend/epjitsu.conf.in index aa971ae4a..4dc9dfc59 100644 --- a/backend/epjitsu.conf.in +++ b/backend/epjitsu.conf.in @@ -80,4 +80,3 @@ usb 0x04c5 0x128d # Fujitsu S1100i firmware @DATADIR@/sane/epjitsu/1100i_0A00.nal usb 0x04c5 0x1447 - diff --git a/backend/epson2.conf.in b/backend/epson2.conf.in index 0637b2ed5..b41c86282 100644 --- a/backend/epson2.conf.in +++ b/backend/epson2.conf.in @@ -24,4 +24,3 @@ usb # # net 192.168.1.123 net autodiscovery - diff --git a/backend/epsonds-cmd.h b/backend/epsonds-cmd.h index 923e81115..973609a03 100644 --- a/backend/epsonds-cmd.h +++ b/backend/epsonds-cmd.h @@ -26,4 +26,3 @@ SANE_Status esci2_trdt(epsonds_scanner *s); SANE_Status esci2_img(struct epsonds_scanner *s, SANE_Int *length) ; #endif - diff --git a/backend/epsonds-io.c b/backend/epsonds-io.c index e153ad462..0baa1258b 100644 --- a/backend/epsonds-io.c +++ b/backend/epsonds-io.c @@ -186,5 +186,3 @@ SANE_Status eds_lock(epsonds_scanner *s) return status; } - - diff --git a/backend/epsonds-io.h b/backend/epsonds-io.h index 1bb67c637..b3b373586 100644 --- a/backend/epsonds-io.h +++ b/backend/epsonds-io.h @@ -30,4 +30,3 @@ SANE_Status eds_fsx(epsonds_scanner *s); SANE_Status eds_lock(epsonds_scanner *s); #endif - diff --git a/backend/epsonds-jpeg.c b/backend/epsonds-jpeg.c index 62e8bb57c..244f442ec 100644 --- a/backend/epsonds-jpeg.c +++ b/backend/epsonds-jpeg.c @@ -224,5 +224,3 @@ eds_jpeg_read(SANE_Handle handle, SANE_Byte *data, memcpy(data, src->linebuffer + src->linebuffer_index, *length); src->linebuffer_index += *length; } - - diff --git a/backend/epsonds-ops.c b/backend/epsonds-ops.c index f7a07fb26..8b9d11586 100644 --- a/backend/epsonds-ops.c +++ b/backend/epsonds-ops.c @@ -490,5 +490,3 @@ void eds_ring_flush(ring_buffer *ring) { eds_ring_skip(ring, ring->fill); } - - diff --git a/backend/epsonds-ops.h b/backend/epsonds-ops.h index ac5e71b0e..fe503d60d 100644 --- a/backend/epsonds-ops.h +++ b/backend/epsonds-ops.h @@ -38,4 +38,3 @@ extern SANE_Int eds_ring_read(ring_buffer *ring, SANE_Byte *buf, SANE_Int size); extern SANE_Int eds_ring_skip(ring_buffer *ring, SANE_Int size); extern SANE_Int eds_ring_avail(ring_buffer *ring); extern void eds_ring_flush(ring_buffer *ring) ; - diff --git a/backend/fujitsu.c b/backend/fujitsu.c index 7f0e8e65c..92ccf58d9 100644 --- a/backend/fujitsu.c +++ b/backend/fujitsu.c @@ -10178,4 +10178,3 @@ buffer_isblank(struct fujitsu *s, int side) DBG (10, "buffer_isblank: finished\n"); return status; } - diff --git a/backend/fujitsu.conf.in b/backend/fujitsu.conf.in index 5fa0003bb..88f52283f 100644 --- a/backend/fujitsu.conf.in +++ b/backend/fujitsu.conf.in @@ -267,4 +267,3 @@ usb 0x04c5 0x1521 #fi-7700S usb 0x04c5 0x1522 - diff --git a/backend/hp-device.c b/backend/hp-device.c index 6a50f8449..30e7a7994 100644 --- a/backend/hp-device.c +++ b/backend/hp-device.c @@ -471,4 +471,3 @@ sanei_hp_device_sanedevice (HpDevice this) { return &this->sanedev; } - diff --git a/backend/hp3900.conf.in b/backend/hp3900.conf.in index 2de00017c..0b0262b6f 100644 --- a/backend/hp3900.conf.in +++ b/backend/hp3900.conf.in @@ -28,4 +28,3 @@ usb 0x06dc 0x0020 # BenQ 5550 usb 0x04a5 0x2211 - diff --git a/backend/hp5400.c b/backend/hp5400.c index 033ec1fd3..58d01f844 100644 --- a/backend/hp5400.c +++ b/backend/hp5400.c @@ -81,5 +81,3 @@ #include "hp5400_internal.c" #include "hp5400_sane.c" #include "hp5400_sanei.c" - - diff --git a/backend/hp5400_debug.c b/backend/hp5400_debug.c index 0460e8b0b..ad2e4fbda 100644 --- a/backend/hp5400_debug.c +++ b/backend/hp5400_debug.c @@ -69,5 +69,3 @@ void hp5400_dbg_start() { #include "../include/sane/sanei_debug.h" #endif - - diff --git a/backend/hp5400_sanei.c b/backend/hp5400_sanei.c index 735cf0aa9..10c90ef34 100644 --- a/backend/hp5400_sanei.c +++ b/backend/hp5400_sanei.c @@ -384,4 +384,3 @@ hp5400_isOn (int iHandle) return 0; /* is off */ } #endif - diff --git a/backend/hpljm1005.c b/backend/hpljm1005.c index d065044db..d71324ace 100644 --- a/backend/hpljm1005.c +++ b/backend/hpljm1005.c @@ -1101,4 +1101,3 @@ sane_get_select_fd (SANE_Handle __sane_unused__ handle, { return SANE_STATUS_UNSUPPORTED; } - diff --git a/backend/kodakaio.conf.in b/backend/kodakaio.conf.in index 42ca42ce1..0241408df 100644 --- a/backend/kodakaio.conf.in +++ b/backend/kodakaio.conf.in @@ -77,4 +77,3 @@ usb # 0x4062, /* kodak Office Hero 6.1 */ # 0x4063, /* kodak Hero 7.1 */ # 0x4067, /* kodak Hero 9.1 */ - diff --git a/backend/leo.conf.in b/backend/leo.conf.in index ecd918c5e..8aeb9bfa5 100644 --- a/backend/leo.conf.in +++ b/backend/leo.conf.in @@ -5,4 +5,3 @@ scsi ACROSS * Scanner * * * 0 scsi "LEO" "LEOScan-S3" /dev/scanner - diff --git a/backend/magicolor.conf.in b/backend/magicolor.conf.in index 9c25994fa..a7b7a4f01 100644 --- a/backend/magicolor.conf.in +++ b/backend/magicolor.conf.in @@ -39,4 +39,3 @@ usb ### e.g.: # usb 0x132b 0x2098 - diff --git a/backend/microtek.h b/backend/microtek.h index 4adac6383..880dc3cf4 100644 --- a/backend/microtek.h +++ b/backend/microtek.h @@ -376,4 +376,3 @@ typedef struct Microtek_Scanner { #endif /* microtek_h */ - diff --git a/backend/mustek_usb.conf.in b/backend/mustek_usb.conf.in index c9b3ec405..fd58cdda7 100644 --- a/backend/mustek_usb.conf.in +++ b/backend/mustek_usb.conf.in @@ -36,4 +36,3 @@ usb 0x055f 0x0873 #option 1200cu #option 1200cu_plus #option 600cu - diff --git a/backend/pixma_bjnp_private.h b/backend/pixma_bjnp_private.h index f5e40d1f3..5d0b16b75 100644 --- a/backend/pixma_bjnp_private.h +++ b/backend/pixma_bjnp_private.h @@ -380,4 +380,3 @@ typedef struct device_s uint32_t status_key; /* key of last received status message */ #endif } bjnp_device_t; - diff --git a/backend/pixma_sane_options.c b/backend/pixma_sane_options.c index ad124b52b..6e6abfc1f 100644 --- a/backend/pixma_sane_options.c +++ b/backend/pixma_sane_options.c @@ -360,4 +360,3 @@ int build_option_descriptors(struct pixma_sane_t *ss) return 0; } - diff --git a/backend/pixma_sane_options.h b/backend/pixma_sane_options.h index 669a234ef..1472f1f48 100644 --- a/backend/pixma_sane_options.h +++ b/backend/pixma_sane_options.h @@ -49,4 +49,3 @@ typedef struct { struct pixma_sane_t; static int build_option_descriptors(struct pixma_sane_t *ss); - diff --git a/backend/scripts/pixma_gen_options.py b/backend/scripts/pixma_gen_options.py index 20f003767..c4c75e059 100755 --- a/backend/scripts/pixma_gen_options.py +++ b/backend/scripts/pixma_gen_options.py @@ -387,4 +387,3 @@ if (len(sys.argv) == 2) and (sys.argv[1] == 'h'): else: genConstraints(options) genBuildOptions(options) - diff --git a/backend/sm3600-color.c b/backend/sm3600-color.c index 4827311bd..2e42ada17 100644 --- a/backend/sm3600-color.c +++ b/backend/sm3600-color.c @@ -310,4 +310,3 @@ TState StartScanColor(TInstance *this) this->state.bScanning = true; return SANE_STATUS_GOOD; } - diff --git a/backend/sm3600-gray.c b/backend/sm3600-gray.c index e06a935b5..c5efe55a8 100644 --- a/backend/sm3600-gray.c +++ b/backend/sm3600-gray.c @@ -386,4 +386,3 @@ TState StartScanGray(TInstance *this) this->state.bScanning = true; return SANE_STATUS_GOOD; } - diff --git a/backend/sm3600-homerun.c b/backend/sm3600-homerun.c index 13c302882..b77a76eca 100644 --- a/backend/sm3600-homerun.c +++ b/backend/sm3600-homerun.c @@ -496,4 +496,3 @@ TState DoJog(TInstance *this, int nDistance) usleep(100); return WaitWhileBusy(this,1000); /* thanks Mattias Ellert */ } - diff --git a/backend/sm3600-scanusb.c b/backend/sm3600-scanusb.c index 7bdc90b44..7ae90d3a0 100644 --- a/backend/sm3600-scanusb.c +++ b/backend/sm3600-scanusb.c @@ -440,4 +440,3 @@ unsigned int RegRead(TInstance *this, int iRegister, int cch) SetError(this,SANE_STATUS_IO_ERROR,"error during register read"); return 0; } - diff --git a/backend/snapscan-usb.c b/backend/snapscan-usb.c index dc2142830..116f9db1f 100644 --- a/backend/snapscan-usb.c +++ b/backend/snapscan-usb.c @@ -653,4 +653,3 @@ static void snapscani_usb_shm_exit(void) * - Change copyright notice * * */ - diff --git a/backend/tamarack.c b/backend/tamarack.c index 8bf216905..619c34fac 100644 --- a/backend/tamarack.c +++ b/backend/tamarack.c @@ -1474,4 +1474,3 @@ sane_get_select_fd (SANE_Handle handle, SANE_Int *fd) *fd = s->pipe; return SANE_STATUS_GOOD; } - diff --git a/backend/tamarack.conf.in b/backend/tamarack.conf.in index 4c5ae7d67..52f24d00e 100644 --- a/backend/tamarack.conf.in +++ b/backend/tamarack.conf.in @@ -1,3 +1,2 @@ scsi TAMARACK /dev/scanner - diff --git a/backend/umax-scanner.c b/backend/umax-scanner.c index 8c1309c00..03bca0ebc 100644 --- a/backend/umax-scanner.c +++ b/backend/umax-scanner.c @@ -133,4 +133,3 @@ static char *scanner_str[] = }; /* ==================================================================== */ - diff --git a/backend/umax-scanner.h b/backend/umax-scanner.h index 953cadc0c..da10b7bff 100644 --- a/backend/umax-scanner.h +++ b/backend/umax-scanner.h @@ -58,4 +58,3 @@ typedef struct } inquiry_blk; #endif - diff --git a/backend/umax-uc630.c b/backend/umax-uc630.c index ccba3c1d3..440064c6e 100644 --- a/backend/umax-uc630.c +++ b/backend/umax-uc630.c @@ -192,4 +192,3 @@ static inquiry_blk inquiry_uc630 = { "UC630 ", UC630_INQUIRY, UC630_INQUIRY_LEN }; - diff --git a/backend/umax-uc840.c b/backend/umax-uc840.c index a0c8b9d77..0592c9501 100644 --- a/backend/umax-uc840.c +++ b/backend/umax-uc840.c @@ -192,4 +192,3 @@ static inquiry_blk inquiry_uc840 = { "UC840 ", UC840_INQUIRY, UC840_INQUIRY_LEN }; - diff --git a/backend/umax-ug630.c b/backend/umax-ug630.c index 20a570993..3a339fce4 100644 --- a/backend/umax-ug630.c +++ b/backend/umax-ug630.c @@ -192,4 +192,3 @@ static inquiry_blk inquiry_ug630 = { "UG630 ", UG630_INQUIRY, UG630_INQUIRY_LEN }; - diff --git a/backend/umax-ug80.c b/backend/umax-ug80.c index 91716b558..2e31d6185 100644 --- a/backend/umax-ug80.c +++ b/backend/umax-ug80.c @@ -195,4 +195,3 @@ static inquiry_blk inquiry_ug80 = { "UG80 ",UG80_INQUIRY,UG80_INQUIRY_LEN, }; - diff --git a/backend/umax-usb.c b/backend/umax-usb.c index 066fc004b..75f47396d 100644 --- a/backend/umax-usb.c +++ b/backend/umax-usb.c @@ -318,7 +318,3 @@ sanei_umaxusb_close (int fd) { sanei_usb_close(fd); } - - - - diff --git a/backend/umax.conf.in b/backend/umax.conf.in index 982bcfa49..06b2750f4 100644 --- a/backend/umax.conf.in +++ b/backend/umax.conf.in @@ -114,4 +114,3 @@ option connection-type 1 # usb device list option connection-type 2 /dev/usbscanner - diff --git a/backend/xerox_mfp.conf.in b/backend/xerox_mfp.conf.in index b17c7d756..813bb9602 100644 --- a/backend/xerox_mfp.conf.in +++ b/backend/xerox_mfp.conf.in @@ -245,4 +245,3 @@ usb 0x413c 0x5124 #Dell 1235cn (clone of Samsung CLX-3175) usb 0x413c 0x5310 - diff --git a/doc/canon/canon.changes b/doc/canon/canon.changes index 30eb6e996..f07c2255a 100644 --- a/doc/canon/canon.changes +++ b/doc/canon/canon.changes @@ -37,6 +37,3 @@ Version 990201: because it sets the resolution down first. * I have included a new directory containing scripts I find useful. - - - diff --git a/doc/descriptions-external/brother-mfc4600.desc b/doc/descriptions-external/brother-mfc4600.desc index f4e62a5f3..18bd3cbc4 100644 --- a/doc/descriptions-external/brother-mfc4600.desc +++ b/doc/descriptions-external/brother-mfc4600.desc @@ -32,6 +32,3 @@ :interface "USB" :usbid "0x04f9" "0x0111" :comment "Only USB version of this scanner is supported. Please report how well it works. See link." - - - diff --git a/doc/descriptions-external/brother.desc b/doc/descriptions-external/brother.desc index 00869623e..39c54daef 100644 --- a/doc/descriptions-external/brother.desc +++ b/doc/descriptions-external/brother.desc @@ -400,4 +400,3 @@ :interface "USB" :usbid "0x04f9" "0x011b" :comment "There is a report that this scanner does not work with the brother backend (I/O errors)" - diff --git a/doc/descriptions-external/hp8200.desc b/doc/descriptions-external/hp8200.desc index 2be0cf8e4..0a259be89 100644 --- a/doc/descriptions-external/hp8200.desc +++ b/doc/descriptions-external/hp8200.desc @@ -37,4 +37,3 @@ :usbid "0x03f0" "0x0b01" :url "http://ftp.cyberbaladeur.fr/82xxc%20Linux%20drivers.tar.gz" ; model's URL :comment "External backend. Binary-only Linux i386 code. Not supported by the SANE developers." - diff --git a/doc/descriptions-external/hpaio.desc b/doc/descriptions-external/hpaio.desc index 5b4cc5c4e..dab5a8c8e 100644 --- a/doc/descriptions-external/hpaio.desc +++ b/doc/descriptions-external/hpaio.desc @@ -2238,4 +2238,3 @@ :model "HP Color LaserJet 9500 Multifunction Printer" :status :good - diff --git a/doc/descriptions-external/kodak-twain.desc b/doc/descriptions-external/kodak-twain.desc index 2d75cd130..97455b24d 100644 --- a/doc/descriptions-external/kodak-twain.desc +++ b/doc/descriptions-external/kodak-twain.desc @@ -84,4 +84,3 @@ :interface "USB" :usbid "0x040a" "0x6011" :comment "Flatbed attachment for use with Kodak ADF scanner. Requires 12V power over usb cable. No report yet." - diff --git a/doc/descriptions-external/lhii.desc b/doc/descriptions-external/lhii.desc index 5ce099065..1877e0cae 100644 --- a/doc/descriptions-external/lhii.desc +++ b/doc/descriptions-external/lhii.desc @@ -42,5 +42,3 @@ ; and at the top-level. ; :status specifier is optional after :model and at the top-level - - diff --git a/doc/descriptions-external/mustek_a3p1.desc b/doc/descriptions-external/mustek_a3p1.desc index e38b87a8e..3808caebb 100644 --- a/doc/descriptions-external/mustek_a3p1.desc +++ b/doc/descriptions-external/mustek_a3p1.desc @@ -15,7 +15,3 @@ :status :minimal :usbid "0x055f" "0x0401" :comment "Reports about scanning problems. 1800 dpi seems to work if only small scan areas are selected." - - - - diff --git a/doc/descriptions-external/panamfs.desc b/doc/descriptions-external/panamfs.desc index a82da1ffa..5a34ceaa0 100644 --- a/doc/descriptions-external/panamfs.desc +++ b/doc/descriptions-external/panamfs.desc @@ -54,4 +54,3 @@ :model "KX-MC6000 series" :status :untested :comment "No report yet." - diff --git a/doc/descriptions-external/primax.desc b/doc/descriptions-external/primax.desc index 30633b0de..db245d4d2 100644 --- a/doc/descriptions-external/primax.desc +++ b/doc/descriptions-external/primax.desc @@ -40,7 +40,3 @@ :model "Colorpage-Vivid+" :interface "Parport" :status :untested - - - - diff --git a/doc/descriptions-external/template.desc. b/doc/descriptions-external/template.desc. index f7ca92463..a6b6babe3 100644 --- a/doc/descriptions-external/template.desc. +++ b/doc/descriptions-external/template.desc. @@ -77,5 +77,3 @@ ; and at the top-level. ; :status specifier is optional after :model and at the top-level - - diff --git a/doc/descriptions/avision.desc b/doc/descriptions/avision.desc index bff25f50c..661ba904a 100644 --- a/doc/descriptions/avision.desc +++ b/doc/descriptions/avision.desc @@ -854,4 +854,3 @@ :usbid "0x0482" "0x0335" :comment "1 pass, ??? dpi, A4" :status :untested - diff --git a/doc/descriptions/bh.desc b/doc/descriptions/bh.desc index cea51d738..08bf56502 100644 --- a/doc/descriptions/bh.desc +++ b/doc/descriptions/bh.desc @@ -53,4 +53,3 @@ :comment "Simplex Scanner (with ACE)" ; :comment and :url specifiers are optional after :mfg, :model, :desc, ; and at the top-level. - diff --git a/doc/descriptions/canon.desc b/doc/descriptions/canon.desc index c6db616df..2e54a0c6f 100644 --- a/doc/descriptions/canon.desc +++ b/doc/descriptions/canon.desc @@ -62,4 +62,3 @@ :interface "SCSI" :comment "Rebadged CanoScan 300" :status :good - diff --git a/doc/descriptions/canon_dr.desc b/doc/descriptions/canon_dr.desc index c4010642c..835d0bab6 100644 --- a/doc/descriptions/canon_dr.desc +++ b/doc/descriptions/canon_dr.desc @@ -398,4 +398,3 @@ :interface "USB" :usbid "0x1083" "0x1648" :status :untested - diff --git a/doc/descriptions/canon_pp.desc b/doc/descriptions/canon_pp.desc index 6a3613ae5..37e08f8e4 100644 --- a/doc/descriptions/canon_pp.desc +++ b/doc/descriptions/canon_pp.desc @@ -59,4 +59,3 @@ :interface "Parport (ECP)" :status :good :comment "Just an N640P in a different box?" - diff --git a/doc/descriptions/cardscan.desc b/doc/descriptions/cardscan.desc index 52c303331..bfa61e603 100644 --- a/doc/descriptions/cardscan.desc +++ b/doc/descriptions/cardscan.desc @@ -40,4 +40,3 @@ :usbid "0x0451" "0x6250" :status :good :comment "4 inch wide 8bit Gray or 24bit Color simplex card/receipt scanner" - diff --git a/doc/descriptions/dell1600n_net.desc b/doc/descriptions/dell1600n_net.desc index 6759564ce..0c31ea1f7 100644 --- a/doc/descriptions/dell1600n_net.desc +++ b/doc/descriptions/dell1600n_net.desc @@ -14,4 +14,3 @@ :usbid "0x413c" "0x5250" :status :basic :comment "Supports colour and monochrome scans over ethernet (USB not supported)" - diff --git a/doc/descriptions/dmc.desc b/doc/descriptions/dmc.desc index 348d7375d..08a01bb87 100644 --- a/doc/descriptions/dmc.desc +++ b/doc/descriptions/dmc.desc @@ -26,4 +26,3 @@ :status :good ; :comment and :url specifiers are optional after :mfg, :model, :desc, ; and at the top-level. - diff --git a/doc/descriptions/epson.desc b/doc/descriptions/epson.desc index 33ae57e86..fc901a784 100644 --- a/doc/descriptions/epson.desc +++ b/doc/descriptions/epson.desc @@ -350,4 +350,3 @@ :interface "USB IEEE-1394" :usbid "0x04b8" "0x012c" :status :good - diff --git a/doc/descriptions/epson2.desc b/doc/descriptions/epson2.desc index 772a77f16..809607467 100644 --- a/doc/descriptions/epson2.desc +++ b/doc/descriptions/epson2.desc @@ -3487,4 +3487,3 @@ :interface "USB" :usbid "0x04b8" "0x08a7" :status :good - diff --git a/doc/descriptions/epsonds.desc b/doc/descriptions/epsonds.desc index 99121d110..690dd25bb 100644 --- a/doc/descriptions/epsonds.desc +++ b/doc/descriptions/epsonds.desc @@ -94,4 +94,3 @@ :interface "USB" :usbid "0x04b8" "0x08cc" :status :untested - diff --git a/doc/descriptions/hp.desc b/doc/descriptions/hp.desc index 24f4f4ae6..8cf94af0a 100644 --- a/doc/descriptions/hp.desc +++ b/doc/descriptions/hp.desc @@ -124,4 +124,3 @@ ; :comment and :url specifiers are optional after :mfg, :model, :desc, ; and at the top-level. - diff --git a/doc/descriptions/hp3500.desc b/doc/descriptions/hp3500.desc index b67c01fc2..700580de3 100644 --- a/doc/descriptions/hp3500.desc +++ b/doc/descriptions/hp3500.desc @@ -42,6 +42,3 @@ ; :comment and :url specifiers are optional after :mfg, :model, :desc, ; and at the top-level. - - - diff --git a/doc/descriptions/hp3900.desc b/doc/descriptions/hp3900.desc index d1aa9a182..6c26b117f 100644 --- a/doc/descriptions/hp3900.desc +++ b/doc/descriptions/hp3900.desc @@ -79,4 +79,3 @@ :usbid "0x04a5" "0x2211" :status :minimal :comment "developing yet" - diff --git a/doc/descriptions/hp5400.desc b/doc/descriptions/hp5400.desc index 49d386f18..1b6cb2064 100644 --- a/doc/descriptions/hp5400.desc +++ b/doc/descriptions/hp5400.desc @@ -43,6 +43,3 @@ ; :comment and :url specifiers are optional after :mfg, :model, :desc, ; and at the top-level. - - - diff --git a/doc/descriptions/hp5590.desc b/doc/descriptions/hp5590.desc index 6bb9ff575..5062f75ab 100644 --- a/doc/descriptions/hp5590.desc +++ b/doc/descriptions/hp5590.desc @@ -52,4 +52,3 @@ :usbid "0x03f0" "0x1805" :status :complete :comment "Lineart/grayscale/color (24 bit), 100/200/300/600/1200/2400 DPI, flatbed/ADF/ADF duplex/TMA slides/TMA negatives" - diff --git a/doc/descriptions/hpsj5s.desc b/doc/descriptions/hpsj5s.desc index c4bc100e6..4aa4de94b 100644 --- a/doc/descriptions/hpsj5s.desc +++ b/doc/descriptions/hpsj5s.desc @@ -29,4 +29,3 @@ ; :comment and :url specifiers are optional after :mfg, :model, :desc, ; and at the top-level. - diff --git a/doc/descriptions/kodak.desc b/doc/descriptions/kodak.desc index bef862dbe..7fd21672c 100644 --- a/doc/descriptions/kodak.desc +++ b/doc/descriptions/kodak.desc @@ -187,4 +187,3 @@ :interface "SCSI" :status :untested :comment "Please test!" - diff --git a/doc/descriptions/kodakaio.desc b/doc/descriptions/kodakaio.desc index de081cb3e..c2e12c4ee 100644 --- a/doc/descriptions/kodakaio.desc +++ b/doc/descriptions/kodakaio.desc @@ -180,6 +180,3 @@ :usbid "0x040a" "0x4060" :status :untested :comment "Please test!" - - - diff --git a/doc/descriptions/kvs20xx.desc b/doc/descriptions/kvs20xx.desc index 35178e1dd..4463b8e5a 100644 --- a/doc/descriptions/kvs20xx.desc +++ b/doc/descriptions/kvs20xx.desc @@ -45,4 +45,3 @@ :interface "USB" :usbid "0x04da" "0x1009" :status :untested - diff --git a/doc/descriptions/kvs40xx.desc b/doc/descriptions/kvs40xx.desc index 8cc054f00..24684be76 100644 --- a/doc/descriptions/kvs40xx.desc +++ b/doc/descriptions/kvs40xx.desc @@ -32,4 +32,3 @@ :interface "USB" :usbid "0x04da" "0x100e" :status :untested - diff --git a/doc/descriptions/leo.desc b/doc/descriptions/leo.desc index 4f25fca3d..02a115636 100644 --- a/doc/descriptions/leo.desc +++ b/doc/descriptions/leo.desc @@ -32,5 +32,3 @@ :model "FS-1130 Colorpage Scanner" :interface "SCSI" :status :good - - diff --git a/doc/descriptions/ma1509.desc b/doc/descriptions/ma1509.desc index de046760d..99456b28b 100644 --- a/doc/descriptions/ma1509.desc +++ b/doc/descriptions/ma1509.desc @@ -35,4 +35,3 @@ :usbid "0x04c5" "0x1040" :status :unsupported :comment "Uses ma1509 chip, but very different from other scanners supported by the ma1509 backend" - diff --git a/doc/descriptions/magicolor.desc b/doc/descriptions/magicolor.desc index 7f0c341f5..f650c9090 100644 --- a/doc/descriptions/magicolor.desc +++ b/doc/descriptions/magicolor.desc @@ -39,4 +39,3 @@ :usbid "ignore" :status :unsupported :comment "Uses a similar protocol as the magicolor 1690MF, according to Ilia Sotnikov." - diff --git a/doc/descriptions/matsushita.desc b/doc/descriptions/matsushita.desc index 51f330f63..e671febc4 100644 --- a/doc/descriptions/matsushita.desc +++ b/doc/descriptions/matsushita.desc @@ -69,6 +69,3 @@ ; :comment and :url specifiers are optional after :mfg, :model, :desc, ; and at the top-level. - - - diff --git a/doc/descriptions/microtek2.desc b/doc/descriptions/microtek2.desc index ae2b78d4a..911441578 100644 --- a/doc/descriptions/microtek2.desc +++ b/doc/descriptions/microtek2.desc @@ -164,4 +164,3 @@ :model "ColorPage-EP" :interface "Parport" :status :good - diff --git a/doc/descriptions/niash.desc b/doc/descriptions/niash.desc index 9be55f2a7..e4b66d9e3 100644 --- a/doc/descriptions/niash.desc +++ b/doc/descriptions/niash.desc @@ -57,7 +57,3 @@ :interface "USB" :usbid "0x047b" "0x1000" :status :complete - - - - diff --git a/doc/descriptions/plustek_pp.desc b/doc/descriptions/plustek_pp.desc index 5b1cec50d..e899f2d65 100644 --- a/doc/descriptions/plustek_pp.desc +++ b/doc/descriptions/plustek_pp.desc @@ -153,4 +153,3 @@ :interface "Parport (SPP, EPP)" :status :complete :comment "Reported as P12" - diff --git a/doc/descriptions/ricoh.desc b/doc/descriptions/ricoh.desc index b4928f28d..bdaea315e 100644 --- a/doc/descriptions/ricoh.desc +++ b/doc/descriptions/ricoh.desc @@ -26,4 +26,3 @@ :interface "SCSI" :status :basic ;:comment "?" - diff --git a/doc/descriptions/sm3840.desc b/doc/descriptions/sm3840.desc index 35c7c390b..75c499ca3 100644 --- a/doc/descriptions/sm3840.desc +++ b/doc/descriptions/sm3840.desc @@ -52,5 +52,3 @@ ; and at the top-level. ; :status specifier is optional after :model and at the top-level - - diff --git a/doc/descriptions/tamarack.desc b/doc/descriptions/tamarack.desc index 731e6b8c0..7b52fd535 100644 --- a/doc/descriptions/tamarack.desc +++ b/doc/descriptions/tamarack.desc @@ -32,4 +32,3 @@ :interface "SCSI" :status :good :comment "3 pass, 600 DPI" - diff --git a/doc/descriptions/teco1.desc b/doc/descriptions/teco1.desc index e5b413250..1b3791819 100644 --- a/doc/descriptions/teco1.desc +++ b/doc/descriptions/teco1.desc @@ -122,6 +122,3 @@ ; :comment and :url specifiers are optional after :mfg, :model, :desc, ; and at the top-level. - - - diff --git a/doc/descriptions/teco3.desc b/doc/descriptions/teco3.desc index a2f3e9276..0a84ab292 100644 --- a/doc/descriptions/teco3.desc +++ b/doc/descriptions/teco3.desc @@ -57,6 +57,3 @@ ; :comment and :url specifiers are optional after :mfg, :model, :desc, ; and at the top-level. - - - diff --git a/doc/descriptions/template.desc. b/doc/descriptions/template.desc. index f7ca92463..a6b6babe3 100644 --- a/doc/descriptions/template.desc. +++ b/doc/descriptions/template.desc. @@ -77,5 +77,3 @@ ; and at the top-level. ; :status specifier is optional after :model and at the top-level - - diff --git a/doc/descriptions/test.desc b/doc/descriptions/test.desc index 657c2eacd..e0989f446 100644 --- a/doc/descriptions/test.desc +++ b/doc/descriptions/test.desc @@ -20,4 +20,3 @@ :desc "Frontend-tester" :comment "Backend for testing frontends. Also serves as example for SANE backend options." - diff --git a/doc/descriptions/unsupported.desc b/doc/descriptions/unsupported.desc index 49350bc2d..152994c54 100644 --- a/doc/descriptions/unsupported.desc +++ b/doc/descriptions/unsupported.desc @@ -2778,4 +2778,3 @@ ; :comment and :url specifiers are optional after :mfg, :model, :desc, ; and at the top-level. - diff --git a/doc/descriptions/xerox_mfp.desc b/doc/descriptions/xerox_mfp.desc index dd9d28305..d21a6be6c 100644 --- a/doc/descriptions/xerox_mfp.desc +++ b/doc/descriptions/xerox_mfp.desc @@ -411,4 +411,3 @@ :interface "USB" :usbid "0x04e8" "0x3482" :status :untested - diff --git a/doc/plustek/FAQ b/doc/plustek/FAQ index 43ad73c64..a3a224f8f 100644 --- a/doc/plustek/FAQ +++ b/doc/plustek/FAQ @@ -382,4 +382,3 @@ A: In general you can install it over. BUT this has caused This should cover all the directories where maybe some sane files are installed... - diff --git a/doc/plustek/Makefile.kernel24 b/doc/plustek/Makefile.kernel24 index 695864dfd..28677c1e1 100644 --- a/doc/plustek/Makefile.kernel24 +++ b/doc/plustek/Makefile.kernel24 @@ -248,4 +248,3 @@ depend .depend dep: ifeq (.depend,$(wildcard .depend)) #include .depend endif - diff --git a/doc/plustek/Plustek-PARPORT.txt b/doc/plustek/Plustek-PARPORT.txt index 3470ed7e8..a181b9c36 100644 --- a/doc/plustek/Plustek-PARPORT.txt +++ b/doc/plustek/Plustek-PARPORT.txt @@ -44,6 +44,3 @@ protocol will be changed and newer drivers won't work with older backends and vice versa. In this case (error -9019 in the SANE debug output!!) you have to recompile SANE AND the driver (have a look at the installation procedure above). - - - diff --git a/doc/plustek/Plustek-USB-TODO.txt b/doc/plustek/Plustek-USB-TODO.txt index 0ea7e8b01..7d03e9b84 100644 --- a/doc/plustek/Plustek-USB-TODO.txt +++ b/doc/plustek/Plustek-USB-TODO.txt @@ -50,4 +50,3 @@ make mono/gray modes work on Canon scanners done copy picture line by line to backend done cancel function does not work correctly in large resolutions fixed Move documents to its correct SANE place done - diff --git a/doc/plustek/Plustek-USB.txt b/doc/plustek/Plustek-USB.txt index f9fa53190..939d4d75a 100644 --- a/doc/plustek/Plustek-USB.txt +++ b/doc/plustek/Plustek-USB.txt @@ -454,4 +454,3 @@ CM - Color Mode (unitless), 3 for channel pixel rate color, else 1 ------------------------- - diff --git a/doc/sane-agfafocus.man b/doc/sane-agfafocus.man index d3481c521..9cd5223c0 100644 --- a/doc/sane-agfafocus.man +++ b/doc/sane-agfafocus.man @@ -172,4 +172,3 @@ sane(7), sane\-scsi(5) .SH AUTHOR Ingo Schneider and Karl Anders \[/O]ygard. - diff --git a/doc/sane-artec_eplus48u.man b/doc/sane-artec_eplus48u.man index fb3e028cd..7e7ec37f8 100644 --- a/doc/sane-artec_eplus48u.man +++ b/doc/sane-artec_eplus48u.man @@ -141,4 +141,3 @@ Support for buttons is missing due to missing support in SANE. .PP Please contact us if you find a bug: .IR http://www.sane\-project.org/bugs.html . - diff --git a/doc/sane-canon630u.man b/doc/sane-canon630u.man index f421f5883..e9ec3cd33 100644 --- a/doc/sane-canon630u.man +++ b/doc/sane-canon630u.man @@ -103,4 +103,3 @@ http://canon-fb630u.sourceforge.net/ .br .SH AUTHOR Nathan Rutman - diff --git a/doc/sane-canon_dr.man b/doc/sane-canon_dr.man index 9e71fe8a1..97d7fcb58 100644 --- a/doc/sane-canon_dr.man +++ b/doc/sane-canon_dr.man @@ -218,4 +218,3 @@ sane\-usb(5) .SH AUTHOR m. allan noah: - diff --git a/doc/sane-canon_pp.man b/doc/sane-canon_pp.man index fe6715d50..46bb82381 100644 --- a/doc/sane-canon_pp.man +++ b/doc/sane-canon_pp.man @@ -229,4 +229,3 @@ Matthew Duggan (SANE interface). .PP Many thanks to Kevin Easton for his comments and help, and Kent A. Signorini for his help with the N340P. - diff --git a/doc/sane-cardscan.man b/doc/sane-cardscan.man index 72ea41bd9..e5872a8d1 100644 --- a/doc/sane-cardscan.man +++ b/doc/sane-cardscan.man @@ -111,4 +111,3 @@ sane\-usb(5) .SH AUTHOR m. allan noah: - diff --git a/doc/sane-coolscan3.man b/doc/sane-coolscan3.man index be2bd52ff..08b503b2c 100644 --- a/doc/sane-coolscan3.man +++ b/doc/sane-coolscan3.man @@ -179,4 +179,3 @@ No real bugs currently known, please report any to the SANE developers' list. .SH AUTHORS coolscan3 written by A. Zummo (a.zummo@towertech.it), based heavily on coolscan2 written by Andr\['a]s Major (andras@users.sourceforge.net). - diff --git a/doc/sane-dc240.man b/doc/sane-dc240.man index b925851c2..70629ab93 100644 --- a/doc/sane-dc240.man +++ b/doc/sane-dc240.man @@ -110,4 +110,3 @@ or SANE should go to the SANE Developers mailing list (see http://www.sane\-project.org/mailing\-lists.html for details). You must be subscribed to the list, otherwise your mail won't be sent to the subscribers. - diff --git a/doc/sane-epjitsu.man b/doc/sane-epjitsu.man index 94518b7da..9a31da2f8 100644 --- a/doc/sane-epjitsu.man +++ b/doc/sane-epjitsu.man @@ -103,4 +103,3 @@ sane\-usb(5) .SH AUTHOR m. allan noah: - diff --git a/doc/sane-find-scanner.man b/doc/sane-find-scanner.man index 3d3d9ff51..cb48c30fb 100644 --- a/doc/sane-find-scanner.man +++ b/doc/sane-find-scanner.man @@ -131,4 +131,3 @@ NetBSD, OpenBSD, and HP-UX. No support for most parallel port scanners yet. .br Detection of USB chipsets is limited to a few chipsets. - diff --git a/doc/sane-fujitsu.man b/doc/sane-fujitsu.man index 44e820cd7..02b9aeb8c 100644 --- a/doc/sane-fujitsu.man +++ b/doc/sane-fujitsu.man @@ -234,4 +234,3 @@ sane\-epjitsu(5) .SH AUTHOR m. allan noah: - diff --git a/doc/sane-gphoto2.man b/doc/sane-gphoto2.man index e72503934..3e2a04602 100644 --- a/doc/sane-gphoto2.man +++ b/doc/sane-gphoto2.man @@ -115,4 +115,3 @@ or SANE should go to the SANE Developers mailing list (see http://www.sane\-project.org/mailing\-lists.html for details). You must be subscribed to the list, otherwise your mail won't be sent to the subscribers. - diff --git a/doc/sane-hp3500.man b/doc/sane-hp3500.man index 4b5ccb768..51929830d 100644 --- a/doc/sane-hp3500.man +++ b/doc/sane-hp3500.man @@ -50,4 +50,3 @@ export SANE_DEBUG_HP3500=4 .SH AUTHOR Troy Rollo - diff --git a/doc/sane-hp3900.man b/doc/sane-hp3900.man index 7a787e70c..b623ee571 100644 --- a/doc/sane-hp3900.man +++ b/doc/sane-hp3900.man @@ -107,4 +107,3 @@ Jonathan Bravo Lopez Scanning is only tested with Linux/ix86/gcc. Be careful when testing on other operating systems and especially on big-endian platforms. The scanner may get wrong data. - diff --git a/doc/sane-hp5400.man b/doc/sane-hp5400.man index 12c959c18..23c40d8e1 100644 --- a/doc/sane-hp5400.man +++ b/doc/sane-hp5400.man @@ -99,4 +99,3 @@ Martijn van Oosterhout , Thomas Soumarmon Scanning is only tested with Linux/ix86/gcc. Be careful when testing on other operating systems and especially on big-endian platforms. The scanner may get wrong data. - diff --git a/doc/sane-kvs1025.man b/doc/sane-kvs1025.man index 5cb9063c2..23a67f3f3 100644 --- a/doc/sane-kvs1025.man +++ b/doc/sane-kvs1025.man @@ -28,4 +28,3 @@ sane(7), sane\-usb(5) .SH AUTHOR m. allan noah: - diff --git a/doc/sane-kvs20xx.man b/doc/sane-kvs20xx.man index ad91642f3..bd3ecc250 100644 --- a/doc/sane-kvs20xx.man +++ b/doc/sane-kvs20xx.man @@ -26,4 +26,3 @@ sane(7), sane\-usb(5), sane\-scsi(5) .SH AUTHOR m. allan noah: - diff --git a/doc/sane-kvs40xx.man b/doc/sane-kvs40xx.man index 2a2aa339b..5a538534e 100644 --- a/doc/sane-kvs40xx.man +++ b/doc/sane-kvs40xx.man @@ -28,4 +28,3 @@ sane(7), sane\-usb(5), sane\-scsi(5) .SH AUTHOR m. allan noah: - diff --git a/doc/sane-microtek2.man b/doc/sane-microtek2.man index b0e359b4e..cc4f6f431 100644 --- a/doc/sane-microtek2.man +++ b/doc/sane-microtek2.man @@ -311,8 +311,3 @@ sane\-scsi(5), sane(7) Bernd Schroeder (not active anymore) .br Karsten Festag karsten.festag@gmx.de - - - - - diff --git a/doc/sane-ricoh.man b/doc/sane-ricoh.man index 6460e3439..1452e2460 100644 --- a/doc/sane-ricoh.man +++ b/doc/sane-ricoh.man @@ -76,4 +76,3 @@ export SANE_DEBUG_RICOH=4 sane(7), sane\-scsi(5) .SH AUTHOR Feico W. Dillema - diff --git a/doc/sane-sm3600.man b/doc/sane-sm3600.man index 1fb79ae5b..7f5c9a4bd 100644 --- a/doc/sane-sm3600.man +++ b/doc/sane-sm3600.man @@ -79,4 +79,3 @@ Marian Eichholz (eichholz@computer.org) .br Glenn Ramsey (glenn@componic.com) .br - diff --git a/doc/sane-sm3840.man b/doc/sane-sm3840.man index c384802d1..e6af3a1d9 100644 --- a/doc/sane-sm3840.man +++ b/doc/sane-sm3840.man @@ -92,4 +92,3 @@ sane\-microtek2(5), sane\-sm3600(5), http://www.ziplabel.com/sm3840 .br Earle F. Philhower III (earle@ziplabel.com) .br - diff --git a/doc/sane-stv680.man b/doc/sane-stv680.man index c6f65f333..90cdf53e7 100644 --- a/doc/sane-stv680.man +++ b/doc/sane-stv680.man @@ -173,4 +173,3 @@ STV680 kernel module pencam2 program .br libghoto2 program (camlib stv0680) - diff --git a/doc/sane-xerox_mfp.man b/doc/sane-xerox_mfp.man index d68408609..c03ddd48f 100644 --- a/doc/sane-xerox_mfp.man +++ b/doc/sane-xerox_mfp.man @@ -65,4 +65,3 @@ Laxmeesh Onkar Markod .BR sane (7), .BR sane\-usb (5) .br - diff --git a/doc/sceptre/s1200.txt b/doc/sceptre/s1200.txt index 0629e69eb..2dc100a99 100644 --- a/doc/sceptre/s1200.txt +++ b/doc/sceptre/s1200.txt @@ -105,5 +105,3 @@ The shifts are: 50 0 Some resolution give garbage. However that table might not be complete. - - diff --git a/doc/teco/teco2.txt b/doc/teco/teco2.txt index 877f46346..b45b79552 100644 --- a/doc/teco/teco2.txt +++ b/doc/teco/teco2.txt @@ -264,4 +264,3 @@ seems to be approximately 0x40302f (which would mean that the average value is approximately 0x803 in stead of 0x800). Hope this is clarifies the new algorithm. - diff --git a/doc/teco/teco3.txt b/doc/teco/teco3.txt index 959d04f11..c263f9520 100644 --- a/doc/teco/teco3.txt +++ b/doc/teco/teco3.txt @@ -163,4 +163,3 @@ park the CCD: OBJECT POSITION /*--------------------------------------------------------------------------*/ - diff --git a/doc/umax/negative-types.txt b/doc/umax/negative-types.txt index c1f26ce1a..142807f03 100644 --- a/doc/umax/negative-types.txt +++ b/doc/umax/negative-types.txt @@ -12,4 +12,3 @@ konica 38% 21% 14% 3% 0% 0% --------------------------------------------------------------- agfa 61% 24% 13% 6% 2% 0% --------------------------------------------------------------- - diff --git a/doc/umax/sane-umax-mirage-doc.html b/doc/umax/sane-umax-mirage-doc.html index 7c81b43fc..5d1598267 100644 --- a/doc/umax/sane-umax-mirage-doc.html +++ b/doc/umax/sane-umax-mirage-doc.html @@ -278,4 +278,3 @@ Author: Oliver Rauch - diff --git a/doc/umax/sane-umax-standard-options-doc.html b/doc/umax/sane-umax-standard-options-doc.html index fad212641..b80ca4087 100644 --- a/doc/umax/sane-umax-standard-options-doc.html +++ b/doc/umax/sane-umax-standard-options-doc.html @@ -271,4 +271,3 @@ Author: Oliver Rauch - diff --git a/doc/umax/umax.BUGS b/doc/umax/umax.BUGS index 90af9b866..37e55da97 100644 --- a/doc/umax/umax.BUGS +++ b/doc/umax/umax.BUGS @@ -9,4 +9,3 @@ KNOWN BUGS: * pixel count in x-direction is sometimes wrong if xres > 600dpi (Vista S12) * first scan with Astra 2400S produces wrong colors - diff --git a/doc/umax/umax.CHANGES b/doc/umax/umax.CHANGES index 9239127d7..79cca893a 100644 --- a/doc/umax/umax.CHANGES +++ b/doc/umax/umax.CHANGES @@ -1169,4 +1169,3 @@ build-44 -> build-45 * added defualt options for Linotype Opal2 * changed bug in highlight-blue function (using green value) - diff --git a/doc/umax/umax.FAQ b/doc/umax/umax.FAQ index 2bbdf613e..2ffbdfd84 100644 --- a/doc/umax/umax.FAQ +++ b/doc/umax/umax.FAQ @@ -143,5 +143,3 @@ A: The optimization set by "-O2" makes problems, try which one of the following You find a lot of tips and informations in the internet. E.g. take a look at http://www.scantips.com - - diff --git a/doc/umax/umax.TODO b/doc/umax/umax.TODO index 6af64b676..0d6f5a9fa 100644 --- a/doc/umax/umax.TODO +++ b/doc/umax/umax.TODO @@ -19,4 +19,3 @@ TODO UMAX BACKEND FOR SANE - I will NOT add support for parallel-port and USB scanners to this backend! Don`t ask for it. - diff --git a/frontend/tstbackend.c b/frontend/tstbackend.c index bbacf57ff..453ab2267 100644 --- a/frontend/tstbackend.c +++ b/frontend/tstbackend.c @@ -1887,6 +1887,3 @@ main (int argc, char **argv) display_stats(); return(0); } - - - diff --git a/include/sane/sanei_lm983x.h b/include/sane/sanei_lm983x.h index d108fbf56..8b48e65df 100644 --- a/include/sane/sanei_lm983x.h +++ b/include/sane/sanei_lm983x.h @@ -147,4 +147,3 @@ extern SANE_Status sanei_lm983x_read( SANE_Int fd, SANE_Byte reg, extern SANE_Bool sanei_lm983x_reset( SANE_Int fd ); #endif /* sanei_lm983x_h */ - diff --git a/include/sane/sanei_pio.h b/include/sane/sanei_pio.h index 61ac4140b..afdfa268a 100644 --- a/include/sane/sanei_pio.h +++ b/include/sane/sanei_pio.h @@ -52,4 +52,3 @@ extern int sanei_pio_read (int fd, u_char * buf, int n); extern int sanei_pio_write (int fd, const u_char * buf, int n); #endif /* sanei_pio_h */ - diff --git a/japi/Makefile.am b/japi/Makefile.am index 6e88a60d4..d48a8a655 100644 --- a/japi/Makefile.am +++ b/japi/Makefile.am @@ -40,4 +40,3 @@ libsanej_la_LIBADD = $(LIBSANE) # Make sure that java classes get created before create Sane.h Sane.h: classdist_noinst.stamp $(JAVAH) Sane - diff --git a/japi/SaneDevice.java b/japi/SaneDevice.java index 8d5a9a80c..d40367aac 100644 --- a/japi/SaneDevice.java +++ b/japi/SaneDevice.java @@ -51,5 +51,3 @@ public String vendor; // device vendor string public String model; // device model name public String type; // device type (e.g., "flatbed scanner") } - - diff --git a/japi/SaneOption.java b/japi/SaneOption.java index 1b2a01001..0c8c73654 100644 --- a/japi/SaneOption.java +++ b/japi/SaneOption.java @@ -142,4 +142,3 @@ public class SaneOption return ""; } } - diff --git a/japi/SaneRange.java b/japi/SaneRange.java index 4790e32b5..9eb7da719 100644 --- a/japi/SaneRange.java +++ b/japi/SaneRange.java @@ -50,4 +50,3 @@ public int min; // minimum (element) value public int max; // maximum (element) value public int quant; // Quantization value (0 if none) } - diff --git a/ltmain.sh b/ltmain.sh index dd687a9df..5c0390f83 100644 --- a/ltmain.sh +++ b/ltmain.sh @@ -9681,4 +9681,3 @@ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` # sh-indentation:2 # End: # vi:sw=2 - diff --git a/po/POTFILES.in b/po/POTFILES.in index 9988ff5d5..a0f4562f3 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -108,4 +108,3 @@ backend/u12.c backend/umax1220u.c backend/umax.c backend/umax_pp.c - diff --git a/sanei/sanei_DomainOS.h b/sanei/sanei_DomainOS.h index ff93503f9..8f88e5f9a 100644 --- a/sanei/sanei_DomainOS.h +++ b/sanei/sanei_DomainOS.h @@ -73,4 +73,3 @@ struct DomainServerCommon }; #endif /*DomainSenseSize*/ - diff --git a/sanei/sanei_magic.c b/sanei/sanei_magic.c index bfd10a7b5..3e719464d 100644 --- a/sanei/sanei_magic.c +++ b/sanei/sanei_magic.c @@ -1938,4 +1938,3 @@ sanei_magic_getTransX ( return buff; } - diff --git a/sanei/sanei_udp.c b/sanei/sanei_udp.c index ab316ea97..b5bb8cc09 100644 --- a/sanei/sanei_udp.c +++ b/sanei/sanei_udp.c @@ -229,4 +229,3 @@ sanei_udp_recvfrom(int fd, u_char * buf, int count, char **fromp) return l; } - diff --git a/testsuite/README b/testsuite/README index dbd32ed3b..37dd8db52 100644 --- a/testsuite/README +++ b/testsuite/README @@ -11,5 +11,3 @@ fix the bug. :-) The current tests use the test backend to scan in flatbed, hand scanner and three pass mode. Also a 16 bit color image is created and compared to the "right" one. This test should detect any little/big endian issues in scanimage. - - diff --git a/testsuite/tools/data/hwdb.ref b/testsuite/tools/data/hwdb.ref index 909ac4661..8be9b8564 100644 --- a/testsuite/tools/data/hwdb.ref +++ b/testsuite/tools/data/hwdb.ref @@ -2733,4 +2733,3 @@ usb:v413Cp5124* # Dell 1600n usb:v413Cp5250* libsane_matched=yes - diff --git a/testsuite/tools/data/testfile.desc b/testsuite/tools/data/testfile.desc index 9fa227b8c..edb8e4372 100644 --- a/testsuite/tools/data/testfile.desc +++ b/testsuite/tools/data/testfile.desc @@ -13885,4 +13885,3 @@ :interface "USB" :usbid "0x04e8" "0x3468" :status :untested - diff --git a/tools/README b/tools/README index f58a91d8c..ca15ad42e 100644 --- a/tools/README +++ b/tools/README @@ -73,4 +73,3 @@ Maybe useful for SANE developers: script. Alternatively, run it via gawk's -f option, like so: gawk -f tools/check-po.awk po/de.po More documentation is in the script itself. - diff --git a/tools/epson2usb.pl b/tools/epson2usb.pl index c7f20deb4..6d542d7b4 100755 --- a/tools/epson2usb.pl +++ b/tools/epson2usb.pl @@ -59,5 +59,3 @@ use warnings; print join(', ', @{$ids{$_}}); print " */\n"; } - - diff --git a/tools/hotplug/libusbscanner b/tools/hotplug/libusbscanner index bf613a5d5..55646d4dc 100755 --- a/tools/hotplug/libusbscanner +++ b/tools/hotplug/libusbscanner @@ -32,4 +32,3 @@ fi # if [ "$ACTION" = "add" -a "$TYPE" = "usb" ]; then # chmod 0666 "$DEVICE" # fi - diff --git a/tools/sane-config.in b/tools/sane-config.in index 6b7cd309c..8cb9d0be9 100644 --- a/tools/sane-config.in +++ b/tools/sane-config.in @@ -88,4 +88,3 @@ if test $# -gt 0; then ;; esac fi -