# HG changeset patch
# User Jamie Bullock <jamie@postlude.co.uk>
# Date 1190622206 0
# Node ID 61fe1af213cd0cebdd3465c93d3c85312b722e7a
# Parent  35a3bb5c3ffd8b2b486098ab7a7eb2a905361b0c
Made xtract_loudness() more permissive, so it doesn't crash if N > BARK_BANDS

diff -r 35a3bb5c3ffd -r 61fe1af213cd src/scalar.c
--- a/src/scalar.c	Thu Sep 06 14:05:37 2007 +0000
+++ b/src/scalar.c	Mon Sep 24 08:23:26 2007 +0000
@@ -419,8 +419,10 @@
 
     int n = N, rv;
 
-    if(n > XTRACT_BARK_BANDS) 
+    if(n > XTRACT_BARK_BANDS){
+	n = XTRACT_BARK_BANDS; 
 	rv = XTRACT_BAD_VECTOR_SIZE; 
+    }
     else
 	rv = XTRACT_SUCCESS;
 
diff -r 35a3bb5c3ffd -r 61fe1af213cd swig/java/Makefile.am
--- a/swig/java/Makefile.am	Thu Sep 06 14:05:37 2007 +0000
+++ b/swig/java/Makefile.am	Mon Sep 24 08:23:26 2007 +0000
@@ -20,7 +20,7 @@
 lib_LTLIBRARIES = libjxtract.la
 libjxtract_la_SOURCES = $(srcdir)/xtract_wrap.c $(SWIG_SOURCES)
 libjxtract_la_CFLAGS = $(SWIG_PYTHON_CPPFLAGS) -I$(top_srcdir)/src
-ibjxtract_la_LDFLAGS = -module -lxtract
+libjxtract_la_LDFLAGS = -module -lxtract
 libjxtract_la_LIBADD = $(top_srcdir)/src/libxtract.la
 
 SWIG_JAVA_OPT = -java -package xtract.core