diff -Naur --exclude Makefile --exclude info wfdb-10.3.10/checkpkg/expected/lcheck_cal wfdb-10.3.11/checkpkg/expected/lcheck_cal --- wfdb-10.3.10/checkpkg/expected/lcheck_cal 2003-05-06 16:31:22.000000000 -0400 +++ wfdb-10.3.11/checkpkg/expected/lcheck_cal 2003-10-17 11:52:27.000000000 -0400 @@ -1,4 +1,5 @@ ECG - 1 sine 1 mV +ECG - 1 sine 1000 uV EEG - - undefined 0.1 mV EEG - - undefined 100 uV EOG - - undefined 0.1 mV @@ -9,7 +10,11 @@ ABP 0 - square 100 mmHg Resp - - undefined 1 l RESP - - undefined 1 l +AIRFLOW - - undefined 10 V +THOR - - undefined 10 V +ABDO - - undefined 10 V SO2 0 - undefined 2 % +SaO2 0 - undefined 2 % SV 0 - undefined 100 ml IBP 0 - square 100 mmHg NBP 0 100 square 100 mmHg @@ -18,9 +23,11 @@ CVP 0 - square 10 mmHg HR 0 100 square 100 bpm PULSE 0 - undefined 100 bpm +PR 0 - undefined 100 BPM RESP 0 - undefined 50 bpm SpO2 0 - undefined 10 % Tblood 0 - undefined 1 degC +Temp 0 - undefined 1 degC C.O. 0 - undefined 1 lpm PAWP 0 - undefined 10 mmHg MCL - 2 square 1 mV @@ -29,6 +36,12 @@ V - 2 square 1 mV PLETH - - undefined 1 mV P - - undefined 100 mmHg +Atip - - undefined 1 mV +HVA - - undefined 5 mV +Vtip - - undefined 10 mV record - - undefined 1 mV +record - - undefined 10 V record - - undefined 100 mmHg +record 0 - undefined 100 bpm +record 0 - undefined 100 BPM foobar 0 100 square 100 mmHg diff -Naur --exclude Makefile --exclude info wfdb-10.3.10/conf/version.def wfdb-10.3.11/conf/version.def --- wfdb-10.3.10/conf/version.def 2003-08-03 20:29:00.000000000 -0400 +++ wfdb-10.3.11/conf/version.def 2003-09-15 09:49:40.000000000 -0400 @@ -1,10 +1,10 @@ # file: version.def G. Moody 24 May 2000 -# Last revised: 3 August 2003 +# Last revised: 15 September 2003 # Each release of the WFDB Software Package is identified by a three-part # version number, defined here: MAJOR = 10 MINOR = 3 -RELEASE = 10 +RELEASE = 11 VERSION = $(MAJOR).$(MINOR).$(RELEASE) # RPMRELEASE can be incremented if changes are made between official diff -Naur --exclude Makefile --exclude info wfdb-10.3.10/configure wfdb-10.3.11/configure --- wfdb-10.3.10/configure 2003-03-30 14:48:16.000000000 -0500 +++ wfdb-10.3.11/configure 2003-10-17 15:42:36.000000000 -0400 @@ -1,6 +1,6 @@ #! /bin/sh # file: configure G. Moody 24 May 2000 -# Last revised: 30 March 2003 +# Last revised: 17 October 2003 # Configuration script for the WFDB Software Package # This script was not generated using 'autoconf'. If you can implement @@ -49,7 +49,7 @@ OS=`uname` echo "Configuring the WFDB software package for $OS." -SRCDIR=`pwd` +SRCDIR="`pwd`" cd conf echo "Checking the echo command ..." @@ -62,12 +62,12 @@ fi rm echo.out -PACKAGE=`basename $SRCDIR` +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 "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 diff -Naur --exclude Makefile --exclude info wfdb-10.3.10/data/wfdbcal wfdb-10.3.11/data/wfdbcal --- wfdb-10.3.10/data/wfdbcal 2003-04-09 11:15:05.000000000 -0400 +++ wfdb-10.3.11/data/wfdbcal 2003-10-17 10:48:59.000000000 -0400 @@ -1,5 +1,5 @@ # file: wfdbcal G. Moody June 1991 -# Last revised: 9 April 2003 +# Last revised: 17 October 2003 # Default calibration database for WFDB library # # Format: @@ -16,6 +16,7 @@ # For further details, see wfdbcal(5). ECG - 1 sine 1 mV +ECG - 1 sine 1000 uV EEG - - undefined 0.1 mV EEG - - undefined 100 uV EOG - - undefined 0.1 mV @@ -26,7 +27,11 @@ ABP 0 - square 100 mmHg Resp - - undefined 1 l RESP - - undefined 1 l +AIRFLOW - - undefined 10 V +THOR - - undefined 10 V +ABDO - - undefined 10 V SO2 0 - undefined 2 % +SaO2 0 - undefined 2 % SV 0 - undefined 100 ml IBP 0 - square 100 mmHg NBP 0 100 square 100 mmHg @@ -35,9 +40,11 @@ CVP 0 - square 10 mmHg HR 0 100 square 100 bpm PULSE 0 - undefined 100 bpm +PR 0 - undefined 100 BPM RESP 0 - undefined 50 bpm SpO2 0 - undefined 10 % Tblood 0 - undefined 1 degC +Temp 0 - undefined 1 degC C.O. 0 - undefined 1 lpm PAWP 0 - undefined 10 mmHg @@ -54,7 +61,15 @@ # Miscellaneous pressure signals in the MIMIC Database P - - undefined 100 mmHg +# ECG from implanted devices +Atip - - undefined 1 mV +HVA - - undefined 5 mV +Vtip - - undefined 10 mV + # Definitions for nameless signals with defined units record - - undefined 1 mV record - - undefined 1000 uV +record - - undefined 10 V record - - undefined 100 mmHg +record 0 - undefined 100 bpm +record 0 - undefined 100 BPM diff -Naur --exclude Makefile --exclude info wfdb-10.3.10/doc/wag-src/pltf.1 wfdb-10.3.11/doc/wag-src/pltf.1 --- wfdb-10.3.10/doc/wag-src/pltf.1 2003-04-07 15:06:01.000000000 -0400 +++ wfdb-10.3.11/doc/wag-src/pltf.1 2003-10-17 12:08:06.000000000 -0400 @@ -1,4 +1,4 @@ -.TH PLT 1 "19 December 2002" "plt 2.3" "WFDB Applications Guide" +.TH PLTF 1 "17 October 2003" "plt 2.3" "WFDB Applications Guide" .SH NAME pltf \- make function plots .SH SYNOPSIS diff -Naur --exclude Makefile --exclude info wfdb-10.3.10/doc/wpg-src/wpg0.tex wfdb-10.3.11/doc/wpg-src/wpg0.tex --- wfdb-10.3.10/doc/wpg-src/wpg0.tex 2003-08-03 20:24:19.000000000 -0400 +++ wfdb-10.3.11/doc/wpg-src/wpg0.tex 2003-10-17 11:08:05.000000000 -0400 @@ -488,12 +488,21 @@ WFDB Software Package distribution, for information on any more recent changes that may not be described here. +@unnumberedsubsec Changes in version 10.3.11 + +In @file{signal.c}, several bugs have been identified and fixed. Thanks +to Piotr Wlodarek, who found a buffer overrun in @code{isigopen}. Also, +@code{isgsettime} sometimes performed incorrect seeks on multifrequency +records that had been opened in high-resolution mode; this has been +fixed, together with a related bug that caused the value returned by +@code{strtim("e")} to be calculated incorrectly in some such cases. + @unnumberedsubsec Changes in version 10.3.10 In version 10.3.9, the functions @code{setannstr}, @code{setanndesc}, and @code{setecgstr} did not contain necessary checks to avoid invoking @code{strcmp} with a @code{NULL} argument. These checks have been added in -version 10.3.10. +version 10.3.10. Thanks to Thomas Heldt for reporting this problem. @unnumberedsubsec Changes in version 10.3.9 diff -Naur --exclude Makefile --exclude info wfdb-10.3.10/lib/signal.c wfdb-10.3.11/lib/signal.c --- wfdb-10.3.10/lib/signal.c 2003-07-16 22:09:16.000000000 -0400 +++ wfdb-10.3.11/lib/signal.c 2003-10-17 10:31:23.000000000 -0400 @@ -1,5 +1,5 @@ /* file: signal.c G. Moody 13 April 1989 - Last revised: 16 July 2003 wfdblib 10.3.9 + Last revised: 17 October 2003 wfdblib 10.3.11 WFDB library functions for signals _______________________________________________________________________________ @@ -1451,7 +1451,7 @@ if (ispfmax < 2) /* all signals at the same frequency */ return (getframe(vector)); - if (gvmode == WFDB_LOWRES) {/* return one sample per frame, decimating + if (gvmode != WFDB_HIGHRES) {/* return one sample per frame, decimating (by averaging) if necessary */ unsigned c; long v; @@ -1604,8 +1604,11 @@ } is->info.group = nigroups + g; is->skew = hs->skew; - hs = hsd[++si]; - is = isd[nisig + ++s]; + ++s; + if (++si < sj) { + hs = hsd[si]; + is = isd[nisig + s]; + } } g++; } @@ -2152,7 +2155,7 @@ } } - if (tr != t) { + if (ifreq > (WFDB_Frequency)0 && tr != t) { t = (WFDB_Time)(t * ifreq/sfreq); while (t++ < tr) @@ -2690,9 +2693,10 @@ case 'c': return (cfreq > 0. ? (WFDB_Time)((atof(string+1)-bcount)*f/cfreq) : (WFDB_Time)atol(string+1)); - case 'e': return (in_msrec ? msnsamples : nsamples); + case 'e': return ((in_msrec ? msnsamples : nsamples) * + ((gvmode == WFDB_HIGHRES) ? ispfmax : 1)); case 'f': return ((WFDB_Time)(atol(string+1)*f/ffreq)); - case 'i': return (istime * (gvmode==WFDB_LOWRES ? 1: ispfmax)); + case 'i': return (istime * ((gvmode == WFDB_HIGHRES) ? ispfmax : 1)); case 'o': return (ostime); case 's': return ((WFDB_Time)atol(string+1)); case '[': /* time of day, possibly with date or days since start */ diff -Naur --exclude Makefile --exclude info wfdb-10.3.10/lib/wfdb.h0 wfdb-10.3.11/lib/wfdb.h0 --- wfdb-10.3.10/lib/wfdb.h0 2003-08-03 20:28:04.000000000 -0400 +++ wfdb-10.3.11/lib/wfdb.h0 2003-09-15 09:50:58.000000000 -0400 @@ -1,5 +1,5 @@ /* file: wfdb.h G. Moody 13 June 1983 - Last revised: 3 August 2003 wfdblib 10.3.10 + Last revised: 15 September 2003 wfdblib 10.3.11 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 10 +#define WFDB_RELEASE 11 #define WFDB_NETFILES 1 /* if 1, library includes code for HTTP, FTP clients */ /* Determine what type of compiler is being used. */ diff -Naur --exclude Makefile --exclude info wfdb-10.3.10/NEWS wfdb-10.3.11/NEWS --- wfdb-10.3.10/NEWS 2003-08-03 21:16:23.000000000 -0400 +++ wfdb-10.3.11/NEWS 2003-10-17 11:02:55.000000000 -0400 @@ -1,10 +1,25 @@ +10.3.11: + Isaac Henry provided a fix for 'configure' to avoid a problem that + may occur in a non-standard Cygwin installation. + + In lib/signal.c, several bugs have been identified and fixed. Thanks + to Piotr Wlodarek, who found a buffer overrun in isigopen. Also, + isgsettime sometimes performed incorrect seeks on multifrequency + records that had been opened in high-resolution mode; this has been + fixed, together with a related bug that caused the value returned by + strtim("e") to be calculated incorrectly in some such cases. + + New signal types and units have been added to the WFDB calibration + database (data/wfdbcal). + 10.3.10: In version 10.3.9, the functions setannstr, setanndesc, and setecgstr (in lib/annot.c) did not contain necessary checks to avoid invoking strcmp with a NULL argument. These checks have been added in version - 10.3.10. In the internal function wfdb_addtopath (in lib/wfdbio.c), - an extra character was appended when adding a component to the WFDB - path (in version 10.3.9 only); this has also been corrected. + 10.3.10. Thanks to Thomas Heldt for reporting this problem. In the + internal function wfdb_addtopath (in lib/wfdbio.c), an extra character + was appended when adding a component to the WFDB path (in version + 10.3.9 only); this has also been corrected. WAVE now incorporates a simplified method for synchronizing multiple windows. The WAVE version number has been changed from 6.6 to 6.7.