[med-svn] [aghermann] 21/34: ICM

[andrei zavada]

This is an automated email from the git hooks/post-receive script.

hmmr-guest pushed a commit to branch master
in repository aghermann.

commit 2201af86d5c41322375cc3925b7add10ca7001c5
Author: Andrei Zavada <hmmr at ra>
Date:   Fri Nov 15 23:52:07 2013 +0200

    ICM
---
 upstream/src/aghermann/expdesign/recording.cc | 2 +-
 upstream/src/libmetrics/page-metrics-base.cc  | 6 ------
 upstream/src/libmetrics/page-metrics-base.hh  | 7 ++++++-
 upstream/src/libsigproc/ext-filters.ii        | 2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/upstream/src/aghermann/expdesign/recording.cc b/upstream/src/aghermann/expdesign/recording.cc
index 2854f30..6f8dd26 100644
--- a/upstream/src/aghermann/expdesign/recording.cc
+++ b/upstream/src/aghermann/expdesign/recording.cc
@@ -186,7 +186,7 @@ CProfile (CRecording& M,
 
         if ( pz - pa != (int)M.total_pages() ) {
                 APPLOG_WARN ("correcting end page to match total page count in EDF: %d->%zu",
-                          pz, pa + M.total_pages());
+                             pz, pa + M.total_pages());
                 pz = pa + M.total_pages();
         }
         _pages_in_bed += (pz-pa);
diff --git a/upstream/src/libmetrics/page-metrics-base.cc b/upstream/src/libmetrics/page-metrics-base.cc
index 85760e4..8a5afb7 100644
--- a/upstream/src/libmetrics/page-metrics-base.cc
+++ b/upstream/src/libmetrics/page-metrics-base.cc
@@ -70,12 +70,6 @@ samplerate() const
         return _using_F().samplerate( _using_sig_no);
 }
 
-size_t
-metrics::CProfile::
-steps() const
-{
-        return (_using_F().recording_time() - pagesize) / step;
-}
 
 
 void
diff --git a/upstream/src/libmetrics/page-metrics-base.hh b/upstream/src/libmetrics/page-metrics-base.hh
index 279a81b..5d9f90d 100644
--- a/upstream/src/libmetrics/page-metrics-base.hh
+++ b/upstream/src/libmetrics/page-metrics-base.hh
@@ -125,7 +125,12 @@ class CProfile
         bins() const
                 { return _bins; }
 
-        size_t steps() const; // overlapping pages
+        size_t
+        steps() const // overlapping pages
+                {
+                        return _using_F().recording_time() / step;
+                }
+
         size_t samplerate() const;
 
       // accessors
diff --git a/upstream/src/libsigproc/ext-filters.ii b/upstream/src/libsigproc/ext-filters.ii
index 129d421..f6a294b 100644
--- a/upstream/src/libsigproc/ext-filters.ii
+++ b/upstream/src/libsigproc/ext-filters.ii
@@ -71,7 +71,7 @@ apply( const valarray<T>& in, bool use_first_sample_to_reset)
                         filter_state_z[j] = filter_state_z[j-1];
         }
 
-        return out;
+        return move(out);
 }
 
 // Local Variables:

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/aghermann.git