Mercurial > forge

changeset 10762:736f1a138cdf octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
isrgb: use shared private functions for checks
author carandraug
date Sun, 02 Sep 2012 03:33:55 +0000
parents 1298f8809806
children 505f1951d3f9
files main/image/inst/isrgb.m
diffstat 1 files changed, 4 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/main/image/inst/isrgb.m	Sun Sep 02 03:32:21 2012 +0000
+++ b/main/image/inst/isrgb.m	Sun Sep 02 03:33:55 2012 +0000
@@ -39,15 +39,12 @@
   endif
 
   bool = false;
-  if (ismatrix (img) && ndims (img) == 3 && size (img, 3) == 3 && !issparse (img) && !isempty (img))
+  if (!isimage (img))
+    bool = false;
+  elseif (ndims (img) == 3 && size (img, 3) == 3)
     switch (class (img))
       case "double"
-        ## to speed this up, we can look at a sample of the image first
-        bool = is_rgb_double (img(1:ceil (rows (img) /100), 1:ceil (columns (img) /100)));
-        if (bool)
-          ## sample was true, we better make sure it's real
-          bool = is_rgb_double (img);
-        endif
+        bool = ispart (@is_rgb_double, img);
       case {"uint8", "uint16"}
         bool = true;
     endswitch
@@ -59,10 +56,6 @@
   bool = all ((img(:) >= 0 & img(:) <= 1) | isnan (img(:)));
 endfunction
 
-%!demo
-%! isrgb(rand(1,2,3))
-%! # A 1-by-2-by-3 double matrix with elements between 0 and 1 is a RGB image.
-
 %!# Non-matrix
 %!assert(isrgb("this is not a RGB image"),false);