Mercurial > mxe-octave

changeset 4727:4ec5d6df4c4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compiling of-signal with Octave 5.0 dev (bug #54010).
author Markus Mützel <markus.muetzel@gmx.de>
date Wed, 30 May 2018 19:41:01 +0200
parents 586fe990bcd7
children d9fa775ab4e7
files dist-files.mk src/of-signal-2-fixes.patch
diffstat 2 files changed, 198 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Mon Jun 04 13:56:28 2018 -0400
+++ b/dist-files.mk	Wed May 30 19:41:01 2018 +0200
@@ -513,6 +513,7 @@
   of-quaternion.mk \
   of-queueing.mk \
   of-signal-1-fixes.patch \
+  of-signal-2-fixes.patch \
   of-signal.mk \
   of-sockets-1-cross-fixes.patch \
   of-sockets.mk \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/of-signal-2-fixes.patch	Wed May 30 19:41:01 2018 +0200
@@ -0,0 +1,197 @@
+diff -uNr a/src/cl2bp.cc b/src/cl2bp.cc
+--- a/src/cl2bp.cc	2015-05-25 20:22:36.842410900 -0400
++++ b/src/cl2bp.cc	2018-04-09 12:48:37.336964071 -0400
+@@ -89,27 +89,27 @@
+ 
+   const int m = args(0).int_value(true);
+   if (error_state) {
+-    gripe_wrong_type_arg ("cl2bp", args(0));
++    err_wrong_type_arg ("cl2bp", args(0));
+     return retval;
+   }
+   const double w1 = args(1).double_value();
+   if (error_state) {
+-    gripe_wrong_type_arg ("cl2bp", args(1));
++    err_wrong_type_arg ("cl2bp", args(1));
+     return retval;
+   }
+   const double w2 = args(2).double_value();
+   if (error_state) {
+-    gripe_wrong_type_arg ("cl2bp", args(2));
++    err_wrong_type_arg ("cl2bp", args(2));
+     return retval;
+   }
+   const ColumnVector up_vector(args(3).vector_value());
+   if (error_state) {
+-    gripe_wrong_type_arg ("cl2bp", args(3));
++    err_wrong_type_arg ("cl2bp", args(3));
+     return retval;
+   }
+   const ColumnVector lo_vector(args(4).vector_value());
+   if (error_state) {
+-    gripe_wrong_type_arg ("cl2bp", args(4));
++    err_wrong_type_arg ("cl2bp", args(4));
+     return retval;
+   }
+   if (up_vector.length() != 3 || lo_vector.length() != 3) {
+@@ -126,7 +126,7 @@
+ 
+   const int L = args(5).int_value(true);
+   if (error_state) {
+-    gripe_wrong_type_arg ("cl2bp", args(5));
++    err_wrong_type_arg ("cl2bp", args(5));
+     return retval;
+   }
+   if (L > 1000000) {
+diff -uNr a/src/medfilt1.cc b/src/medfilt1.cc
+--- a/src/medfilt1.cc	2015-05-25 20:22:36.846411059 -0400
++++ b/src/medfilt1.cc	2018-04-09 12:48:37.336964071 -0400
+@@ -326,7 +326,7 @@
+     {
+       if (args(1).is_numeric_type ())
+         {
+-          if (args(1).numel () != 1 || args(1).is_complex_type ())
++          if (args(1).numel () != 1 || args(1).iscomplex ())
+             error ("medfilt1: N must be a real scalar");
+           else
+             n = args(1).idx_type_value ();
+@@ -340,7 +340,7 @@
+           {
+             if (args(3).numel () != 1)
+               error ("medfilt1: DIM must be a scalar");
+-            else if (args(3).is_complex_type ())
++            else if (args(3).iscomplex ())
+               error ("medfilt1: DIM must be real");
+ 
+             dim = round (args(3).double_value ());
+diff -uNr a/src/remez.cc b/src/remez.cc
+--- a/src/remez.cc	2015-05-25 20:22:36.846411059 -0400
++++ b/src/remez.cc	2018-04-09 12:48:37.340963884 -0400
+@@ -789,7 +789,7 @@
+     return retval;
+   }
+ 
+-  int numtaps = NINT (args(0).double_value()) + 1; // #coeff = filter order+1
++  int numtaps = octave::math::nint (args(0).double_value()) + 1; // #coeff = filter order+1
+   if (numtaps < 4) {
+     error("remez: number of taps must be an integer greater than 3");
+     return retval;
+@@ -846,7 +846,7 @@
+     if (args(4).is_string() && !args(3).is_string())
+       stype = args(4).string_value();
+     else if (args(4).is_real_scalar())
+-      density = NINT (args(4).double_value());
++      density = octave::math::nint (args(4).double_value ());
+     else {
+       error("remez: incorrect argument list");
+       return retval;
+@@ -855,7 +855,7 @@
+   if (nargin > 5) {
+     if (args(5).is_real_scalar()
+         && !args(4).is_real_scalar())
+-      density = NINT (args(5).double_value());
++      density = octave::math::nint (args(5).double_value ());
+     else {
+       error("remez: incorrect argument list");
+       return retval;
+diff -uNr a/src/sosfilt.cc b/src/sosfilt.cc
+--- a/src/sosfilt.cc	2015-05-25 20:22:36.846411059 -0400
++++ b/src/sosfilt.cc	2018-04-09 12:52:45.933287424 -0400
+@@ -21,7 +21,7 @@
+ #include <octave/oct.h>
+ #include <octave/defun-dld.h>
+ #include <octave/error.h>
+-#include <octave/gripes.h>
++#include <octave/errwarn.h>
+ #include <octave/pager.h>
+ #include <octave/quit.h>
+ #include <octave/variables.h>
+@@ -56,7 +56,7 @@
+ 
+   if (error_state)
+     {
+-      gripe_wrong_type_arg ("sosfilt", args(0));
++      err_wrong_type_arg ("sosfilt", args(0));
+       return retval;
+     }
+ 
+@@ -70,7 +70,7 @@
+ 
+   if (error_state)
+     {
+-      gripe_wrong_type_arg ("sosfilt", args(1));
++      err_wrong_type_arg ("sosfilt", args(1));
+       return retval;
+     }
+ 
+diff -uNr a/src/upfirdn.cc b/src/upfirdn.cc
+--- a/src/upfirdn.cc	2015-05-25 20:22:36.846411059 -0400
++++ b/src/upfirdn.cc	2018-04-09 12:52:37.249695083 -0400
+@@ -21,7 +21,7 @@
+ #include <octave/oct.h>
+ #include <octave/defun-dld.h>
+ #include <octave/error.h>
+-#include <octave/gripes.h>
++#include <octave/errwarn.h>
+ #include <octave/pager.h>
+ #include <octave/quit.h>
+ #include <octave/variables.h>
+@@ -109,7 +109,7 @@
+ 
+   if (error_state)
+     {
+-      gripe_wrong_type_arg ("upfirdn", args(1));
++      err_wrong_type_arg ("upfirdn", args(1));
+       return retval;
+     }
+ 
+@@ -117,7 +117,7 @@
+ 
+   if (error_state)
+     {
+-      gripe_wrong_type_arg ("upfirdn", args(2));
++      err_wrong_type_arg ("upfirdn", args(2));
+       return retval;
+     }
+ 
+@@ -125,7 +125,7 @@
+ 
+   if (error_state)
+     {
+-      gripe_wrong_type_arg ("upfirdn", args(3));
++      err_wrong_type_arg ("upfirdn", args(3));
+       return retval;
+     }
+ 
+@@ -135,19 +135,19 @@
+       Matrix x = args (0).matrix_value ();
+       if (error_state)
+         {
+-          gripe_wrong_type_arg ("upfirdn", args(0));
++          err_wrong_type_arg ("upfirdn", args(0));
+           return retval;
+         }
+ 
+       Matrix y = upfirdn (x, h, p, q);
+       retval (0) = y;
+     }
+-  else if (args (0).is_complex_type ())
++  else if (args (0).iscomplex ())
+     {
+       ComplexMatrix x = args (0).complex_matrix_value ();
+       if (error_state)
+         {
+-          gripe_wrong_type_arg ("upfirdn", args(0));
++          err_wrong_type_arg ("upfirdn", args(0));
+           return retval;
+         }
+ 
+@@ -156,7 +156,7 @@
+     }
+   else
+     {
+-      gripe_wrong_type_arg ("upfirdn", args(0));
++      err_wrong_type_arg ("upfirdn", args(0));
+       return retval;
+     }
+