Mercurial > mxe-octave

comparison src/of-image-1-fixes.patch @ 4357:74c7af6a36c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* of-image-1-fixes.patch: New file.
author John W. Eaton <jwe@octave.org>
date Fri, 10 Mar 2017 11:37:08 -0500
parents
children a3af3be14136
comparison
equal deleted inserted replaced
4356:2dbbba3cfa86 4357:74c7af6a36c0
1 diff -uNr a/src/strel.cc b/src/strel.cc
2 --- a/src/strel.cc 2016-10-21 10:19:56.258205086 -0400
3 +++ b/src/strel.cc 2017-03-10 11:12:46.682214821 -0500
4 @@ -49,13 +49,13 @@
5 strel_args(0) = "arbitrary";
6 strel_args(1) = se;
7 // We are leaving the input check up to @strel
8 - se = feval ("strel", strel_args)(0);
9 + se = octave::feval ("strel", strel_args)(0);
10 if (error_state)
11 return;
12 }
13
14 - nhood = feval ("getnhood", se)(0).bool_array_value ();
15 - height = feval ("getheight", se)(0).array_value ();
16 + nhood = octave::feval ("getnhood", se)(0).bool_array_value ();
17 + height = octave::feval ("getheight", se)(0).array_value ();
18
19 // Maybe we should handle this better but how? This makes imerode
20 // and imdilate work with a [] strel
21 @@ -68,8 +68,8 @@
22 ini_ctor ();
23 origin = default_origin ();
24
25 - const octave_value se_seq = feval ("getsequence", se)(0);
26 - const octave_idx_type seq_numel = feval ("numel", se_seq)(0).idx_type_value ();
27 + const octave_value se_seq = octave::feval ("getsequence", se)(0);
28 + const octave_idx_type seq_numel = octave::feval ("numel", se_seq)(0).idx_type_value ();
29
30 // This is to emulate the strel_obj(idx) syntax in function form
31 static const char *fields[] = {"type", "subs", 0};
32 @@ -86,10 +86,10 @@
33 ref.setfield ("subs", Cell (octave_value (subs+1)));
34 subsref_args(1) = ref;
35 // Equivalent to "selem = strel_obj(subs)"
36 - const octave_value_list elem = feval ("subsref", subsref_args)(0);
37 + const octave_value_list elem = octave::feval ("subsref", subsref_args)(0);
38
39 - const boolNDArray elem_nhood = feval ("getnhood", elem)(0).bool_array_value ();
40 - const NDArray elem_height = feval ("getheight", elem)(0).array_value ();
41 + const boolNDArray elem_nhood = octave::feval ("getnhood", elem)(0).bool_array_value ();
42 + const NDArray elem_height = octave::feval ("getheight", elem)(0).array_value ();
43
44 decomposition.push_back (strel (elem_nhood, elem_height));
45 }
46 diff -uNr a/src/watershed.cc b/src/watershed.cc
47 --- a/src/watershed.cc 2016-10-21 10:19:56.258205086 -0400
48 +++ b/src/watershed.cc 2017-03-10 11:13:10.433094696 -0500
49 @@ -57,7 +57,7 @@
50 args(0) = im;
51 args(1) = conn.mask;
52 args(2) = conn.mask;
53 - const octave_value gradient = feval ("mmgradm", args)(0);
54 + const octave_value gradient = octave::feval ("mmgradm", args)(0);
55 return ov2T<T> (gradient);
56 }
57
58 @@ -68,7 +68,7 @@
59 octave_value_list args (2);
60 args(0) = im;
61 args(1) = conn.mask;
62 - const octave_value regional_min = feval ("imregionalmin", args)(0);
63 + const octave_value regional_min = octave::feval ("imregionalmin", args)(0);
64 return regional_min.bool_array_value ();
65 }
66
67 @@ -78,7 +78,7 @@
68 octave_value_list args (2);
69 args(0) = bw;
70 args(1) = conn.mask;
71 - const octave_value label = feval ("bwlabeln", args)(0);
72 + const octave_value label = octave::feval ("bwlabeln", args)(0);
73 return label.array_value ();
74 }
75