Mercurial > mxe-octave

comparison src/of-signal-1-fixes.patch @ 4653:00e61c4a5657

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixes for package build errors due to API changes
author John W. Eaton <jwe@octave.org>
date Mon, 09 Apr 2018 12:12:44 -0400
parents 50aebe534e42
children 85ac971a1bf0
comparison
equal deleted inserted replaced
4652:2f14bc0c6d0c 4653:00e61c4a5657
1 diff -uNr a/src/cl2bp.cc b/src/cl2bp.cc
2 --- a/src/cl2bp.cc 2015-05-25 20:22:36.842410900 -0400
3 +++ b/src/cl2bp.cc 2018-04-09 12:48:37.336964071 -0400
4 @@ -84,27 +84,27 @@
5
6 const int m = args(0).int_value(true);
7 if (error_state) {
8 - gripe_wrong_type_arg("cl2bp", args (0));
9 + err_wrong_type_arg("cl2bp", args (0));
10 return retval;
11 }
12 const double w1 = args(1).double_value();
13 if (error_state) {
14 - gripe_wrong_type_arg("cl2bp", args (1));
15 + err_wrong_type_arg("cl2bp", args (1));
16 return retval;
17 }
18 const double w2 = args(2).double_value();
19 if (error_state) {
20 - gripe_wrong_type_arg("cl2bp", args (2));
21 + err_wrong_type_arg("cl2bp", args (2));
22 return retval;
23 }
24 const ColumnVector up_vector(args(3).vector_value());
25 if (error_state) {
26 - gripe_wrong_type_arg("cl2bp", args (3));
27 + err_wrong_type_arg("cl2bp", args (3));
28 return retval;
29 }
30 const ColumnVector lo_vector(args(4).vector_value());
31 if (error_state) {
32 - gripe_wrong_type_arg("cl2bp", args (4));
33 + err_wrong_type_arg("cl2bp", args (4));
34 return retval;
35 }
36 if (up_vector.length() != 3 || lo_vector.length() != 3) {
37 @@ -121,7 +121,7 @@
38
39 const int L = args(5).int_value(true);
40 if (error_state) {
41 - gripe_wrong_type_arg("cl2bp", args (5));
42 + err_wrong_type_arg("cl2bp", args (5));
43 return retval;
44 }
45 if (L > 1000000) {
46 diff -uNr a/src/medfilt1.cc b/src/medfilt1.cc
47 --- a/src/medfilt1.cc 2015-05-25 20:22:36.846411059 -0400
48 +++ b/src/medfilt1.cc 2018-04-09 12:48:37.336964071 -0400
49 @@ -186,14 +186,14 @@
50 return retval;
51 }
52
53 - if (args(0).is_complex_type())
54 + if (args(0).iscomplex())
55 {
56 error("medfilt1 cannot process complex vectors");
57 return retval;
58 }
59
60 int n=3; // length of the filter (default 3)
61 - if (nargin > 1) n = NINT(args(1).double_value());
62 + if (nargin > 1) n = octave::math::nint(args(1).double_value());
63 if (n < 1)
64 {
65 error ("medfilt1 filter length must be at least 1");
66 diff -uNr a/src/remez.cc b/src/remez.cc
67 --- a/src/remez.cc 2015-05-25 20:22:36.846411059 -0400
68 +++ b/src/remez.cc 2018-04-09 12:48:37.340963884 -0400
69 @@ -784,7 +784,7 @@
70 return retval;
71 }
72
73 - int numtaps = NINT (args(0).double_value()) + 1; // #coeff = filter order+1
74 + int numtaps = octave::math::nint (args(0).double_value()) + 1; // #coeff = filter order+1
75 if (numtaps < 4) {
76 error("remez: number of taps must be an integer greater than 3");
77 return retval;
78 @@ -841,7 +841,7 @@
79 if (args(4).is_string() && !args(3).is_string())
80 stype = args(4).string_value();
81 else if (args(4).is_real_scalar())
82 - density = NINT(args(4).double_value());
83 + density = octave::math::nint(args(4).double_value());
84 else {
85 error("remez: incorrect argument list");
86 return retval;
87 @@ -850,7 +850,7 @@
88 if (nargin > 5) {
89 if (args(5).is_real_scalar()
90 && !args(4).is_real_scalar())
91 - density = NINT(args(5).double_value());
92 + density = octave::math::nint(args(5).double_value());
93 else {
94 error("remez: incorrect argument list");
95 return retval;
1 diff -uNr a/src/sosfilt.cc b/src/sosfilt.cc 96 diff -uNr a/src/sosfilt.cc b/src/sosfilt.cc
2 --- a/src/sosfilt.cc 2015-05-25 20:22:36.846411059 -0400 97 --- a/src/sosfilt.cc 2015-05-25 20:22:36.846411059 -0400
3 +++ b/src/sosfilt.cc 2018-01-09 15:50:16.018191246 -0500 98 +++ b/src/sosfilt.cc 2018-04-09 12:52:45.933287424 -0400
4 @@ -13,7 +13,6 @@ 99 @@ -13,10 +13,9 @@
5 // You should have received a copy of the GNU General Public License along with 100 // You should have received a copy of the GNU General Public License along with
6 // this program; if not, see <http://www.gnu.org/licenses/>. 101 // this program; if not, see <http://www.gnu.org/licenses/>.
7 102
8 -#include <octave/config.h> 103 -#include <octave/config.h>
9 #include <octave/defun-dld.h> 104 #include <octave/defun-dld.h>
10 #include <octave/error.h> 105 #include <octave/error.h>
11 #include <octave/gripes.h> 106 -#include <octave/gripes.h>
107 +#include <octave/errwarn.h>
108 #include <octave/oct-obj.h>
109 #include <octave/pager.h>
110 #include <octave/quit.h>
111 @@ -52,7 +51,7 @@
112
113 if (error_state)
114 {
115 - gripe_wrong_type_arg("sosfilt",args(0));
116 + err_wrong_type_arg("sosfilt",args(0));
117 return retval;
118 }
119
120 @@ -66,7 +65,7 @@
121
122 if (error_state)
123 {
124 - gripe_wrong_type_arg("sosfilt",args(1));
125 + err_wrong_type_arg("sosfilt",args(1));
126 return retval;
127 }
128
12 diff -uNr a/src/upfirdn.cc b/src/upfirdn.cc 129 diff -uNr a/src/upfirdn.cc b/src/upfirdn.cc
13 --- a/src/upfirdn.cc 2015-05-25 20:22:36.846411059 -0400 130 --- a/src/upfirdn.cc 2015-05-25 20:22:36.846411059 -0400
14 +++ b/src/upfirdn.cc 2018-01-09 15:50:13.514305277 -0500 131 +++ b/src/upfirdn.cc 2018-04-09 12:52:37.249695083 -0400
15 @@ -13,7 +13,6 @@ 132 @@ -13,10 +13,9 @@
16 // You should have received a copy of the GNU General Public License along with 133 // You should have received a copy of the GNU General Public License along with
17 // this program; if not, see <http://www.gnu.org/licenses/>. 134 // this program; if not, see <http://www.gnu.org/licenses/>.
18 135
19 -#include <octave/config.h> 136 -#include <octave/config.h>
20 #include <octave/defun-dld.h> 137 #include <octave/defun-dld.h>
21 #include <octave/error.h> 138 #include <octave/error.h>
22 #include <octave/gripes.h> 139 -#include <octave/gripes.h>
140 +#include <octave/errwarn.h>
141 #include <octave/oct-obj.h>
142 #include <octave/pager.h>
143 #include <octave/quit.h>
144 @@ -105,7 +104,7 @@
145
146 if (error_state)
147 {
148 - gripe_wrong_type_arg ("upfirdn", args (1));
149 + err_wrong_type_arg ("upfirdn", args (1));
150 return retval;
151 }
152
153 @@ -113,7 +112,7 @@
154
155 if (error_state)
156 {
157 - gripe_wrong_type_arg ("upfirdn", args (2));
158 + err_wrong_type_arg ("upfirdn", args (2));
159 return retval;
160 }
161
162 @@ -121,7 +120,7 @@
163
164 if (error_state)
165 {
166 - gripe_wrong_type_arg ("upfirdn", args (3));
167 + err_wrong_type_arg ("upfirdn", args (3));
168 return retval;
169 }
170
171 @@ -131,19 +130,19 @@
172 Matrix x = args (0).matrix_value ();
173 if (error_state)
174 {
175 - gripe_wrong_type_arg ("upfirdn", args (0));
176 + err_wrong_type_arg ("upfirdn", args (0));
177 return retval;
178 }
179
180 Matrix y = upfirdn (x, h, p, q);
181 retval (0) = y;
182 }
183 - else if (args (0).is_complex_type ())
184 + else if (args (0).iscomplex ())
185 {
186 ComplexMatrix x = args (0).complex_matrix_value ();
187 if (error_state)
188 {
189 - gripe_wrong_type_arg ("upfirdn", args (0));
190 + err_wrong_type_arg ("upfirdn", args (0));
191 return retval;
192 }
193
194 @@ -152,7 +151,7 @@
195 }
196 else
197 {
198 - gripe_wrong_type_arg ("upfirdn", args (0));
199 + err_wrong_type_arg ("upfirdn", args (0));
200 return retval;
201 }
202