# HG changeset patch
# User Sean Enderby <sean.enderby@gmail.com>
# Date 1393249393 0
# Node ID 5ca682ce339232cd98d35c36ed5a4e2486883af1
# Parent  fdbef1474be94ea425266b095ead1163ba6f3003# Parent  ae2225b96ae16649c10315ac8ebfa7e81f59050a
Merge branch 'master' of https://github.com/jamiebullock/LibXtract

diff -r ae2225b96ae1 -r 5ca682ce3392 src/scalar.c
--- a/src/scalar.c	Sun Feb 23 21:32:14 2014 +0000
+++ b/src/scalar.c	Mon Feb 24 13:43:13 2014 +0000
@@ -623,7 +623,7 @@
 int xtract_spectral_inharmonicity(const double *data, const int N, const void *argv, double *result)
 {
 
-    int n = N >> 1;
+    int n = N >> 1, h = 0;
     double num = 0.0, den = 0.0, fund;
     const double *freqs, *amps;
 
@@ -635,7 +635,8 @@
     {
         if(amps[n])
         {
-            num += fabs(freqs[n] - n * fund) * XTRACT_SQ(amps[n]);
+            h = round(freqs[n] / fund);
+            num += fabs(freqs[n] - h * fund) * XTRACT_SQ(amps[n]);
             den += XTRACT_SQ(amps[n]);
         }
     }