diff -Naur wfdb-10.3.3/Makefile wfdb-10.3.4/Makefile --- wfdb-10.3.3/Makefile Wed Mar 19 17:33:37 2003 +++ wfdb-10.3.4/Makefile Sun Mar 30 14:43:53 2003 @@ -39,12 +39,12 @@ # create source archives, type `make tarballs'; or to make a binary archive, # type `make bin-tarball'. Making archives requires PGP, gzip, and GNU tar). # file: version.def G. Moody 24 May 2000 -# Last revised: 19 March 2003 +# Last revised: 30 March 2003 # Each release of the WFDB Software Package is identified by a three-part # version number, defined here: MAJOR = 10 MINOR = 3 -RELEASE = 3 +RELEASE = 4 VERSION = $(MAJOR).$(MINOR).$(RELEASE) # RPMRELEASE can be incremented if changes are made between official @@ -61,8 +61,9 @@ # Definitions generated by 'configure' -PACKAGE = wfdb-10.3.3 -LONGDATE = 19 March 2003 +PACKAGE = wfdb-10.3.4 +SRCDIR = /home/george/wfdb-10.3.4 +LONGDATE = 30 March 2003 SHORTDATE = MARCH 2003 # _____________________________________________________________________________ diff -Naur wfdb-10.3.3/NEWS wfdb-10.3.4/NEWS --- wfdb-10.3.3/NEWS Wed Mar 19 12:10:21 2003 +++ wfdb-10.3.4/NEWS Sun Mar 30 14:30:24 2003 @@ -1,3 +1,9 @@ +10.3.4: + xform now handles input and output sampling frequencies that are not + exact multiples of 1 Hz. + + Added SRCDIR definition in configure and conf/cygwin.def. + 10.3.3: Fixed man page installation bug; thanks to Joe Mietus for the bug report. diff -Naur wfdb-10.3.3/README.NETFILES wfdb-10.3.4/README.NETFILES --- wfdb-10.3.3/README.NETFILES Fri Jun 21 22:54:12 2002 +++ wfdb-10.3.4/README.NETFILES Sun Mar 30 14:25:30 2003 @@ -32,7 +32,7 @@ rdsamp -r mitdb/100 -t .1 (MIT-BIH Arrhythmia Database, record 100) rdann -r slpdb/slp67x -a st (MIT-BIH Polysomnographic Database, - record slp67x + record slp67x) wave -r mimicdb/237/237 -a al (MIMIC Database, record 237 -- note that since each MIMIC record is kept in its own subdirectory of mimicdb, two levels diff -Naur wfdb-10.3.3/app/Makefile wfdb-10.3.4/app/Makefile --- wfdb-10.3.3/app/Makefile Wed Mar 19 17:33:37 2003 +++ wfdb-10.3.4/app/Makefile Sun Mar 30 14:43:53 2003 @@ -33,12 +33,12 @@ # type `make listing'. # _____________________________________________________________________________ # file: version.def G. Moody 24 May 2000 -# Last revised: 19 March 2003 +# Last revised: 30 March 2003 # Each release of the WFDB Software Package is identified by a three-part # version number, defined here: MAJOR = 10 MINOR = 3 -RELEASE = 3 +RELEASE = 4 VERSION = $(MAJOR).$(MINOR).$(RELEASE) # RPMRELEASE can be incremented if changes are made between official @@ -55,8 +55,9 @@ # Definitions generated by 'configure' -PACKAGE = wfdb-10.3.3 -LONGDATE = 19 March 2003 +PACKAGE = wfdb-10.3.4 +SRCDIR = /home/george/wfdb-10.3.4 +LONGDATE = 30 March 2003 SHORTDATE = MARCH 2003 # _____________________________________________________________________________ diff -Naur wfdb-10.3.3/app/xform.c wfdb-10.3.4/app/xform.c --- wfdb-10.3.3/app/xform.c Thu Feb 13 13:23:49 2003 +++ wfdb-10.3.4/app/xform.c Wed Mar 26 15:30:07 2003 @@ -1,9 +1,9 @@ /* file: xform.c G. Moody 8 December 1983 - Last revised: 14 November 2002 + Last revised: 26 March 2003 ------------------------------------------------------------------------------- xform: Sampling frequency, amplitude, and format conversion for WFDB records -Copyright (C) 2002 George B. Moody +Copyright (C) 2003 George B. Moody This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -29,7 +29,7 @@ #include char *pname, *prog_name(); -int gcd(); +double gcd(); void help(); main(argc, argv) @@ -38,10 +38,10 @@ { char btstring[30], **description, **filename, *irec = NULL, *orec = NULL, *nrec = NULL, *script = NULL, *startp = "0:0", **units; - double *gain; + double *gain, ifreq, ofreq = 0.0; int clip = 0, *deltav, fflag = 0, gflag = 0, Hflag = 0, i, iframelen, - ifreq, j, m, Mflag = 0, mn, *msiglist, n, nann = 0, nisig, - nminutes = 0, nosig = 0, oframelen, ofreq = 0, reopen = 0, sflag = 0, + j, m, Mflag = 0, mn, *msiglist, n, nann = 0, nisig, + nminutes = 0, nosig = 0, oframelen, reopen = 0, sflag = 0, *siglist = NULL, spf, uflag = 0, use_irec_desc = 1, *v, *vin, *vmax, *vmin, *vout, *vv; long from = 0L, it = 0L, nsamp = -1L, nsm = 0L, ot = 0L, spm, to = 0L; @@ -262,7 +262,7 @@ if (Hflag) setgvmode(WFDB_HIGHRES); spf = getspf(); - ifreq = strtim("1") * spf; + ifreq = sampfreq(NULL) * spf; (void)setsampfreq(0.); if (isigopen(irec, dfin, nisig) != nisig) exit(2); @@ -344,16 +344,16 @@ if (Mflag) { ofreq = ifreq; (void)fprintf(stderr, - "Sampling frequency (%d frames/sec) will be unchanged\n", + "Sampling frequency (%g frames/sec) will be unchanged\n", ofreq); } else do { ofreq = ifreq; (void)fprintf(stderr, - "Output sampling frequency (Hz per signal, > 0) [%d]: ", + "Output sampling frequency (Hz per signal, > 0) [%g]: ", ofreq); (void)fgets(answer, sizeof(answer), ttyin); - (void)sscanf(answer, "%d", &ofreq); + (void)sscanf(answer, "%g", &ofreq); } while (ofreq < 0); if (ofreq == 0) ofreq = WFDB_DEFFREQ; if (nosig > 0) { @@ -540,7 +540,7 @@ cc = -129; while (getann((unsigned)i, &annot) == 0 && (to == 0L || annot.time <= to)) { - annot.time = (annot.time - from) * ((double)ofreq*spf) / ifreq; + annot.time = (annot.time - from) * (ofreq*spf) / ifreq; /* If the -u option was specified, make sure that the corrected annotation time is positive and that it is later than the previous annotation time (exception: if it matches the @@ -695,10 +695,11 @@ /* If resampling is required, initialize the interpolation/decimation parameters. */ if (ifreq != ofreq) { + double f = gcd(ifreq, ofreq); + fflag = 1; - i = gcd(ifreq, ofreq); - m = ifreq/i; - n = ofreq/i; + m = ifreq/f; + n = ofreq/f; mn = m*n; (void)getvec(vin); for (i = 0; i < nosig; i++) @@ -929,7 +930,7 @@ if (nrec) { char *info, *xinfo; - (void)setsampfreq((double)ofreq); + (void)setsampfreq(ofreq); if (btstring[0] == '[') { btstring[strlen(btstring)-1] = '\0'; /* discard final ']' */ (void)setbasetime(btstring+1); @@ -971,14 +972,24 @@ exit(0); /*NOTREACHED*/ } -int gcd(x, y) /* greatest common divisor of x and y (Euclid's algorithm) */ -int x, y; + +/* Calculate the greatest common divisor of x and y. This function uses + Euclid's algorithm, modified so that an exact answer is not required if the + (possibly non-integral) arguments do not have a common divisor that can be + represented exactly. */ +double gcd(x, y) +double x, y; { - while (x != y) { - if (x > y) x -= y; - else y -= x; + double tol; + + if (x > y) tol = 0.001*y; + else tol = 0.001*x; + + while (1) { + if (x > y && x-y > tol) x -= y; + else if (y > x && y-x > tol) y -= x; + else return (x); } - return (x); } char *prog_name(s) diff -Naur wfdb-10.3.3/checkpkg/Makefile wfdb-10.3.4/checkpkg/Makefile --- wfdb-10.3.3/checkpkg/Makefile Wed Mar 19 17:33:37 2003 +++ wfdb-10.3.4/checkpkg/Makefile Sun Mar 30 14:43:53 2003 @@ -31,12 +31,12 @@ # directory). To print a set of source listings, type `make listing'. # _____________________________________________________________________________ # file: version.def G. Moody 24 May 2000 -# Last revised: 19 March 2003 +# Last revised: 30 March 2003 # Each release of the WFDB Software Package is identified by a three-part # version number, defined here: MAJOR = 10 MINOR = 3 -RELEASE = 3 +RELEASE = 4 VERSION = $(MAJOR).$(MINOR).$(RELEASE) # RPMRELEASE can be incremented if changes are made between official @@ -53,8 +53,9 @@ # Definitions generated by 'configure' -PACKAGE = wfdb-10.3.3 -LONGDATE = 19 March 2003 +PACKAGE = wfdb-10.3.4 +SRCDIR = /home/george/wfdb-10.3.4 +LONGDATE = 30 March 2003 SHORTDATE = MARCH 2003 # _____________________________________________________________________________ diff -Naur wfdb-10.3.3/conf/cygwin.def wfdb-10.3.4/conf/cygwin.def --- wfdb-10.3.3/conf/cygwin.def Wed Mar 19 18:03:31 2003 +++ wfdb-10.3.4/conf/cygwin.def Sun Mar 30 14:17:07 2003 @@ -1,5 +1,5 @@ # file: cygwin.def G. Moody 6 June 2000 -# Last revised: 4 March 2003 +# Last revised: 30 March 2003 # # This file contains default 'make' definitions for compiling the WFDB Software # Package under MS Windows using the free Cygwin/gcc ANSI C compiler, available @@ -145,12 +145,12 @@ SETLPERMISSIONS = chmod 644 # SETXPERMISSIONS is the command needed to make the applications accessible. -SETXPERMISSIONS = chmod 755 +SETXPERMISSIONS = $(SRCDIR)/conf/exechmod 755 # STRIP is the command used to compact the compiled binaries by removing their # symbol tables. 'exestrip' is a script that appends the '.exe' suffix to the # files in its argument list before passing their names to 'strip' itself. -STRIP = ../conf/exestrip +STRIP = $(SRCDIR)/conf/exestrip # To retain the symbol tables for debugging, comment out the previous line, and # uncomment the next line. # STRIP = : diff -Naur wfdb-10.3.3/conf/version.def wfdb-10.3.4/conf/version.def --- wfdb-10.3.3/conf/version.def Wed Mar 19 12:09:16 2003 +++ wfdb-10.3.4/conf/version.def Sun Mar 30 14:43:32 2003 @@ -1,10 +1,10 @@ # file: version.def G. Moody 24 May 2000 -# Last revised: 19 March 2003 +# Last revised: 30 March 2003 # Each release of the WFDB Software Package is identified by a three-part # version number, defined here: MAJOR = 10 MINOR = 3 -RELEASE = 3 +RELEASE = 4 VERSION = $(MAJOR).$(MINOR).$(RELEASE) # RPMRELEASE can be incremented if changes are made between official diff -Naur wfdb-10.3.3/configure wfdb-10.3.4/configure --- wfdb-10.3.3/configure Wed Mar 19 13:48:24 2003 +++ wfdb-10.3.4/configure Sun Mar 30 14:48:16 2003 @@ -1,6 +1,6 @@ #! /bin/sh # file: configure G. Moody 24 May 2000 -# Last revised: 19 March 2003 +# Last revised: 30 March 2003 # Configuration script for the WFDB Software Package # This script was not generated using 'autoconf'. If you can implement @@ -49,69 +49,71 @@ OS=`uname` echo "Configuring the WFDB software package for $OS." +SRCDIR=`pwd` +cd conf + echo "Checking the echo command ..." echo -n >echo.out if [ -s echo.out ] then -ln -sf prompt-c conf/prompt +ln -sf prompt-c prompt else -ln -sf prompt-n conf/prompt +ln -sf prompt-n prompt fi rm echo.out -cp conf/version.def conf/site.def - -echo "# Definitions generated by 'configure'" >>conf/site.def -echo >>conf/site.def -PWD=`pwd` -PACKAGE=`basename $PWD` -echo "PACKAGE = $PACKAGE" >>conf/site.def -echo LONGDATE = `date '+%e %B %Y'` >>conf/site.def -echo SHORTDATE = `date '+%B %Y' | tr a-z A-Z` >>conf/site.def -echo "# _____________________________________________________________________________" >>conf/site.def -echo >>conf/site.def +PACKAGE=`basename $SRCDIR` +cp version.def site.def +echo "# Definitions generated by 'configure'" >>site.def +echo >>site.def +echo "PACKAGE = $PACKAGE" >>site.def +echo "SRCDIR = $SRCDIR" >>site.def +echo LONGDATE = `date '+%e %B %Y'` >>site.def +echo SHORTDATE = `date '+%B %Y' | tr a-z A-Z` >>site.def +echo "# _____________________________________________________________________________" >>site.def +echo >>site.def -cp /dev/null conf/site-slib.def +cp /dev/null site-slib.def case `uname` in Linux*) OS=Linux - cat conf/linux.def >>conf/site.def - cat conf/version.def conf/linux-slib.def >conf/site-slib.def ;; + cat site.def linux-slib.def >site-slib.def + cat linux.def >>site.def ;; FreeBSD*) OS=FreeBSD - cat conf/freebsd.def >>conf/site.def - cat conf/version.def conf/freebsd-slib.def >conf/site-slib.def ;; + cat site.def freebsd-slib.def >site-slib.def + cat freebsd.def >>site.def ;; SunOS*) OS=Solaris - cat conf/solaris.def >>conf/site.def - cat conf/version.def conf/solaris-slib.def >conf/site-slib.def + cat site.def solaris-slib.def >site-slib.def + cat solaris.def >>site.def echo "It is normal, and harmless, for Solaris to be recognized as" echo "SunOS." ;; HP-UX*) OS=HPUX - cat conf/hpux.def >>conf/site.def - cat conf/version.def conf/hpux-slib.def >conf/site-slib.def ;; + cat site.def hpux-slib.def >site-slib.def + cat hpux.def >>site.def ;; CYGWIN*) OS=cygwin - cat conf/cygwin.def >>conf/site.def - cat conf/version.def conf/cygwin-slib.def >conf/site-slib.def ;; + cat site.def cygwin-slib.def >site-slib.def + cat cygwin.def >>site.def ;; Darwin*) OS=Darwin LIBTYPE=dynamic - cat conf/darwin.def >>conf/site.def - cat conf/version.def conf/darwin-slib.def > conf/site-slib.def + cat site.def darwin-slib.def >site-slib.def + cat darwin.def >>site.def echo "It is normal for Mac OS X to be recognized as Darwin." echo "Building static libraries is not supported on Darwin." ;; *) OS=generic - cat conf/generic.def >>conf/site.def - cat conf/version.def conf/generic-slib.def >conf/site-slib.def + cat site.def generic-slib.def >site-slib.def + cat generic.def >>site.def echo "Using the generic configuration, which may need to be customized" echo "for your operating system. 'configure' will offer suggestions for" echo "customization after it completes the generic configuration." ;; esac -if [ -s conf/site-slib.def ] +if [ -s site-slib.def ] then if [ x$LIBTYPE = x ] then echo echo "The WFDB library may be compiled as a static library or as a" echo "dynamically loaded (shared) library (the default). Type S for a" - conf/prompt "static library, or D for a dynamically loaded library:" + ./prompt "static library, or D for a dynamically loaded library:" read LIBTYPE fi else @@ -119,7 +121,7 @@ fi case x$LIBTYPE in - xS*|xs*) cp /dev/null conf/site-slib.def + xS*|xs*) cp /dev/null site-slib.def LIBTYPE=static ;; *) LIBTYPE=dynamic ;; esac @@ -138,13 +140,12 @@ echo "libraries only may cause compilation to fail if your" echo "system does not have a complete set of static libraries." echo "Type S to link to static libraries only, or D to link to" - conf/prompt "dynamically loaded libraries where available:" + ./prompt "dynamically loaded libraries where available:" read SYSLIBS fi case x$SYSLIBS in - xS*|xs*) sed "s/LDFLAGS = -L/LDFLAGS = -static -L/" \ - conf/site.tmp - mv conf/site.tmp conf/site.def + xS*|xs*) sed "s/LDFLAGS = -L/LDFLAGS = -static -L/" site.tmp + mv site.tmp site.def echo "Applications will be linked with static libraries only." SYSLIBS=static ;; @@ -155,7 +156,7 @@ fi echo -conf/prompt "Looking for the C compiler ..." +./prompt "Looking for the C compiler ..." WCC=`which gcc 2>&1` if [ "x$WCC" = "x" ] then @@ -176,12 +177,13 @@ echo "appear to be a C compiler installed on this system. Please" echo "install one, be sure that it is in your PATH, and that it is" echo "accessible as either 'cc' or 'gcc', then run ./configure again." + cd .. exit else - sed "s/CC = gcc/CC = cc/" conf/site.tmp - mv conf/site.tmp conf/site.def - sed "s/CC = gcc/CC = cc/" conf/site.tmp - mv conf/site.tmp conf/site-slib.def + sed "s/CC = gcc/CC = cc/" site.tmp + mv site.tmp site.def + sed "s/CC = gcc/CC = cc/" site.tmp + mv site.tmp site-slib.def CC=cc fi else @@ -205,7 +207,7 @@ DIR= while [ x$DIR = x ] do - conf/prompt "Choose a location, or press to install in /usr:" + ./prompt "Choose a location, or press to install in /usr:" read DIR case x$DIR in x/usr) ;; @@ -221,16 +223,16 @@ case $DIR in /usr) ;; - /*) sed "s+^WFDBROOT = /usr+WFDBROOT = $DIR+" conf/site.tmp - mv conf/site.tmp conf/site.def - sed "s+^WFDBROOT = /usr+WFDBROOT = $DIR+" conf/site.tmp - mv conf/site.tmp conf/site-slib.def + /*) sed "s+^WFDBROOT = /usr+WFDBROOT = $DIR+" site.tmp + mv site.tmp site.def + sed "s+^WFDBROOT = /usr+WFDBROOT = $DIR+" site.tmp + mv site.tmp site-slib.def esac echo "The WFDB software will be installed in '$DIR'." -MANTMP=`grep "MANDIR =" conf/site.def |sed 's+$(WFDBROOT)/++' |cut -d " " -f 3` +MANTMP=`grep "MANDIR =" site.def |sed 's+$(WFDBROOT)/++' |cut -d " " -f 3` MANDEF=$DIR/$MANTMP if [ x$MANDIR = x ] then @@ -243,10 +245,10 @@ echo "but without a '/' at the end). If the subdirectories (man1, man3," echo "man5, ...) of MANDIR don't exist, they will be created as necessary." echo - DIR= + MANDIR= while [ x$MANDIR = x ] do - conf/prompt "Choose a location, or press to install in $MANDEF:" + ./prompt "Choose a location, or press to install in $MANDEF:" read MANDIR case x$MANDIR in x/usr) ;; @@ -262,14 +264,14 @@ if [ "$MANDIR" != "$MANDEF" ] then - sed "s+^MANDIR = $MANDEF+MANDIR = $MANDIR+" conf/site.tmp - mv conf/site.tmp conf/site.def + sed "s+^MANDIR = $MANDEF+MANDIR = $MANDIR+" site.tmp + mv site.tmp site.def fi echo "The manual pages will be installed in '$MANDIR'." echo -conf/prompt "Looking for libwww ..." +./prompt "Looking for libwww ..." WLC=`which libwww-config 2>&1` if [ "x$WLC" = "x" ] then @@ -281,30 +283,31 @@ echo "The WFDB software will be compiled without NETFILES access, because" echo "libwww does not appear to be installed on this system." echo "To add NETFILES access, install libwww and run ./configure again." - echo "NETFILES=0" >config.cache - sed "s/LWC = libwww-config/LWC = :/" conf/site.tmp - mv conf/site.tmp conf/site.def - sed "s/LWC = libwww-config/LWC = :/" conf/site.tmp - mv conf/site.tmp conf/site-slib.def - sed "s/WFDB_NETFILES 1/WFDB_NETFILES 0/" lib/wfdb.h + echo "NETFILES=0" >../config.cache + sed "s/LWC = libwww-config/LWC = :/" site.tmp + mv site.tmp site.def + sed "s/LWC = libwww-config/LWC = :/" site.tmp + mv site.tmp site-slib.def + sed "s/WFDB_NETFILES 1/WFDB_NETFILES 0/" <../lib/wfdb.h0 >../lib/wfdb.h WITHNF=without else echo "found" echo "The WFDB software will be compiled with NETFILES access." - echo "NETFILES=1" >config.cache - sed "s/LWC = :/LWC = libwww-config/" conf/site.tmp - mv conf/site.tmp conf/site.def + echo "NETFILES=1" >../config.cache + sed "s/LWC = :/LWC = libwww-config/" site.tmp + mv site.tmp site.def if [ $LIBTYPE = "static" ] then - sed "s/LDLIBWWW = #/LDLIBWWW =/" conf/site.tmp - mv conf/site.tmp conf/site.def + sed "s/LDLIBWWW = #/LDLIBWWW =/" site.tmp + mv site.tmp site.def fi - sed "s/LWC = :/LWC = libwww-config/" conf/site.tmp - mv conf/site.tmp conf/site-slib.def - sed "s/WFDB_NETFILES 0/WFDB_NETFILES 1/" lib/wfdb.h + sed "s/LWC = :/LWC = libwww-config/" site.tmp + mv site.tmp site-slib.def + sed "s/WFDB_NETFILES 0/WFDB_NETFILES 1/" <../lib/wfdb.h0 >../lib/wfdb.h WITHNF=with fi +cd .. echo echo "Creating Makefile in lib ..." if [ -s conf/site-slib.def ] @@ -368,19 +371,19 @@ echo "XView textedit application to your PATH, and run ./configure again." cp -p wave/nomake wave/Makefile cp -p wave/nomake waverc/Makefile - echo "WAVE=0" >>config.cache + echo "WAVE=0" >>../config.cache WAVECOMP="WAVE will not be compiled." else echo "found" WAVECOMP="WAVE will be compiled and installed in '$DIR/bin'." - echo "WAVE=1" >>config.cache + echo "WAVE=1" >>../config.cache fi # Clean up old *.o files in lib, to avoid possibly using binaries intended # for a shared library in a static library or vice versa. rm -f lib/*.o -if [ $DIR != "/usr" -a $LIBTYPE = dynamic ] +if [ $DIR != "/usr" -a $LIBTYPE = dynamic ] then echo echo "IMPORTANT: You have chosen to build a dynamic (shared) WFDB" diff -Naur wfdb-10.3.3/convert/Makefile wfdb-10.3.4/convert/Makefile --- wfdb-10.3.3/convert/Makefile Wed Mar 19 17:33:37 2003 +++ wfdb-10.3.4/convert/Makefile Sun Mar 30 14:43:53 2003 @@ -33,12 +33,12 @@ # type `make listing'. # _____________________________________________________________________________ # file: version.def G. Moody 24 May 2000 -# Last revised: 19 March 2003 +# Last revised: 30 March 2003 # Each release of the WFDB Software Package is identified by a three-part # version number, defined here: MAJOR = 10 MINOR = 3 -RELEASE = 3 +RELEASE = 4 VERSION = $(MAJOR).$(MINOR).$(RELEASE) # RPMRELEASE can be incremented if changes are made between official @@ -55,8 +55,9 @@ # Definitions generated by 'configure' -PACKAGE = wfdb-10.3.3 -LONGDATE = 19 March 2003 +PACKAGE = wfdb-10.3.4 +SRCDIR = /home/george/wfdb-10.3.4 +LONGDATE = 30 March 2003 SHORTDATE = MARCH 2003 # _____________________________________________________________________________ diff -Naur wfdb-10.3.3/data/Makefile wfdb-10.3.4/data/Makefile --- wfdb-10.3.3/data/Makefile Wed Mar 19 17:33:37 2003 +++ wfdb-10.3.4/data/Makefile Sun Mar 30 14:43:53 2003 @@ -33,12 +33,12 @@ # listing'. # _____________________________________________________________________________ # file: version.def G. Moody 24 May 2000 -# Last revised: 19 March 2003 +# Last revised: 30 March 2003 # Each release of the WFDB Software Package is identified by a three-part # version number, defined here: MAJOR = 10 MINOR = 3 -RELEASE = 3 +RELEASE = 4 VERSION = $(MAJOR).$(MINOR).$(RELEASE) # RPMRELEASE can be incremented if changes are made between official @@ -55,8 +55,9 @@ # Definitions generated by 'configure' -PACKAGE = wfdb-10.3.3 -LONGDATE = 19 March 2003 +PACKAGE = wfdb-10.3.4 +SRCDIR = /home/george/wfdb-10.3.4 +LONGDATE = 30 March 2003 SHORTDATE = MARCH 2003 # _____________________________________________________________________________ diff -Naur wfdb-10.3.3/doc/Makefile wfdb-10.3.4/doc/Makefile --- wfdb-10.3.3/doc/Makefile Wed Mar 19 17:33:37 2003 +++ wfdb-10.3.4/doc/Makefile Sun Mar 30 14:43:53 2003 @@ -134,12 +134,12 @@ # `make ug'. To print the WFDB Programmer's Guide, type `make pg'. # _____________________________________________________________________________ # file: version.def G. Moody 24 May 2000 -# Last revised: 19 March 2003 +# Last revised: 30 March 2003 # Each release of the WFDB Software Package is identified by a three-part # version number, defined here: MAJOR = 10 MINOR = 3 -RELEASE = 3 +RELEASE = 4 VERSION = $(MAJOR).$(MINOR).$(RELEASE) # RPMRELEASE can be incremented if changes are made between official @@ -156,8 +156,9 @@ # Definitions generated by 'configure' -PACKAGE = wfdb-10.3.3 -LONGDATE = 19 March 2003 +PACKAGE = wfdb-10.3.4 +SRCDIR = /home/george/wfdb-10.3.4 +LONGDATE = 30 March 2003 SHORTDATE = MARCH 2003 # _____________________________________________________________________________ diff -Naur wfdb-10.3.3/doc/wag-src/Makefile wfdb-10.3.4/doc/wag-src/Makefile --- wfdb-10.3.3/doc/wag-src/Makefile Wed Mar 19 17:33:37 2003 +++ wfdb-10.3.4/doc/wag-src/Makefile Sun Mar 30 14:43:53 2003 @@ -59,12 +59,12 @@ # PostScript 'make wag.ps' (requires troff, tbl, latex, and dvips) # _____________________________________________________________________________ # file: version.def G. Moody 24 May 2000 -# Last revised: 19 March 2003 +# Last revised: 30 March 2003 # Each release of the WFDB Software Package is identified by a three-part # version number, defined here: MAJOR = 10 MINOR = 3 -RELEASE = 3 +RELEASE = 4 VERSION = $(MAJOR).$(MINOR).$(RELEASE) # RPMRELEASE can be incremented if changes are made between official @@ -81,8 +81,9 @@ # Definitions generated by 'configure' -PACKAGE = wfdb-10.3.3 -LONGDATE = 19 March 2003 +PACKAGE = wfdb-10.3.4 +SRCDIR = /home/george/wfdb-10.3.4 +LONGDATE = 30 March 2003 SHORTDATE = MARCH 2003 # _____________________________________________________________________________ diff -Naur wfdb-10.3.3/doc/wag-src/xform.1 wfdb-10.3.4/doc/wag-src/xform.1 --- wfdb-10.3.3/doc/wag-src/xform.1 Thu Aug 1 01:53:37 2002 +++ wfdb-10.3.4/doc/wag-src/xform.1 Sun Mar 30 14:25:00 2003 @@ -1,4 +1,4 @@ -.TH XFORM 1 "1 August 2002" "WFDB 10.2.7" "WFDB Applications Guide" +.TH XFORM 1 "30 March 2003" "WFDB 10.3.4" "WFDB Applications Guide" .SH NAME xform \- sampling frequency, amplitude, and format conversion for WFDB records .SH SYNOPSIS @@ -87,24 +87,21 @@ To process only a segment of the \fIinput-record\fR, specify the starting and ending times using the \fB-f\fR and \fB-t\fR options. .PP -Sampling frequency changes are performed by linear -interpolation; any combination of input and output sampling frequencies -is permissible, provided that both are integers (if non-integer sampling -frequencies are specified, they are truncated to multiples of 1 Hz before -the interpolation/decimation parameters are determined). -This interpolation method has the advantage of being reasonably fast, an -important consideration since it is often necessary to operate on a million -or more samples. Resampling noise is not a significant problem for the -typical applications of \fBxform\fR (changing the sampling frequency by -factors of five or less). Aliasing can be a problem, however, when the input -sampling frequency is greater than the output sampling frequency. In such -cases, if the input signals contain frequency components at or above half of -the output sampling frequency, the input signals should be low-pass filtered -(using, for example \fBfir\fR(1)) to remove these components before processing -them with \fBxform\fR. Conversely, if the output sampling frequency is -substantially greater than the input sampling frequency, resampling noise -introduced at frequencies in excess of half of the input sampling frequency -can be removed by low-pass filtering the output signals. +Sampling frequency changes are performed by linear interpolation; any +combination of input and output sampling frequencies is permissible. This +interpolation method has the advantage of being reasonably fast, an important +consideration since it is often necessary to operate on a million or more +samples. Resampling noise is not a significant problem for the typical +applications of \fBxform\fR (changing the sampling frequency by factors of five +or less). Aliasing can be a problem, however, when the input sampling +frequency is greater than the output sampling frequency. In such cases, if the +input signals contain frequency components at or above half of the output +sampling frequency, the input signals should be low-pass filtered (using, for +example \fBfir\fR(1)) to remove these components before processing them with +\fBxform\fR. Conversely, if the output sampling frequency is substantially +greater than the input sampling frequency, resampling noise introduced at +frequencies in excess of half of the input sampling frequency can be removed by +low-pass filtering the output signals. .PP Normally, the ADC resolution fields in the header files are ignored, and scaling is determined by the ratios of the gain fields. An undefined (0) diff -Naur wfdb-10.3.3/doc/wpg-src/Makefile wfdb-10.3.4/doc/wpg-src/Makefile --- wfdb-10.3.3/doc/wpg-src/Makefile Wed Mar 19 17:33:37 2003 +++ wfdb-10.3.4/doc/wpg-src/Makefile Sun Mar 30 14:43:53 2003 @@ -65,12 +65,12 @@ # wpg.info' again. # _____________________________________________________________________________ # file: version.def G. Moody 24 May 2000 -# Last revised: 19 March 2003 +# Last revised: 30 March 2003 # Each release of the WFDB Software Package is identified by a three-part # version number, defined here: MAJOR = 10 MINOR = 3 -RELEASE = 3 +RELEASE = 4 VERSION = $(MAJOR).$(MINOR).$(RELEASE) # RPMRELEASE can be incremented if changes are made between official @@ -87,8 +87,9 @@ # Definitions generated by 'configure' -PACKAGE = wfdb-10.3.3 -LONGDATE = 19 March 2003 +PACKAGE = wfdb-10.3.4 +SRCDIR = /home/george/wfdb-10.3.4 +LONGDATE = 30 March 2003 SHORTDATE = MARCH 2003 # _____________________________________________________________________________ diff -Naur wfdb-10.3.3/doc/wug-src/Makefile wfdb-10.3.4/doc/wug-src/Makefile --- wfdb-10.3.3/doc/wug-src/Makefile Wed Mar 19 17:33:37 2003 +++ wfdb-10.3.4/doc/wug-src/Makefile Sun Mar 30 14:43:53 2003 @@ -55,12 +55,12 @@ # PostScript 'make wug.ps' (requires latex and dvips) # _____________________________________________________________________________ # file: version.def G. Moody 24 May 2000 -# Last revised: 19 March 2003 +# Last revised: 30 March 2003 # Each release of the WFDB Software Package is identified by a three-part # version number, defined here: MAJOR = 10 MINOR = 3 -RELEASE = 3 +RELEASE = 4 VERSION = $(MAJOR).$(MINOR).$(RELEASE) # RPMRELEASE can be incremented if changes are made between official @@ -77,8 +77,9 @@ # Definitions generated by 'configure' -PACKAGE = wfdb-10.3.3 -LONGDATE = 19 March 2003 +PACKAGE = wfdb-10.3.4 +SRCDIR = /home/george/wfdb-10.3.4 +LONGDATE = 30 March 2003 SHORTDATE = MARCH 2003 # _____________________________________________________________________________ diff -Naur wfdb-10.3.3/examples/Makefile wfdb-10.3.4/examples/Makefile --- wfdb-10.3.3/examples/Makefile Wed Mar 19 17:33:37 2003 +++ wfdb-10.3.4/examples/Makefile Sun Mar 30 14:43:53 2003 @@ -34,12 +34,12 @@ # `make clean' to remove them. # _____________________________________________________________________________ # file: version.def G. Moody 24 May 2000 -# Last revised: 19 March 2003 +# Last revised: 30 March 2003 # Each release of the WFDB Software Package is identified by a three-part # version number, defined here: MAJOR = 10 MINOR = 3 -RELEASE = 3 +RELEASE = 4 VERSION = $(MAJOR).$(MINOR).$(RELEASE) # RPMRELEASE can be incremented if changes are made between official @@ -56,8 +56,9 @@ # Definitions generated by 'configure' -PACKAGE = wfdb-10.3.3 -LONGDATE = 19 March 2003 +PACKAGE = wfdb-10.3.4 +SRCDIR = /home/george/wfdb-10.3.4 +LONGDATE = 30 March 2003 SHORTDATE = MARCH 2003 # _____________________________________________________________________________ diff -Naur wfdb-10.3.3/lib/Makefile wfdb-10.3.4/lib/Makefile --- wfdb-10.3.3/lib/Makefile Wed Mar 19 17:33:37 2003 +++ wfdb-10.3.4/lib/Makefile Sun Mar 30 14:43:53 2003 @@ -33,12 +33,12 @@ # type `make slib'. # _____________________________________________________________________________ # file: version.def G. Moody 24 May 2000 -# Last revised: 19 March 2003 +# Last revised: 30 March 2003 # Each release of the WFDB Software Package is identified by a three-part # version number, defined here: MAJOR = 10 MINOR = 3 -RELEASE = 3 +RELEASE = 4 VERSION = $(MAJOR).$(MINOR).$(RELEASE) # RPMRELEASE can be incremented if changes are made between official @@ -51,6 +51,14 @@ # WAVEVERSION is the WAVE version number. WAVEVERSION = 6.6 +# _____________________________________________________________________________ + +# Definitions generated by 'configure' + +PACKAGE = wfdb-10.3.4 +SRCDIR = /home/george/wfdb-10.3.4 +LONGDATE = 30 March 2003 +SHORTDATE = MARCH 2003 # _____________________________________________________________________________ # file: linux-slib.def G. Moody 31 May 2000 diff -Naur wfdb-10.3.3/lib/wfdb.h0 wfdb-10.3.4/lib/wfdb.h0 --- wfdb-10.3.3/lib/wfdb.h0 Tue Mar 4 15:58:04 2003 +++ wfdb-10.3.4/lib/wfdb.h0 Sun Mar 30 14:35:18 2003 @@ -1,5 +1,5 @@ /* file: wfdb.h G. Moody 13 June 1983 - Last revised: 4 March 2003 wfdblib 10.3.3 + Last revised: 30 March 2003 wfdblib 10.3.4 WFDB library type, constant, structure, and function interface definitions _______________________________________________________________________________ @@ -33,7 +33,7 @@ /* WFDB library version. */ #define WFDB_MAJOR 10 #define WFDB_MINOR 3 -#define WFDB_RELEASE 3 +#define WFDB_RELEASE 4 #define WFDB_NETFILES 1 /* if 1, library includes code for HTTP, FTP clients */ /* Determine what type of compiler is being used. */ diff -Naur wfdb-10.3.3/psd/Makefile wfdb-10.3.4/psd/Makefile --- wfdb-10.3.3/psd/Makefile Wed Mar 19 17:33:37 2003 +++ wfdb-10.3.4/psd/Makefile Sun Mar 30 14:43:53 2003 @@ -32,12 +32,12 @@ # directory). # _____________________________________________________________________________ # file: version.def G. Moody 24 May 2000 -# Last revised: 19 March 2003 +# Last revised: 30 March 2003 # Each release of the WFDB Software Package is identified by a three-part # version number, defined here: MAJOR = 10 MINOR = 3 -RELEASE = 3 +RELEASE = 4 VERSION = $(MAJOR).$(MINOR).$(RELEASE) # RPMRELEASE can be incremented if changes are made between official @@ -54,8 +54,9 @@ # Definitions generated by 'configure' -PACKAGE = wfdb-10.3.3 -LONGDATE = 19 March 2003 +PACKAGE = wfdb-10.3.4 +SRCDIR = /home/george/wfdb-10.3.4 +LONGDATE = 30 March 2003 SHORTDATE = MARCH 2003 # _____________________________________________________________________________ diff -Naur wfdb-10.3.3/wave/Makefile wfdb-10.3.4/wave/Makefile --- wfdb-10.3.3/wave/Makefile Wed Mar 19 17:33:37 2003 +++ wfdb-10.3.4/wave/Makefile Sun Mar 30 14:43:53 2003 @@ -45,12 +45,12 @@ # just type `make' (from within this directory). # _____________________________________________________________________________ # file: version.def G. Moody 24 May 2000 -# Last revised: 19 March 2003 +# Last revised: 30 March 2003 # Each release of the WFDB Software Package is identified by a three-part # version number, defined here: MAJOR = 10 MINOR = 3 -RELEASE = 3 +RELEASE = 4 VERSION = $(MAJOR).$(MINOR).$(RELEASE) # RPMRELEASE can be incremented if changes are made between official @@ -67,8 +67,9 @@ # Definitions generated by 'configure' -PACKAGE = wfdb-10.3.3 -LONGDATE = 19 March 2003 +PACKAGE = wfdb-10.3.4 +SRCDIR = /home/george/wfdb-10.3.4 +LONGDATE = 30 March 2003 SHORTDATE = MARCH 2003 # _____________________________________________________________________________ diff -Naur wfdb-10.3.3/waverc/Makefile wfdb-10.3.4/waverc/Makefile --- wfdb-10.3.3/waverc/Makefile Wed Mar 19 17:33:37 2003 +++ wfdb-10.3.4/waverc/Makefile Sun Mar 30 14:43:53 2003 @@ -25,12 +25,12 @@ # please visit PhysioNet (http://www.physionet.org/). # _____________________________________________________________________________ # file: version.def G. Moody 24 May 2000 -# Last revised: 19 March 2003 +# Last revised: 30 March 2003 # Each release of the WFDB Software Package is identified by a three-part # version number, defined here: MAJOR = 10 MINOR = 3 -RELEASE = 3 +RELEASE = 4 VERSION = $(MAJOR).$(MINOR).$(RELEASE) # RPMRELEASE can be incremented if changes are made between official @@ -47,8 +47,9 @@ # Definitions generated by 'configure' -PACKAGE = wfdb-10.3.3 -LONGDATE = 19 March 2003 +PACKAGE = wfdb-10.3.4 +SRCDIR = /home/george/wfdb-10.3.4 +LONGDATE = 30 March 2003 SHORTDATE = MARCH 2003 # _____________________________________________________________________________