[med-svn] [aghermann] 16/31: correctly determine min/max in sigproc::envelope

[andrei zavada]

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

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

commit f6753a7c7f18acd8eed42b57836caff392a53821
Author: Andrei Zavada <hmmr at ra>
Date:   Sat Nov 9 17:10:44 2013 +0200

    correctly determine min/max in sigproc::envelope
---
 upstream/src/libsigproc/sigproc.ii |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/upstream/src/libsigproc/sigproc.ii b/upstream/src/libsigproc/sigproc.ii
index 8dd0548..7dab3d1 100644
--- a/upstream/src/libsigproc/sigproc.ii
+++ b/upstream/src/libsigproc/sigproc.ii
@@ -130,16 +130,16 @@ envelope( const SSignalRef<T>& in,
         // auto dS = derivative(in.signal); // will skip over many extrema due to quantization
         ssize_t i;
         for ( i = dh2; i < n_samples-dh2; ++i ) {
-                auto lmax = S[ slice (i-dh2, dh2+dh2, 1) ].max();
-                if ( S[i] == lmax && i != i-dh2 && i+dh2 ) {
+                auto lmax = S[ slice (i-dh2, dh2+dh2+1, 1) ].max();
+                if ( S[i] == lmax && i != i-dh2 && i != i+dh2 ) {
                         maxi.push_back(i);
                         i += dh2 - 1;
                         continue;
                 }
         }
         for ( i = dh2; i < n_samples-dh2; ++i ) {
-                auto lmin = S[ slice (i-dh2, dh2+dh2, 1) ].min();
-                if ( S[i] == lmin && i != i-dh2 && i+dh2 ) {
+                auto lmin = S[ slice (i-dh2, dh2+dh2+1, 1) ].min();
+                if ( S[i] == lmin && i != i-dh2 && i != i+dh2 ) {
                         mini.push_back(i);
                         i += dh2 - 1;
                 }

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