Mercurial > hg > octave-lyh

comparison scripts/general/curl.m @ 12176:515446c8fe23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
curl.m: fix thinko in previous change
author John W. Eaton <jwe@octave.org>
date Thu, 27 Jan 2011 00:12:30 -0500
parents dd2af7b8dafe
children ad05e1547398
comparison
equal deleted inserted replaced
12175:2090995ca588 12176:515446c8fe23
88 dFy_dx = gradient (varargin{fidx + 1}, dx, dy); 88 dFy_dx = gradient (varargin{fidx + 1}, dx, dy);
89 rot_z = dFy_dx - dFx_dy; 89 rot_z = dFy_dx - dFx_dy;
90 av = rot_z / 2; 90 av = rot_z / 2;
91 if (nargout == 0 || nargout == 1) 91 if (nargout == 0 || nargout == 1)
92 varargout{1} = av; 92 varargout{1} = av;
93 elseif (nargout == 2) 93 else
94 varargout{1} = rot_z; 94 varargout{1} = rot_z;
95 varargout{2} = av; 95 varargout{2} = av;
96 else
97 error ("curl: number of output arguments must be 1 or 2");
98 endif 96 endif
99 97
100 elseif ((nargin == 6) || (nargin == 3)) 98 elseif ((nargin == 6) || (nargin == 3))
101 if (!size_equal (varargin{fidx}, varargin{fidx + 1}, varargin{fidx + 2})) 99 if (!size_equal (varargin{fidx}, varargin{fidx + 1}, varargin{fidx + 2}))
102 error ("curl: size of X, Y, and Z must match"); 100 error ("curl: size of X, Y, and Z must match");
124 else 122 else
125 varargout{1} = rot_x; 123 varargout{1} = rot_x;
126 varargout{2} = rot_y; 124 varargout{2} = rot_y;
127 varargout{3} = rot_z; 125 varargout{3} = rot_z;
128 varargout{4} = av; 126 varargout{4} = av;
129 else
130 error ("curl: number of output arguments must be smaller than 5");
131 endif 127 endif
132 endif 128 endif
133 129
134 endfunction 130 endfunction
135 131