Mercurial > hg > octave-image

changeset 586:6e8d5281c9a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bwlabeln: Fix type checking of inputs
author jordigh
date Fri, 07 Sep 2012 15:13:33 +0000
parents 67d43bf75000
children 65d8b954e26f
files src/bwlabeln.cc
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/bwlabeln.cc
+++ b/src/bwlabeln.cc
@@ -304,9 +304,9 @@
     return rval;
   }
 
-  if (!args(0).is_bool_type ())
+  if (!args(0).is_numeric_type () && !args(0).is_bool_type ())
     {
-      error ("bwlabeln: first input argument must be a 'logical' ND-array");
+      error ("bwlabeln: first input argument must be an ND array");
       return rval;
     }
 
@@ -331,7 +331,7 @@
           else
             conn_mask = get_mask (N);
         }
-      else if (args(2).is_bool_type() )
+      else if (args(2).is_numeric_type () || args(2).is_bool_type ())
         {
           conn_mask = args(2).bool_array_value ();
           dim_vector conn_mask_dims = conn_mask.dims ();
@@ -349,7 +349,7 @@
         }
       else
         error ("bwlabeln: second input argument must be a real scalar "
-               "or a 'logical' connectivity array");
+               "or a connectivity array");
     }
   else
     // Get the maximal mask that has same number of dims as BW.