Mercurial > hg > sonic-annotator

changeset 138:ee56e3e9eeb5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add -Werror in debug mode, and fix errors resulting from it
author Chris Cannam
date Mon, 13 Oct 2014 11:42:54 +0100
parents caf05503bf42
children a4bee1a374b4 ad425b9096bd
files configure configure.ac runner/AudioDBFeatureWriter.cpp runner/DefaultFeatureWriter.cpp runner/FeatureExtractionManager.cpp tests/include.sh tests/test-helpfulflags/test-helpfulflags.sh
diffstat 7 files changed, 29 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Mon Oct 13 10:16:37 2014 +0100
+++ b/configure	Mon Oct 13 11:42:54 2014 +0100
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Sonic Annotator 1.0.
+# Generated by GNU Autoconf 2.69 for Sonic Annotator 1.1-hg.
 #
 # Report bugs to <cannam@all-day-breakfast.com>.
 #
@@ -580,8 +580,8 @@
 # Identity of this package.
 PACKAGE_NAME='Sonic Annotator'
 PACKAGE_TARNAME='sonic-annotator'
-PACKAGE_VERSION='1.0'
-PACKAGE_STRING='Sonic Annotator 1.0'
+PACKAGE_VERSION='1.1-hg'
+PACKAGE_STRING='Sonic Annotator 1.1-hg'
 PACKAGE_BUGREPORT='cannam@all-day-breakfast.com'
 PACKAGE_URL=''
 
@@ -1313,7 +1313,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Sonic Annotator 1.0 to adapt to many kinds of systems.
+\`configure' configures Sonic Annotator 1.1-hg to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1374,7 +1374,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Sonic Annotator 1.0:";;
+     short | recursive ) echo "Configuration of Sonic Annotator 1.1-hg:";;
    esac
   cat <<\_ACEOF
 
@@ -1509,7 +1509,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Sonic Annotator configure 1.0
+Sonic Annotator configure 1.1-hg
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1849,7 +1849,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Sonic Annotator $as_me 1.0, which was
+It was created by Sonic Annotator $as_me 1.1-hg, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4186,7 +4186,7 @@
 CXXFLAGS_MINIMAL="$AUTOCONF_CXXFLAGS"
 
 if test "x$GCC" = "xyes"; then
-        CXXFLAGS_DEBUG="-Wall -Woverloaded-virtual -Wextra -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -g -pipe"
+        CXXFLAGS_DEBUG="-Wall -Werror -Woverloaded-virtual -Wextra -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -g -pipe"
    	CXXFLAGS_RELEASE="-g0 -O2 -Wall -pipe"
    	CXXFLAGS_MINIMAL="-g0 -O0"
 fi
@@ -7092,7 +7092,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Sonic Annotator $as_me 1.0, which was
+This file was extended by Sonic Annotator $as_me 1.1-hg, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7145,7 +7145,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Sonic Annotator config.status 1.0
+Sonic Annotator config.status 1.1-hg
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
--- a/configure.ac	Mon Oct 13 10:16:37 2014 +0100
+++ b/configure.ac	Mon Oct 13 11:42:54 2014 +0100
@@ -1,5 +1,5 @@
 
-AC_INIT([Sonic Annotator], [1.0], cannam@all-day-breakfast.com)
+AC_INIT([Sonic Annotator], [1.1-hg], cannam@all-day-breakfast.com)
 
 AC_CONFIG_SRCDIR(runner/main.cpp)
 
@@ -50,7 +50,7 @@
 CXXFLAGS_MINIMAL="$AUTOCONF_CXXFLAGS"
 
 if test "x$GCC" = "xyes"; then
-        CXXFLAGS_DEBUG="-Wall -Woverloaded-virtual -Wextra -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -g -pipe"
+        CXXFLAGS_DEBUG="-Wall -Werror -Woverloaded-virtual -Wextra -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -g -pipe"
    	CXXFLAGS_RELEASE="-g0 -O2 -Wall -pipe"
    	CXXFLAGS_MINIMAL="-g0 -O0"
 fi
--- a/runner/AudioDBFeatureWriter.cpp	Mon Oct 13 10:16:37 2014 +0100
+++ b/runner/AudioDBFeatureWriter.cpp	Mon Oct 13 11:42:54 2014 +0100
@@ -99,7 +99,7 @@
 }
 
 void AudioDBFeatureWriter::write(QString trackid,
-                                 const Transform &transform,
+                                 const Transform &,
                                  const Vamp::Plugin::OutputDescriptor& output, 
                                  const Vamp::Plugin::FeatureList& featureList,
                                  std::string summaryType)
@@ -135,8 +135,8 @@
     if (output.binCount == 0)    // this kind of feature just outputs timestamps and labels, assume of no interest to audioDB
         return;    
         
-    for (int i = 0; i < featureList.size(); ++i)
-    {
+    for (int i = 0; i < (int)featureList.size(); ++i) {
+
         // replace output files if necessary
         if (replaceDBFile(trackid, output.identifier))
         {                
@@ -156,7 +156,7 @@
         }
 
         if (dbfiles[output.identifier].ofs) {
-            for (int j = 0; j < featureList[i].values.size(); ++j)
+            for (int j = 0; j < (int) featureList[i].values.size(); ++j)
                 *dbfiles[output.identifier].ofs /*<< ios::binary*/ << featureList[i].values[j];
         
             // write the *end* time of each feature to the timestamp file
--- a/runner/DefaultFeatureWriter.cpp	Mon Oct 13 10:16:37 2014 +0100
+++ b/runner/DefaultFeatureWriter.cpp	Mon Oct 13 11:42:54 2014 +0100
@@ -20,8 +20,8 @@
 
 #include "DefaultFeatureWriter.h"
 
-void DefaultFeatureWriter::write(QString trackid,
-                                 const Transform &transform,
+void DefaultFeatureWriter::write(QString,
+                                 const Transform &,
                                  const Vamp::Plugin::OutputDescriptor& output,
                                  const Vamp::Plugin::FeatureList& featureList,
                                  std::string summaryType)
@@ -39,8 +39,8 @@
      
      */
     
-    for (int i = 0; i < featureList.size(); ++i)
-    {
+    for (int i = 0; i < (int)featureList.size(); ++i) {
+
         if (summaryType == "") {
             cout << "<feature>" << endl;
         } else {
@@ -56,8 +56,7 @@
         if (featureList[i].values.size() > 0)
         {
             cout << "\t<values>";
-            for (int j = 0; j < featureList[i].values.size(); ++j)
-            {
+            for (int j = 0; j < (int)featureList[i].values.size(); ++j) {
                 if (j > 0)
                     cout << " ";
                 if (output.binNames.size() > 0)
--- a/runner/FeatureExtractionManager.cpp	Mon Oct 13 10:16:37 2014 +0100
+++ b/runner/FeatureExtractionManager.cpp	Mon Oct 13 11:42:54 2014 +0100
@@ -145,6 +145,9 @@
         return PluginInputDomainAdapter::NuttallWindow;
     case BlackmanHarrisWindow:
         return PluginInputDomainAdapter::BlackmanHarrisWindow;
+    case GaussianWindow:
+    case ParzenWindow:
+        // Not supported in Vamp SDK, fall through
     default:
         cerr << "ERROR: Unknown or unsupported window type \"" << t << "\", using Hann (\"" << HanningWindow << "\")" << endl;
         return PluginInputDomainAdapter::HanningWindow;
--- a/tests/include.sh	Mon Oct 13 10:16:37 2014 +0100
+++ b/tests/include.sh	Mon Oct 13 11:42:54 2014 +0100
@@ -1,11 +1,12 @@
 
 mypath=`dirname $0`
 
+version=1.1-hg
+nextversion=1.1
+
 testdir=$mypath/..
 r=$testdir/../sonic-annotator
 
-version=1.1
-
 audiopath=$testdir/audio
 
 percplug=vamp:vamp-example-plugins:percussiononsets
--- a/tests/test-helpfulflags/test-helpfulflags.sh	Mon Oct 13 10:16:37 2014 +0100
+++ b/tests/test-helpfulflags/test-helpfulflags.sh	Mon Oct 13 11:42:54 2014 +0100
@@ -35,8 +35,8 @@
 $r --minversion $version || \
     fail "Returned failure code when run with --minversion $version"
 
-$r --minversion ${version}.1 2>/dev/null && \
-    fail "Returned success code when run with --minversion $version"
+$r --minversion $nextversion 2>/dev/null && \
+    fail "Returned success code when run with --minversion $nextversion"
 
 $r --minversion 63.9 2>/dev/null && \
     fail "Returned success code when run with --minversion 63.9"