[Pkg-octave-commit] [SCM] octave-image branch, master, updated. 80d1d20eab4e123c399db98f5a3e3a5013a97ede

[Thomas Weber]

The following commit has been merged in the master branch:
commit 9f9e46f2706d7819658c40f7e8aaadf5bc763f37
Author: Thomas Weber <tweber at debian.org>
Date:   Wed Apr 13 23:32:42 2011 +0200

    New patch: fix-tests, fixed failing unit tests in 1.0.14

diff --git a/debian/changelog b/debian/changelog
index 937378a..03e18f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ octave-image (1.0.14-1) UNRELEASED; urgency=low
     - Initialize matrix to zero in .cc code, avoiding the use of uninitialized
       memory (closes: #615587)
   * Bump Standards-Version to 3.9.1 (no changes needed)
+  * New patch: fix tests, fixes failing unit tests
 
  -- Thomas Weber <tweber at debian.org>  Tue, 12 Apr 2011 22:38:56 +0200
 
diff --git a/debian/patches/fix-tests b/debian/patches/fix-tests
new file mode 100644
index 0000000..c1e5d80
--- /dev/null
+++ b/debian/patches/fix-tests
@@ -0,0 +1,25 @@
+From: Thomas Weber <tweber at debian.org>
+Subject: Fix test failures due to strict type checking of matrices
+Origin: upstream, http://octave.svn.sourceforge.net/viewvc/octave?view=revision&revision=8203
+--- a/src/bwlabel.cc
++++ b/src/bwlabel.cc
+@@ -298,7 +298,7 @@
+ }
+ 
+ /*
+-%!assert(bwlabel([0 1 0; 0 0 0; 1 0 1]),[0 1 0; 0 0 0; 2 0 3]);
++%!assert(bwlabel(logical([0 1 0; 0 0 0; 1 0 1])),[0 1 0; 0 0 0; 2 0 3]);
+ */
+ 
+ 
+--- a/inst/imtophat.m
++++ b/inst/imtophat.m
+@@ -56,7 +56,7 @@
+ %!test
+ %! I = [1 1 1; 1 1 1; 1 1 1;];
+ %! se = [1 1; 0 1;];
+-%! result = imtophat(I, se);
++%! result = logical(imtophat(I, se));
+ %! expected = 0.5 < [0 0 1; 0 0 1; 1 1 1];
+ %! assert(expected, result);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 8d1c8b6..fefe0ff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
  
+fix-tests

-- 
octave-image