[Pkg-octave-commit] [SCM] Debian packaging for octave-image branch, master, updated. 2a33af7f881f52ceee040f929e4823ecea4342c7

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit 2a33af7f881f52ceee040f929e4823ecea4342c7
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Sun Mar 11 13:05:24 2012 +0100

    Add patch ismatrix-returns-true-on-string.patch

diff --git a/debian/patches/ismatrix-returns-true-on-string.patch b/debian/patches/ismatrix-returns-true-on-string.patch
new file mode 100644
index 0000000..87fa903
--- /dev/null
+++ b/debian/patches/ismatrix-returns-true-on-string.patch
@@ -0,0 +1,35 @@
+Description: Take into account the new behavior of ismatrix
+ In Octave 3.6, the behavior of ismatrix() has changed.  This functions
+ returns now true for strings.  The code in stretchlim.m and fftconv2.m
+ relied in the older behavior (returning false).
+Author: Rafael Laboissiere <rafael at laboissiere.net>
+Last-Update: 2012-03-11
+
+Index: octave-image/inst/stretchlim.m
+===================================================================
+--- octave-image.orig/inst/stretchlim.m	2012-03-10 16:47:06.000000000 +0000
++++ octave-image/inst/stretchlim.m	2012-03-10 16:49:40.000000000 +0000
+@@ -73,7 +73,7 @@
+     usage("LOW_HIGH=stretchlim(I [, TOL]), LOW_HIGH=stretchlim(RGB [, TOL])");
+   endif
+   
+-  if(!ismatrix(image))
++  if(!ismatrix(image) || ischar(image))
+     error("stretchlim: image should be a matrix");
+   endif
+   
+
+Index: octave-image/inst/fftconv2.m
+===================================================================
+--- octave-image-1.0.15.orig/inst/fftconv2.m
++++ octave-image-1.0.15/inst/fftconv2.m
+@@ -44,7 +44,7 @@ function X = fftconv2(varargin)
+     shape = "full";
+     rowcolumn = 0;
+     
+-    if ((nargin > 2) && ismatrix(varargin{3}))
++    if ((nargin > 2) && ismatrix(varargin{3}) && !ischar(varargin{3}))
+ 	## usage: fftconv2(v1, v2, a[, shape])
+ 
+ 	rowcolumn = 1;
+   
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..42ddbda
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+ismatrix-returns-true-on-string.patch

-- 
Debian packaging for octave-image