# HG changeset patch # User adb014 # Date 1207753257 0 # Node ID df97404d1fb4d858ab5b14e09e4263b5af48a674 # Parent c540e8281d5a52d514c55de64d09a660cdcefbc2 Remove use of deprecated function diff --git a/inst/corr2.m b/inst/corr2.m --- a/inst/corr2.m +++ b/inst/corr2.m @@ -30,7 +30,7 @@ print_usage (); endif - if !(is_matrix(I) && isreal(I) && is_matrix(J) && isreal(J)) + if !(ismatrix(I) && isreal(I) && is_matrix(J) && isreal(J)) error("corr2: argument must be a real type matrix"); endif diff --git a/inst/imhist.m b/inst/imhist.m --- a/inst/imhist.m +++ b/inst/imhist.m @@ -34,7 +34,7 @@ b_is_colormap = 0; if (nargin == 2) - if (is_matrix (b)) + if (ismatrix (b)) b_is_colormap = (columns (b) == 3); endif endif diff --git a/inst/imnoise.m b/inst/imnoise.m --- a/inst/imnoise.m +++ b/inst/imnoise.m @@ -34,7 +34,7 @@ function A = imnoise(A, stype, a, b) - if (nargin < 2 || nargin > 4 || !is_matrix(A) || !ischar(stype)) + if (nargin < 2 || nargin > 4 || !ismatrix(A) || !ischar(stype)) usage("B = imnoise(A, type, parameters, ...)"); endif diff --git a/inst/isbw.m b/inst/isbw.m --- a/inst/isbw.m +++ b/inst/isbw.m @@ -29,7 +29,7 @@ usage ("isbw(BW)"); endif - if !(is_matrix(BW)) + if !(ismatrix(BW)) return; endif diff --git a/inst/mat2gray.m b/inst/mat2gray.m --- a/inst/mat2gray.m +++ b/inst/mat2gray.m @@ -27,7 +27,7 @@ usage ("mat2gray(...) number of arguments must be 1 or 2"); endif - if (!is_matrix (M)) + if (!ismatrix (M)) usage ("mat2gray(M,...) M must be a matrix"); endif diff --git a/inst/mean2.m b/inst/mean2.m --- a/inst/mean2.m +++ b/inst/mean2.m @@ -30,7 +30,7 @@ print_usage(); endif - if !(is_matrix(I) && isreal(I)) + if !(ismatrix(I) && isreal(I)) error("mean2: argument must be a real type matrix"); endif diff --git a/inst/medfilt2.m b/inst/medfilt2.m --- a/inst/medfilt2.m +++ b/inst/medfilt2.m @@ -48,7 +48,7 @@ padding = a; elseif(isvector(a) && size(a) == [1, 2]) domain = logical(ones(a(2), a(1))); - elseif(is_matrix(a)) + elseif(ismatrix(a)) domain = logical(a); endif endfor diff --git a/inst/ordfilt2.m b/inst/ordfilt2.m --- a/inst/ordfilt2.m +++ b/inst/ordfilt2.m @@ -46,7 +46,7 @@ a = varargin{:}; if(ischar(a)) padding = a; - elseif(is_matrix(a) && size(a) == size(domain)) + elseif(ismatrix(a) && size(a) == size(domain)) S = a; endif endfor diff --git a/inst/std2.m b/inst/std2.m --- a/inst/std2.m +++ b/inst/std2.m @@ -29,7 +29,7 @@ print_usage (); endif - if !(is_matrix(I) && isreal(I)) + if !(ismatrix(I) && isreal(I)) error("std2: argument must be a real type matrix"); endif