[Pkg-octave-commit] [SCM] octave branch, master, updated. 3.2.2-2-15-g3f253ea

[Thomas Weber]

The following commit has been merged in the master branch:
commit 11ab21bbbfca64e2c8f4b985876fc8f6010f64db
Author: Thomas Weber <thomas.weber.mail at gmail.com>
Date:   Wed Feb 17 20:58:49 2010 +0100

    Bug fix for 567975

diff --git a/debian/changelog b/debian/changelog
index 0a13d79..c66a37b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+octave3.2 (3.2.4-2) UNRELEASED; urgency=low
+
+  * New patch: filter_empty_vector; let filter() handle empty vectors (closes:
+    #567975). Thanks to John Eaton for the patch
+
+ -- Thomas Weber <thomas.weber.mail at gmail.com>  Wed, 17 Feb 2010 20:57:25 +0100
+
 octave3.2 (3.2.4-1) unstable; urgency=low
 
   * New upstream release 
diff --git a/debian/in/series b/debian/in/series
index 59120eb..1a56151 100644
--- a/debian/in/series
+++ b/debian/in/series
@@ -13,4 +13,5 @@ datenum-vector-input-any-orientation.diff
 no_pdf_in_print.diff
 dont_set_helvetica-3.1.diff
 normal-markersize.diff
+filter_empty_vector
 :]
diff --git a/debian/patches/filter_empty_vector b/debian/patches/filter_empty_vector
new file mode 100644
index 0000000..f6cace5
--- /dev/null
+++ b/debian/patches/filter_empty_vector
@@ -0,0 +1,17 @@
+From:  "John W. Eaton" <jwe at octave.org>
+Subject: Don't crash on filtering an empty vector
+Origin: upstream, http://hg.savannah.gnu.org/hgweb/octave/rev/a277ba5da4dc
+Bug-Debian: http://bugs.debian.org/567975
+
+--- a/src/DLD-FUNCTIONS/filter.cc
++++ b/src/DLD-FUNCTIONS/filter.cc
+@@ -117,6 +117,9 @@
+ 	}
+     }
+ 
++  if (x_len == 0)
++    return x;
++
+   if (norm != static_cast<T>(1.0))
+     {
+       a = a / norm;

-- 
octave