The following commit has been merged in the master branch:
commit d0d5f1a5abf1a491ce6f8a0b5a37225dc5fea61b
Author: Andrei Zavada <[email protected]>
Date:   Sat Apr 20 00:29:48 2013 +0300

    data_record_size can be a float in edf+ files

diff --git a/src/libsigfile/edf.cc b/src/libsigfile/edf.cc
index 9136e17..da07a95 100644
--- a/src/libsigfile/edf.cc
+++ b/src/libsigfile/edf.cc
@@ -565,7 +565,7 @@ _parse_header()
                header_length = n_data_records = data_record_size = n_channels 
= 0;
                sscanf( header.header_length,    "%8zu", &header_length);
                sscanf( header.n_data_records,   "%8zu", &n_data_records);
-               sscanf( header.data_record_size, "%8zu", &data_record_size);
+               sscanf( header.data_record_size, "%8lg", &data_record_size); // 
edf+ supports fractions
                sscanf( header.n_channels,       "%4zu", &n_channels);
 
                if ( !header_length || !n_data_records || !data_record_size || 
!n_channels ) {
@@ -906,7 +906,7 @@ details( bool channels_too) const
                          " Time\t: %s\n"
                          " # of channels\t: %zu\n"
                          " # of records\t: %zu\n"
-                         " Record length\t: %zu sec\n",
+                         " Record size\t: %g sec\n",
                          filename(),
                          subtype_s(),
                          patient_id(),
diff --git a/src/libsigfile/edf.hh b/src/libsigfile/edf.hh
index febcb2c..573b261 100644
--- a/src/libsigfile/edf.hh
+++ b/src/libsigfile/edf.hh
@@ -408,8 +408,8 @@ class CEDFFile
        SEDFHeader header;
 
       // (relevant converted integers)
-       size_t  data_record_size,
-               n_data_records;
+       double  data_record_size;
+       size_t  n_data_records;
 
       // channels
        struct SSignal {

-- 
Sleep experiment manager

_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

Reply via email to