changeset 2633:e1e293d18048 octave-forge

check isnumeric for vector and 'function_handle' not 'function handle' in isa test
author adb014
date Sun, 08 Oct 2006 21:41:04 +0000
parents 65b7210f8827
children 9bd7ad32f2a7
files main/image/inst/blkproc.m
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/main/image/inst/blkproc.m	Sun Oct 08 21:15:12 2006 +0000
+++ b/main/image/inst/blkproc.m	Sun Oct 08 21:41:04 2006 +0000
@@ -84,7 +84,7 @@
     error("blkproc: required parameters haven't been supplied.");
   endif
 
-  if(isvector(varargin{p}))
+  if(isvector(varargin{p}) && isnumeric(varargin{p})) 
     if(length(varargin{p})!=2)
       error("blkproc: expected [mborder,nborder] but param has wrong length.");
     endif
@@ -101,7 +101,7 @@
   endif
 
   fun=varargin{p};
-  if(!isa(fun,"function handle") &&
+  if(!isa(fun,"function_handle") &&
      !isa(fun,"inline function") &&
      !ischar(fun))
     error("blkproc: invalid fun parameter.");
@@ -172,6 +172,9 @@
 
 %
 % $Log$
+% Revision 1.2  2006/10/08 21:41:04  adb014
+% check isnumeric for vector and 'function_handle' not 'function handle' in isa test
+%
 % Revision 1.1  2006/08/20 12:59:31  hauberg
 % Changed the structure to match the package system
 %