[Pkg-octave-commit] [SCM] Debian packaging for octave-splines branch, master, updated. f1dab6909a14128c5bd9d8087d11fd2656c57594

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit f1dab6909a14128c5bd9d8087d11fd2656c57594
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Tue Mar 27 00:02:42 2012 +0200

    debian/patches/fix-mkpp-call-in-csape.patch: New patch

diff --git a/debian/patches/fix-mkpp-call-in-csape.patch b/debian/patches/fix-mkpp-call-in-csape.patch
new file mode 100644
index 0000000..6f072d7
--- /dev/null
+++ b/debian/patches/fix-mkpp-call-in-csape.patch
@@ -0,0 +1,40 @@
+Description: Fix call to mkpp
+ Fixed, by analogy with spline.m, bug in call to mkpp that was causing
+ tests to fail with matrix input y; all tests passed now.
+Origin: upstream, http://octave.svn.sourceforge.net/viewvc/octave?view=revision&revision=10066
+Last-Update: 2012-03-26
+
+--- octave-splines-1.0.7.orig/inst/csape.m
++++ octave-splines-1.0.7/inst/csape.m
+@@ -53,17 +53,18 @@ function pp = csape (x, y, cond, valc)
+   ## Check the size and shape of y
+   ndy = ndims (y);
+   szy = size (y);
+-  if (ndy == 2 && (szy(1) == 1 || szy(2) == 1))
+-    if (szy(1) == 1)
++  if (ndy == 2 && (szy(1) == n || szy(2) == n))
++    if (szy(2) == n)
+       a = y.';
+     else
+       a = y;
+       szy = fliplr (szy);
+     endif
+   else
+-    a = reshape (y, [prod(szy(1:end-1)), szy(end)]).';
++    a = shiftdim (reshape (y, [prod(szy(1:end-1)), szy(end)]), 1);
+   endif
+ 
++
+   b = c = zeros (size (a));
+   h = diff (x);
+   idx = ones (columns(a),1);
+@@ -218,8 +219,7 @@ function pp = csape (x, y, cond, valc)
+   endif
+ 
+   d = d(1:n-1,:); c=c(1:n-1,:); b=b(1:n-1,:); a=a(1:n-1,:);
+-  coeffs = [d(:), c(:), b(:), a(:)];
+-  pp = mkpp (x, coeffs, szy(1:end-1));
++  pp = mkpp (x, cat (2, d'(:), c'(:), b'(:), a'(:)), szy(1:end-1));
+ 
+ endfunction
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 623b164..14b1c3b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix-mkpp-call-in-fnder.patch
+fix-mkpp-call-in-csape.patch

-- 
Debian packaging for octave-splines