Mercurial > hg > octave-nkf
diff scripts/image/imshow.m @ 6756:47dc81fefe8a
[project @ 2007-06-25 18:40:21 by jwe]
author | jwe |
---|---|
date | Mon, 25 Jun 2007 18:40:21 +0000 |
parents | ec2a523713b5 |
children | c3cd7d14fc5e |
line wrap: on
line diff
--- a/scripts/image/imshow.m +++ b/scripts/image/imshow.m @@ -99,13 +99,13 @@ narg = 1; while (narg <= length (varargin)) arg = varargin{narg}; - if (ismatrix (arg) && ndims (arg) == 2) + if (ismatrix (arg) && size (arg, 2) == 3) + color_map = arg; + isindexed = true; + elseif (ismatrix (arg) && ndims (arg) == 2) display_range = arg; elseif (isempty (arg)) display_range = [min(im(:)), max(im(:))]; - elseif (ismatrix (arg) && size (arg, 2) == 3) - color_map = arg; - isindexed = true; elseif (ischar (arg) && strcmpi (arg, "displayrange")) narg++; display_range = varargin{narg};