Mercurial > hg > segmenter-vamp-plugin

changeset 62:8bd9b79c9e83 mirex2013

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Avoid returning unwanted output from process; move Linux makefile to linux rather than linux64 as there's nothing 64-bit-specific about it
author Chris Cannam
date Thu, 13 Jun 2013 17:40:24 +0100
parents 0df6322d83bb
children 4f6dfba9e390
files Makefile.linux Makefile.linux64 segmentino/Segmentino.cpp
diffstat 3 files changed, 13 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Makefile.linux	Thu Jun 13 17:40:24 2013 +0100
@@ -0,0 +1,13 @@
+
+CFLAGS := -O3 -fPIC -ftree-vectorize
+
+#CFLAGS := -Wall -g -fPIC 
+
+CXXFLAGS  := $(CFLAGS)
+
+LDFLAGS	  := -shared -Wl,-Bsymbolic -Wl,--version-script=segmentino/vamp-plugin.map
+
+PLUGIN_EXT   := .so
+
+include Makefile.inc
+
--- a/Makefile.linux64	Thu Jun 13 16:39:46 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-
-CFLAGS := -O3 -fPIC -ftree-vectorize
-
-#CFLAGS := -Wall -g -fPIC 
-
-CXXFLAGS  := $(CFLAGS)
-
-LDFLAGS	  := -shared -Wl,-Bsymbolic -Wl,--version-script=segmentino/vamp-plugin.map
-
-PLUGIN_EXT   := .so
-
-include Makefile.inc
-
--- a/segmentino/Segmentino.cpp	Thu Jun 13 16:39:46 2013 +0100
+++ b/segmentino/Segmentino.cpp	Thu Jun 13 17:40:24 2013 +0100
@@ -653,8 +653,6 @@
     m_pluginFrameCount++;
     
     FeatureSet fs;
-    fs[m_logscalespecOutputNumber].push_back(
-        m_chromadata->logSpectrum.back());
     return fs;
 }