# HG changeset patch
# User Chris Cannam <c.cannam@qmul.ac.uk>
# Date 1160742524 0
# Node ID 2fbfe5e42ad403db81b49f8148c8d4138224715c
# Parent  3b02e26b23ffe6b08953d21f1778f35afe4629d3
* Avoid NaNs in output values

diff -r 3b02e26b23ff -r 2fbfe5e42ad4 plugins/ChromagramPlugin.cpp
--- a/plugins/ChromagramPlugin.cpp	Thu Oct 05 15:50:30 2006 +0000
+++ b/plugins/ChromagramPlugin.cpp	Fri Oct 13 12:28:44 2006 +0000
@@ -336,7 +336,9 @@
     Feature feature;
     feature.hasTimestamp = false;
     for (size_t i = 0; i < m_config.BPO; ++i) {
-	feature.values.push_back(output[i]);
+        double value = output[i];
+        if (isnan(value)) value = 0.0;
+	feature.values.push_back(value);
     }
     feature.label = "";
 
diff -r 3b02e26b23ff -r 2fbfe5e42ad4 plugins/ConstantQSpectrogram.cpp
--- a/plugins/ConstantQSpectrogram.cpp	Thu Oct 05 15:50:30 2006 +0000
+++ b/plugins/ConstantQSpectrogram.cpp	Fri Oct 13 12:28:44 2006 +0000
@@ -338,8 +338,12 @@
     Feature feature;
     feature.hasTimestamp = false;
     for (size_t i = 0; i < m_bins; ++i) {
-	feature.values.push_back(sqrt(cqre[i] * cqre[i] +
-                                      cqim[i] * cqim[i]));
+        double re = cqre[i];
+        double im = cqim[i];
+        if (isnan(re)) re = 0.0;
+        if (isnan(im)) im = 0.0;
+        double value = sqrt(re * re + im * im);
+	feature.values.push_back(value);
     }
     feature.label = "";
 
diff -r 3b02e26b23ff -r 2fbfe5e42ad4 qm-vamp-plugins.pro
--- a/qm-vamp-plugins.pro	Thu Oct 05 15:50:30 2006 +0000
+++ b/qm-vamp-plugins.pro	Fri Oct 13 12:28:44 2006 +0000
@@ -12,7 +12,7 @@
 INCLUDEPATH += ../vamp-plugin-sdk ../qm-dsp
 LIBPATH += ../vamp-plugin-sdk/vamp-sdk ../qm-dsp
 
-LIBS += -lqm-dsp -lvamp-sdk
+LIBS += -Wl,-Bstatic -lqm-dsp -lvamp-sdk -Wl,-Bdynamic
 
 DEPENDPATH += plugins
 INCLUDEPATH += . plugins