[Pkg-octave-commit] rev 863 - in octave2.9-forge/trunk/debian: . patches

[Rafael Laboissiere]

Author: rafael
Date: 2007-03-22 08:06:50 +0000 (Thu, 22 Mar 2007)
New Revision: 863

Added:
   octave2.9-forge/trunk/debian/patches/50-remez-single-banded.patch
Modified:
   octave2.9-forge/trunk/debian/changelog
Log:
* debian/patches/50-remez-single-banded.patch: Support single band by
  not allowing grid density as the 4th parameter.  Patch taken from the
  upstream CVS (closes: #413196)




Modified: octave2.9-forge/trunk/debian/changelog
===================================================================
--- octave2.9-forge/trunk/debian/changelog	2007-03-20 08:55:25 UTC (rev 862)
+++ octave2.9-forge/trunk/debian/changelog	2007-03-22 08:06:50 UTC (rev 863)
@@ -1,3 +1,14 @@
+octave2.9-forge (2006.07.09+dfsg1-9) unstable; urgency=low
+
+  NOT YET RELEASED!
+
+  [ Rafael Laboissiere ]
+  * debian/patches/50-remez-single-banded.patch: Support single band by
+    not allowing grid density as the 4th parameter.  Patch taken from the
+    upstream CVS (closes: #413196)
+
+ --
+
 octave2.9-forge (2006.07.09+dfsg1-8) unstable; urgency=low
 
   [ Thomas Weber ]

Added: octave2.9-forge/trunk/debian/patches/50-remez-single-banded.patch
===================================================================
--- octave2.9-forge/trunk/debian/patches/50-remez-single-banded.patch	2007-03-20 08:55:25 UTC (rev 862)
+++ octave2.9-forge/trunk/debian/patches/50-remez-single-banded.patch	2007-03-22 08:06:50 UTC (rev 863)
@@ -0,0 +1,47 @@
+--- main/signal/remez.cc	2006/08/20 13:58:25	1.1
++++ main/signal/remez.cc	2007/02/09 03:42:57	1.2
+@@ -817,7 +817,9 @@
+   OCTAVE_LOCAL_BUFFER (double, weight, numbands);
+   for (i=0; i < numbands; i++) weight[i] = 1.0;
+   if (nargin > 3) {
+-    if (args(3).is_real_matrix()) {
++    if (args(3).is_string())
++      stype = args(3).string_value();
++    else if (args(3).is_real_matrix() || args(3).is_real_scalar()) {
+       ColumnVector o_weight(args(3).vector_value());
+       if (o_weight.length() != numbands) {
+ 	error("remez: need one weight for each band [=length(band)/2]");
+@@ -825,10 +827,6 @@
+       }
+       for (i=0; i < numbands; i++) weight[i] = o_weight(i);
+     }
+-    else if (args(3).is_string())
+-      stype = args(3).string_value();
+-    else if (args(3).is_real_scalar())
+-      density = NINT(args(3).double_value());
+     else {
+       error("remez: incorrect argument list");
+       return retval;
+@@ -837,7 +835,7 @@
+   if (nargin > 4) {
+     if (args(4).is_string() && !args(3).is_string())
+       stype = args(4).string_value();
+-    else if (args(4).is_real_scalar() && !args(3).is_real_scalar())
++    else if (args(4).is_real_scalar())
+       density = NINT(args(4).double_value());
+     else {
+       error("remez: incorrect argument list");
+@@ -845,10 +843,9 @@
+     }
+   }
+   if (nargin > 5) {
+-    if (args(5).is_real_scalar() 
+-	&& !args(4).is_real_scalar() 
+-	&& !args(3).is_real_scalar())
+-      density = NINT(args(4).double_value());
++    if (args(5).is_real_scalar()
++	&& !args(4).is_real_scalar())
++      density = NINT(args(5).double_value());
+     else {
+       error("remez: incorrect argument list");
+       return retval;