[Pkg-octave-commit] r920 - in octave/trunk/debian: . in patches

[Thomas Weber]

tags 423278 pending
thanks

Author: thomas-guest
Date: 2007-05-16 14:07:55 +0000 (Wed, 16 May 2007)
New Revision: 920

Added:
   octave/trunk/debian/patches/50_fft_with_empty_matrix.dpatch
Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/octave2.9-00list
Log:
Bug fix for #423278: synced with upstream CVS


Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2007-05-16 01:18:00 UTC (rev 919)
+++ octave/trunk/debian/changelog	2007-05-16 14:07:55 UTC (rev 920)
@@ -6,6 +6,10 @@
   * debian/in/control: Build-depend on gs-gpl, such that building the
     package twice in a row will succeed (closes: #424381)
 
+  [ Thomas Weber ]
+  * debian/patches/50_fft_with_empty_matrix.dpatch: 
+    Sync fft.cc with upstream (closes: #423278)
+
  --
 
 octave2.9 (2.9.10-4) unstable; urgency=low

Modified: octave/trunk/debian/in/octave2.9-00list
===================================================================
--- octave/trunk/debian/in/octave2.9-00list	2007-05-16 01:18:00 UTC (rev 919)
+++ octave/trunk/debian/in/octave2.9-00list	2007-05-16 14:07:55 UTC (rev 920)
@@ -4,3 +4,4 @@
 50_doc-builtin-vars
 50_examples-use-gnuclient
 50_dont_resize_empty_dimensions.dpatch
+50_fft_with_empty_matrix

Added: octave/trunk/debian/patches/50_fft_with_empty_matrix.dpatch
===================================================================
--- octave/trunk/debian/patches/50_fft_with_empty_matrix.dpatch	                        (rev 0)
+++ octave/trunk/debian/patches/50_fft_with_empty_matrix.dpatch	2007-05-16 14:07:55 UTC (rev 920)
@@ -0,0 +1,51 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_fft_with_empty_matrix.dpatch by  <root at asterix.num.uni-sb.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Bug fix for #423278; synced with upstream CVS 
+
+ at DPATCH@
+diff -urNad octave2.9-2.9.10~/src/DLD-FUNCTIONS/fft.cc octave2.9-2.9.10/src/DLD-FUNCTIONS/fft.cc
+--- octave2.9-2.9.10~/src/DLD-FUNCTIONS/fft.cc	2006-05-19 05:32:18.000000000 +0000
++++ octave2.9-2.9.10/src/DLD-FUNCTIONS/fft.cc	2007-05-16 13:47:31.000000000 +0000
+@@ -99,7 +99,7 @@
+   if (dim < 0)
+     {
+       for (octave_idx_type i = 0; i < dims.length (); i++)
+-	if ( dims(i) > 1)
++	if (dims(i) > 1)
+ 	  {
+ 	    dim = i;
+ 	    break;
+@@ -115,8 +115,8 @@
+   else
+     dims (dim) = n_points;
+ 
+-  if (dims.all_zero () || n_points == 0)
+-    return octave_value (Matrix ());
++  if (dims.any_zero () || n_points == 0)
++    return octave_value (NDArray (dims));
+ 
+   if (arg.is_real_type ())
+     {
+@@ -146,6 +146,20 @@
+   return retval;
+ }
+ 
++/*
++
++%!error(fft())
++%!assert(fft([]), [])
++%!assert(fft(zeros(10,0)), zeros(10,0))
++%!assert(fft(zeros(0,10)), zeros(0,10))
++%!assert(fft(0), 0)
++%!assert(fft(1), 1)
++%!assert(fft(1), 1)
++%!assert(fft(ones(2,2)), [2,2; 0,0])
++%!assert(fft(eye(2,2)), [1,1; 1,-1])
++
++*/
++
+ 
+ DEFUN_DLD (fft, args, ,
+   "-*- texinfo -*-\n\


Property changes on: octave/trunk/debian/patches/50_fft_with_empty_matrix.dpatch
___________________________________________________________________
Name: svn:executable
   + *