Mercurial > mxe-octave

annotate src/of-signal-2-fixes.patch @ 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
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4727
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
1 diff -uNr a/src/cl2bp.cc b/src/cl2bp.cc
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
2 --- a/src/cl2bp.cc 2015-05-25 20:22:36.842410900 -0400
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
3 +++ b/src/cl2bp.cc 2018-04-09 12:48:37.336964071 -0400
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
4 @@ -89,27 +89,27 @@
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
5
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
6 const int m = args(0).int_value(true);
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
7 if (error_state) {
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
8 - gripe_wrong_type_arg ("cl2bp", args(0));
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
9 + err_wrong_type_arg ("cl2bp", args(0));
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
10 return retval;
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
11 }
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
12 const double w1 = args(1).double_value();
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
13 if (error_state) {
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
14 - gripe_wrong_type_arg ("cl2bp", args(1));
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
15 + err_wrong_type_arg ("cl2bp", args(1));
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
16 return retval;
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
17 }
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
18 const double w2 = args(2).double_value();
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
19 if (error_state) {
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
20 - gripe_wrong_type_arg ("cl2bp", args(2));
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
21 + err_wrong_type_arg ("cl2bp", args(2));
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
22 return retval;
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
23 }
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
24 const ColumnVector up_vector(args(3).vector_value());
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
25 if (error_state) {
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
26 - gripe_wrong_type_arg ("cl2bp", args(3));
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
27 + err_wrong_type_arg ("cl2bp", args(3));
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
28 return retval;
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
29 }
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
30 const ColumnVector lo_vector(args(4).vector_value());
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
31 if (error_state) {
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
32 - gripe_wrong_type_arg ("cl2bp", args(4));
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
33 + err_wrong_type_arg ("cl2bp", args(4));
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
34 return retval;
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
35 }
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
36 if (up_vector.length() != 3 || lo_vector.length() != 3) {
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
37 @@ -126,7 +126,7 @@
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
38
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
39 const int L = args(5).int_value(true);
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
40 if (error_state) {
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
41 - gripe_wrong_type_arg ("cl2bp", args(5));
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
42 + err_wrong_type_arg ("cl2bp", args(5));
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
43 return retval;
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
44 }
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
45 if (L > 1000000) {
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
46 diff -uNr a/src/medfilt1.cc b/src/medfilt1.cc
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
47 --- a/src/medfilt1.cc 2015-05-25 20:22:36.846411059 -0400
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
48 +++ b/src/medfilt1.cc 2018-04-09 12:48:37.336964071 -0400
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
49 @@ -326,7 +326,7 @@
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
50 {
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
51 if (args(1).is_numeric_type ())
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
52 {
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
53 - if (args(1).numel () != 1 || args(1).is_complex_type ())
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
54 + if (args(1).numel () != 1 || args(1).iscomplex ())
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
55 error ("medfilt1: N must be a real scalar");
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
56 else
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
57 n = args(1).idx_type_value ();
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
58 @@ -340,7 +340,7 @@
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
59 {
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
60 if (args(3).numel () != 1)
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
61 error ("medfilt1: DIM must be a scalar");
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
62 - else if (args(3).is_complex_type ())
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
63 + else if (args(3).iscomplex ())
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
64 error ("medfilt1: DIM must be real");
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
65
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
66 dim = round (args(3).double_value ());
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
67 diff -uNr a/src/remez.cc b/src/remez.cc
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
68 --- a/src/remez.cc 2015-05-25 20:22:36.846411059 -0400
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
69 +++ b/src/remez.cc 2018-04-09 12:48:37.340963884 -0400
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
70 @@ -789,7 +789,7 @@
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
71 return retval;
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
72 }
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
73
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
74 - int numtaps = NINT (args(0).double_value()) + 1; // #coeff = filter order+1
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
75 + int numtaps = octave::math::nint (args(0).double_value()) + 1; // #coeff = filter order+1
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
76 if (numtaps < 4) {
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
77 error("remez: number of taps must be an integer greater than 3");
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
78 return retval;
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
79 @@ -846,7 +846,7 @@
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
80 if (args(4).is_string() && !args(3).is_string())
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
81 stype = args(4).string_value();
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
82 else if (args(4).is_real_scalar())
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
83 - density = NINT (args(4).double_value());
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
84 + density = octave::math::nint (args(4).double_value ());
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
85 else {
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
86 error("remez: incorrect argument list");
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
87 return retval;
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
88 @@ -855,7 +855,7 @@
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
89 if (nargin > 5) {
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
90 if (args(5).is_real_scalar()
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
91 && !args(4).is_real_scalar())
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
92 - density = NINT (args(5).double_value());
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
93 + density = octave::math::nint (args(5).double_value ());
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
94 else {
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
95 error("remez: incorrect argument list");
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
96 return retval;
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
97 diff -uNr a/src/sosfilt.cc b/src/sosfilt.cc
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
98 --- a/src/sosfilt.cc 2015-05-25 20:22:36.846411059 -0400
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
99 +++ b/src/sosfilt.cc 2018-04-09 12:52:45.933287424 -0400
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
100 @@ -21,7 +21,7 @@
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
101 #include <octave/oct.h>
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
102 #include <octave/defun-dld.h>
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
103 #include <octave/error.h>
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
104 -#include <octave/gripes.h>
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
105 +#include <octave/errwarn.h>
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
106 #include <octave/pager.h>
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
107 #include <octave/quit.h>
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
108 #include <octave/variables.h>
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
109 @@ -56,7 +56,7 @@
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
110
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
111 if (error_state)
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
112 {
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
113 - gripe_wrong_type_arg ("sosfilt", args(0));
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
114 + err_wrong_type_arg ("sosfilt", args(0));
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
115 return retval;
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
116 }
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
117
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
118 @@ -70,7 +70,7 @@
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
119
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
120 if (error_state)
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
121 {
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
122 - gripe_wrong_type_arg ("sosfilt", args(1));
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
123 + err_wrong_type_arg ("sosfilt", args(1));
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
124 return retval;
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
125 }
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
126
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
127 diff -uNr a/src/upfirdn.cc b/src/upfirdn.cc
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
128 --- a/src/upfirdn.cc 2015-05-25 20:22:36.846411059 -0400
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
129 +++ b/src/upfirdn.cc 2018-04-09 12:52:37.249695083 -0400
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
130 @@ -21,7 +21,7 @@
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
131 #include <octave/oct.h>
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
132 #include <octave/defun-dld.h>
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
133 #include <octave/error.h>
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
134 -#include <octave/gripes.h>
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
135 +#include <octave/errwarn.h>
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
136 #include <octave/pager.h>
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
137 #include <octave/quit.h>
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
138 #include <octave/variables.h>
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
139 @@ -109,7 +109,7 @@
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
140
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
141 if (error_state)
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
142 {
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
143 - gripe_wrong_type_arg ("upfirdn", args(1));
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
144 + err_wrong_type_arg ("upfirdn", args(1));
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
145 return retval;
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
146 }
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
147
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
148 @@ -117,7 +117,7 @@
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
149
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
150 if (error_state)
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
151 {
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
152 - gripe_wrong_type_arg ("upfirdn", args(2));
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
153 + err_wrong_type_arg ("upfirdn", args(2));
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
154 return retval;
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
155 }
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
156
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
157 @@ -125,7 +125,7 @@
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
158
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
159 if (error_state)
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
160 {
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
161 - gripe_wrong_type_arg ("upfirdn", args(3));
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
162 + err_wrong_type_arg ("upfirdn", args(3));
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
163 return retval;
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
164 }
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
165
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
166 @@ -135,19 +135,19 @@
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
167 Matrix x = args (0).matrix_value ();
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
168 if (error_state)
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
169 {
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
170 - gripe_wrong_type_arg ("upfirdn", args(0));
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
171 + err_wrong_type_arg ("upfirdn", args(0));
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
172 return retval;
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
173 }
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
174
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
175 Matrix y = upfirdn (x, h, p, q);
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
176 retval (0) = y;
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
177 }
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
178 - else if (args (0).is_complex_type ())
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
179 + else if (args (0).iscomplex ())
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
180 {
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
181 ComplexMatrix x = args (0).complex_matrix_value ();
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
182 if (error_state)
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
183 {
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
184 - gripe_wrong_type_arg ("upfirdn", args(0));
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
185 + err_wrong_type_arg ("upfirdn", args(0));
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
186 return retval;
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
187 }
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
188
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
189 @@ -156,7 +156,7 @@
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
190 }
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
191 else
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
192 {
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
193 - gripe_wrong_type_arg ("upfirdn", args(0));
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
194 + err_wrong_type_arg ("upfirdn", args(0));
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
195 return retval;
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
196 }
4ec5d6df4c4a Fix compiling of-signal with Octave 5.0 dev (bug #54010).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
197