diff -Naur --exclude Makefile --exclude info wfdb-10.5.11/doc/wpg-src/wpg0.tex wfdb-10.5.12/doc/wpg-src/wpg0.tex --- wfdb-10.5.11/doc/wpg-src/wpg0.tex 2012-04-09 13:07:46.000000000 -0400 +++ wfdb-10.5.12/doc/wpg-src/wpg0.tex 2012-04-25 08:45:16.000000000 -0400 @@ -3862,6 +3862,7 @@ @c @group @node findsig, counter conversion, setbasetime, miscellaneous functions +@unnumberedsubsec findsig @findex findsig (10.4.12) @cindex signal name @cindex signal number @@ -9048,6 +9049,13 @@ @unnumberedsec WFDB 10.5 +@unnumberedsubsec Changes in version 10.5.12 (25 April 2012) + +When called with a NULL argument, getinfo() sometimes behaves differently in +WFDB library version 10.5.11 than it does in previous versions. This release +restores the previous behavior. Thanks to Benjamin Moody for reporting this +issue. + @unnumberedsubsec Changes in version 10.5.11 (6 April 2012) This release of the WFDB library introduces support for @file{.info} files. diff -Naur --exclude Makefile --exclude info wfdb-10.5.11/install-wave32 wfdb-10.5.12/install-wave32 --- wfdb-10.5.11/install-wave32 2010-06-01 10:14:24.000000000 -0400 +++ wfdb-10.5.12/install-wave32 2012-04-25 08:19:17.000000000 -0400 @@ -1,6 +1,6 @@ #! /bin/sh # file: install-wave32 G. Moody 7 October 2008 -# Last revised: 1 June 2010 for Fedora 12 +# Last revised: 25 April 2012 # Build and install WAVE on 64-bit Linux # # *** Fedora 12 users: if this script fails, see the note at the end! *** @@ -109,7 +109,7 @@ # commands: make clean -./configure -m32 +./configure -m32 $* cd lib make install diff -Naur --exclude Makefile --exclude info wfdb-10.5.11/lib/signal.c wfdb-10.5.12/lib/signal.c --- wfdb-10.5.11/lib/signal.c 2012-04-06 14:49:14.000000000 -0400 +++ wfdb-10.5.12/lib/signal.c 2012-04-24 16:20:19.000000000 -0400 @@ -1,5 +1,5 @@ /* file: signal.c G. Moody 13 April 1989 - Last revised: 6 April 2012 wfdblib 10.5.11 + Last revised: 24 April 2012 wfdblib 10.5.12 WFDB library functions for signals _______________________________________________________________________________ @@ -3043,8 +3043,11 @@ static int i; WFDB_FILE *ifile; + if (record) + wfdb_freeinfo(); + if (pinfo == NULL) { /* info for record has not yet been read */ - if (record == NULL) { + if (record == NULL && (record = wfdb_getirec()) == NULL) { wfdb_error("getinfo: caller did not specify record name\n"); return (NULL); } diff -Naur --exclude Makefile --exclude info wfdb-10.5.11/lib/wfdb.h wfdb-10.5.12/lib/wfdb.h --- wfdb-10.5.11/lib/wfdb.h 2012-04-09 13:08:35.000000000 -0400 +++ wfdb-10.5.12/lib/wfdb.h 2012-04-25 08:19:35.000000000 -0400 @@ -32,7 +32,7 @@ /* WFDB library version. */ #define WFDB_MAJOR 10 #define WFDB_MINOR 5 -#define WFDB_RELEASE 11 +#define WFDB_RELEASE 12 #define WFDB_NETFILES 1 /* if 1, library includes code for HTTP, FTP clients */ #define WFDB_NETFILES_LIBCURL 1 diff -Naur --exclude Makefile --exclude info wfdb-10.5.11/lib/wfdbio.c wfdb-10.5.12/lib/wfdbio.c --- wfdb-10.5.11/lib/wfdbio.c 2012-04-06 12:29:39.000000000 -0400 +++ wfdb-10.5.12/lib/wfdbio.c 2012-04-24 16:18:31.000000000 -0400 @@ -1,5 +1,5 @@ /* file: wfdbio.c G. Moody 18 November 1988 - Last revised: 6 April 2012 wfdblib 10.5.11 + Last revised: 24 April 2012 wfdblib 10.5.12 Low-level I/O functions for the WFDB library _______________________________________________________________________________ @@ -66,6 +66,7 @@ wfdb_checkname (checks record and annotator names for validity) wfdb_striphea [10.4.5] (removes trailing '.hea' from a record name, if present) wfdb_setirec [9.7] (saves current record name) + wfdb_getirec [10.5.12] (gets current record name) (Numbers in brackets in the lists above indicate the first version of the WFDB library that included the corresponding function. Functions not so marked @@ -1084,6 +1085,11 @@ } } +char *wfdb_getirec(void) +{ + return (*irec ? irec: NULL); +} + /* Remove trailing '.hea' from a record name, if present. */ void wfdb_striphea(char *p) { diff -Naur --exclude Makefile --exclude info wfdb-10.5.11/lib/wfdblib.h wfdb-10.5.12/lib/wfdblib.h --- wfdb-10.5.11/lib/wfdblib.h 2012-04-06 15:43:23.000000000 -0400 +++ wfdb-10.5.12/lib/wfdblib.h 2012-04-25 08:19:35.000000000 -0400 @@ -1,5 +1,5 @@ /* file: wfdblib.h G. Moody 13 April 1989 - Last revised: 6 April 2012 wfdblib 10.5.11 + Last revised: 24 April 2012 wfdblib 10.5.12 External definitions for WFDB library private functions _______________________________________________________________________________ @@ -96,9 +96,9 @@ variable is not set. This value is edited by the configuration script (../configure), which also edits this block of comments to match. - If WFDB_NETFILES support is disabled, the string ". /home/george/Desktop/wfdb-10.5.11/build/database" is + If WFDB_NETFILES support is disabled, the string ". /usr/local/database" is usually sufficient for a default WFDB path, thus restricting the search for - WFDB files to the current directory ("."), followed by /home/george/Desktop/wfdb-10.5.11/build/database). + WFDB files to the current directory ("."), followed by /usr/local/database). If WFDB_NETFILES support is enabled, the first setting below adds the web-accessible PhysioBank databases to the default path; you may wish to @@ -107,9 +107,9 @@ */ #ifndef WFDB_NETFILES -# define DEFWFDB ". /home/george/Desktop/wfdb-10.5.11/build/database" +# define DEFWFDB ". /usr/local/database" #else -# define DEFWFDB ". /home/george/Desktop/wfdb-10.5.11/build/database http://physionet.org/physiobank/database" +# define DEFWFDB ". /usr/local/database http://physionet.org/physiobank/database" #endif /* Mac OS 9 and earlier, only: The value of DEFWFDB given below specifies @@ -323,6 +323,7 @@ extern WFDB_FILE *wfdb_fopen(char *fname, const char *mode); extern int wfdb_fprintf(WFDB_FILE *fp, const char *format, ...); extern void wfdb_setirec(const char *record_name); +extern char *wfdb_getirec(void); #if WFDB_NETFILES extern void wfdb_clearerr(WFDB_FILE *fp); diff -Naur --exclude Makefile --exclude info wfdb-10.5.11/lib/wfdblib.h0 wfdb-10.5.12/lib/wfdblib.h0 --- wfdb-10.5.11/lib/wfdblib.h0 2012-04-06 14:22:38.000000000 -0400 +++ wfdb-10.5.12/lib/wfdblib.h0 2012-04-24 16:23:20.000000000 -0400 @@ -1,5 +1,5 @@ /* file: wfdblib.h G. Moody 13 April 1989 - Last revised: 6 April 2012 wfdblib 10.5.11 + Last revised: 24 April 2012 wfdblib 10.5.12 External definitions for WFDB library private functions _______________________________________________________________________________ @@ -323,6 +323,7 @@ extern WFDB_FILE *wfdb_fopen(char *fname, const char *mode); extern int wfdb_fprintf(WFDB_FILE *fp, const char *format, ...); extern void wfdb_setirec(const char *record_name); +extern char *wfdb_getirec(void); #if WFDB_NETFILES extern void wfdb_clearerr(WFDB_FILE *fp); diff -Naur --exclude Makefile --exclude info wfdb-10.5.11/NEWS wfdb-10.5.12/NEWS --- wfdb-10.5.11/NEWS 2012-04-09 13:32:01.760522095 -0400 +++ wfdb-10.5.12/NEWS 2012-04-25 08:54:40.548019711 -0400 @@ -1,3 +1,10 @@ +10.5.12 (24 April 2012): + + When called with a NULL argument, getinfo() sometimes behaves + differently in WFDB library version 10.5.11 than it does in previous + versions. This release restores the previous behavior. Thanks to + Benjamin Moody for reporting this issue. + 10.5.11 (6 April 2012): This release of the WFDB library introduces support for '.info' files. These are files containing 'info' strings in the same format as those