[med-svn] [SCM] aghermann branch, master, updated. 3603e7ef1289f9ec79a3eb415b6d141166e9498a

[Andrei Zavada]

The following commit has been merged in the master branch:
commit 5c4c5dff91f1163c4aa30d2a160dcb483f85bf2b
Author: Andrei Zavada <johnhom...@gmail.com>
Date:   Mon Jul 15 01:16:51 2013 +0300

    CSource::get_signal_* sz arg means 'last sample', so size()-1

diff --git a/src/libsigfile/edf.hh b/src/libsigfile/edf.hh
index 04f0358..cbf1d9c 100644
--- a/src/libsigfile/edf.hh
+++ b/src/libsigfile/edf.hh
@@ -195,12 +195,12 @@ class CEDFFile
        valarray<TFloat>
        get_signal_original( const int h) const // there is a 
CSource::get_signal_original already, but this one is a little better
                { return get_region_original_smpl(
-                               h, 0, n_data_records * 
operator[](h).samples_per_record); }
+                               h, 0, n_data_records * 
operator[](h).samples_per_record - 1); }
 
        valarray<TFloat>
        get_signal_filtered( const int h) const
                { return get_region_filtered_smpl(
-                               h, 0, n_data_records * 
operator[](h).samples_per_record); }
+                               h, 0, n_data_records * 
operator[](h).samples_per_record - 1); }
 
       // put signal
        int
diff --git a/src/libsigfile/tsv.hh b/src/libsigfile/tsv.hh
index 528639a..a80edb6 100644
--- a/src/libsigfile/tsv.hh
+++ b/src/libsigfile/tsv.hh
@@ -210,11 +210,11 @@ class CTSVFile
 
        valarray<TFloat>
        get_signal_original( const int h) const // there is a 
CSource::get_signal_original already, but this one is a little better
-               { return get_region_original_smpl( h, 0, 
channels.front().data.size()); }
+               { return get_region_original_smpl( h, 0, 
channels.front().data.size()-1); }
 
        valarray<TFloat>
        get_signal_filtered( const int h) const
-               { return get_region_filtered_smpl( h, 0, 
channels.front().data.size()); }
+               { return get_region_filtered_smpl( h, 0, 
channels.front().data.size()-1); }
 
       // put signal
        int put_region_smpl( int, const valarray<TFloat>&, size_t);

-- 
Sleep experiment manager

_______________________________________________
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit