Mercurial > mxe-octave
annotate src/of-signal-2-error_state.patch @ 6116:ae6a2bba873d
maint: merge heads
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Sun, 06 Mar 2022 07:43:58 -0500 |
parents | b507e4ab93d5 |
children |
rev | line source |
---|---|
5981
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
1 # HG changeset patch |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
2 # User Markus Mützel <markus.muetzel@gmx.de> |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
3 # Date 1637941971 -3600 |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
4 # Fri Nov 26 16:52:51 2021 +0100 |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
5 # Node ID 8d0372aeaf46d24f1d1b22ffc1bbfa32e7623250 |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
6 # Parent 7f535130c1912a5cc5021b5a761be02509219738 |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
7 Fix compilation with Octave 8 (bug #61564). |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
8 |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
9 * src/cl2bp.cc (Fcl2bp), src/sosfilt.cc (Fsosfilt), src/upfirdn.cc (Fupfirdn): |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
10 Remove usage of `error_state`. It was unconditionally set to 0 since about 6 |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
11 years ago and will finally be removed in Octave 8. |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
12 |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
13 diff -r 7f535130c191 -r 8d0372aeaf46 src/cl2bp.cc |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
14 --- a/src/cl2bp.cc Thu Jun 17 00:46:56 2021 +0200 |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
15 +++ b/src/cl2bp.cc Fri Nov 26 16:52:51 2021 +0100 |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
16 @@ -89,30 +89,10 @@ |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
17 } |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
18 |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
19 const int m = args(0).int_value(true); |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
20 - if (error_state) { |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
21 - err_wrong_type_arg ("cl2bp", args(0)); |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
22 - return retval; |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
23 - } |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
24 const double w1 = args(1).double_value(); |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
25 - if (error_state) { |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
26 - err_wrong_type_arg ("cl2bp", args(1)); |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
27 - return retval; |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
28 - } |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
29 const double w2 = args(2).double_value(); |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
30 - if (error_state) { |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
31 - err_wrong_type_arg ("cl2bp", args(2)); |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
32 - return retval; |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
33 - } |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
34 const ColumnVector up_vector(args(3).vector_value()); |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
35 - if (error_state) { |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
36 - err_wrong_type_arg ("cl2bp", args(3)); |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
37 - return retval; |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
38 - } |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
39 const ColumnVector lo_vector(args(4).vector_value()); |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
40 - if (error_state) { |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
41 - err_wrong_type_arg ("cl2bp", args(4)); |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
42 - return retval; |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
43 - } |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
44 if (up_vector.numel() != 3 || lo_vector.numel() != 3) { |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
45 error("cl2bp: The up and lo vectors must contain 3 values"); |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
46 return retval; |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
47 @@ -126,10 +106,6 @@ |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
48 } |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
49 |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
50 const int L = args(5).int_value(true); |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
51 - if (error_state) { |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
52 - err_wrong_type_arg ("cl2bp", args(5)); |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
53 - return retval; |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
54 - } |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
55 if (L > 1000000) { |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
56 error("cl2bp: The \"gridsize\" parameter cannot exceed 1000000"); |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
57 return retval; |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
58 diff -r 7f535130c191 -r 8d0372aeaf46 src/sosfilt.cc |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
59 --- a/src/sosfilt.cc Thu Jun 17 00:46:56 2021 +0200 |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
60 +++ b/src/sosfilt.cc Fri Nov 26 16:52:51 2021 +0100 |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
61 @@ -55,12 +55,6 @@ |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
62 |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
63 Matrix sos( args(0).matrix_value() ); |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
64 |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
65 - if (error_state) |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
66 - { |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
67 - err_wrong_type_arg ("sosfilt", args(0)); |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
68 - return retval; |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
69 - } |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
70 - |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
71 if (sos.columns() != 6) |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
72 { |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
73 error("Second-order section matrix must be a non-empty Lx6 matrix"); |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
74 @@ -69,12 +63,6 @@ |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
75 |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
76 Matrix x( args(1).matrix_value() ); |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
77 |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
78 - if (error_state) |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
79 - { |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
80 - err_wrong_type_arg ("sosfilt", args(1)); |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
81 - return retval; |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
82 - } |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
83 - |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
84 int n=x.rows(); |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
85 int m=x.columns(); |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
86 |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
87 diff -r 7f535130c191 -r 8d0372aeaf46 src/upfirdn.cc |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
88 --- a/src/upfirdn.cc Thu Jun 17 00:46:56 2021 +0200 |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
89 +++ b/src/upfirdn.cc Fri Nov 26 16:52:51 2021 +0100 |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
90 @@ -107,51 +107,19 @@ |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
91 } |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
92 |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
93 ColumnVector h (args (1).vector_value ()); |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
94 - |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
95 - if (error_state) |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
96 - { |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
97 - err_wrong_type_arg ("upfirdn", args(1)); |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
98 - return retval; |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
99 - } |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
100 - |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
101 octave_idx_type p = args (2).idx_type_value (); |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
102 - |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
103 - if (error_state) |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
104 - { |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
105 - err_wrong_type_arg ("upfirdn", args(2)); |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
106 - return retval; |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
107 - } |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
108 - |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
109 octave_idx_type q = args (3).idx_type_value (); |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
110 |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
111 - if (error_state) |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
112 - { |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
113 - err_wrong_type_arg ("upfirdn", args(3)); |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
114 - return retval; |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
115 - } |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
116 - |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
117 // Do the dispatching |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
118 if (octave::signal::isreal (args (0))) |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
119 { |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
120 Matrix x = args (0).matrix_value (); |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
121 - if (error_state) |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
122 - { |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
123 - err_wrong_type_arg ("upfirdn", args(0)); |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
124 - return retval; |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
125 - } |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
126 - |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
127 Matrix y = upfirdn (x, h, p, q); |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
128 retval (0) = y; |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
129 } |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
130 else if (octave::signal::iscomplex (args (0))) |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
131 { |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
132 ComplexMatrix x = args (0).complex_matrix_value (); |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
133 - if (error_state) |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
134 - { |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
135 - err_wrong_type_arg ("upfirdn", args(0)); |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
136 - return retval; |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
137 - } |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
138 - |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
139 ComplexMatrix y = upfirdn (x, h, p, q); |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
140 retval (0) = y; |
b507e4ab93d5
of-signal: Fix for Octave 8 (bug #61564).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
141 } |