Mercurial > mxe-octave

comparison src/of-signal-2-error_state.patch @ 5981:b507e4ab93d5

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