Mercurial > hg > svcore

diff data/model/FFTModel.h @ 1159:444d133b5ab7 3.0-integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch "tony-2.0-integration"
author Chris Cannam
date Thu, 04 Feb 2016 11:13:39 +0000
parents 546d4e417346 e94719f941ba
children 12a8daa89970
line wrap: on
line diff
--- a/data/model/FFTModel.h	Fri Jan 22 18:12:06 2016 +0000
+++ b/data/model/FFTModel.h	Thu Feb 04 11:13:39 2016 +0000
@@ -101,7 +101,7 @@
     float getPhaseAt(int x, int y) const;
     void getValuesAt(int x, int y, float &real, float &imaginary) const;
     bool getMagnitudesAt(int x, float *values, int minbin = 0, int count = 0) const;
-    bool getNormalizedMagnitudesAt(int x, float *values, int minbin = 0, int count = 0) const;
+    float getNormalizedMagnitudesAt(int x, float *values, int minbin = 0, int count = 0) const; // returns maximum of unnormalized magnitudes
     bool getPhasesAt(int x, float *values, int minbin = 0, int count = 0) const;
     bool getValuesAt(int x, float *reals, float *imaginaries, int minbin = 0, int count = 0) const;