Mercurial > hg > octave-avbm
changeset 6791:be31a048c449
[project @ 2007-07-24 19:04:51 by dbateman]
author | dbateman |
---|---|
date | Tue, 24 Jul 2007 19:04:51 +0000 |
parents | f1157da78825 |
children | bbe79d3ed56a |
files | scripts/image/autumn.m scripts/image/bone.m scripts/image/brighten.m scripts/image/cool.m scripts/image/copper.m scripts/image/gray.m scripts/image/hot.m scripts/image/hsv.m scripts/image/jet.m scripts/image/ocean.m scripts/image/pink.m scripts/image/prism.m scripts/image/rainbow.m scripts/image/spring.m scripts/image/summer.m scripts/image/white.m scripts/image/winter.m |
diffstat | 17 files changed, 24 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/image/autumn.m +++ b/scripts/image/autumn.m @@ -32,7 +32,7 @@ if (nargin == 0) number = rows (colormap); elseif (nargin == 1) - if (! is_scalar (number)) + if (! isscalar (number)) error ("autumn: argument must be a scalar"); endif else
--- a/scripts/image/bone.m +++ b/scripts/image/bone.m @@ -32,7 +32,7 @@ if (nargin == 0) number = rows (colormap); elseif (nargin == 1) - if (! is_scalar (number)) + if (! isscalar (number)) error ("bone: argument must be a scalar"); endif else
--- a/scripts/image/brighten.m +++ b/scripts/image/brighten.m @@ -52,7 +52,7 @@ print_usage (); endif - if ( (!is_scalar (beta)) || (beta <= -1) || (beta >= 1) ) + if ( (!isscalar (beta)) || (beta <= -1) || (beta >= 1) ) error ("brighten(...,beta) beta must be a scalar in the range (-1,1)."); endif
--- a/scripts/image/cool.m +++ b/scripts/image/cool.m @@ -32,7 +32,7 @@ if (nargin == 0) number = rows (colormap); elseif (nargin == 1) - if (! is_scalar (number)) + if (! isscalar (number)) error ("cool: argument must be a scalar"); endif else
--- a/scripts/image/copper.m +++ b/scripts/image/copper.m @@ -32,7 +32,7 @@ if (nargin == 0) number = rows (colormap); elseif (nargin == 1) - if (! is_scalar (number)) + if (! isscalar (number)) error ("copper: argument must be a scalar"); endif else
--- a/scripts/image/gray.m +++ b/scripts/image/gray.m @@ -21,7 +21,7 @@ ## @deftypefn {Function File} {} gray (@var{n}) ## Return a gray colormap with @var{n} entries corresponding to values from ## 0 to @var{n}-1. The argument @var{n} should be a scalar. If it is -## omitted, 64 is assumed. +## omitted, the length of the current colormap or 64 is assumed. ## @end deftypefn ## Author: Tony Richardson <arichard@stark.cc.oh.us> @@ -31,8 +31,12 @@ function map = gray (number) if (nargin == 0) - number = 64; - elseif (nargin > 1) + number = rows (colormap); + elseif (nargin == 1) + if (! isscalar (number)) + error ("gray: argument must be a scalar"); + endif + else print_usage (); endif
--- a/scripts/image/hot.m +++ b/scripts/image/hot.m @@ -32,7 +32,7 @@ if (nargin == 0) number = rows (colormap); elseif (nargin == 1) - if (! is_scalar (number)) + if (! isscalar (number)) error ("hot: argument must be a scalar"); endif else
--- a/scripts/image/hsv.m +++ b/scripts/image/hsv.m @@ -32,7 +32,7 @@ if (nargin == 0) number = rows (colormap); elseif (nargin == 1) - if (! is_scalar (number)) + if (! isscalar (number)) error ("hsv: argument must be a scalar"); endif else
--- a/scripts/image/jet.m +++ b/scripts/image/jet.m @@ -32,7 +32,7 @@ if (nargin == 0) number = rows (colormap); elseif (nargin == 1) - if (! is_scalar (number)) + if (! isscalar (number)) error ("jet: argument must be a scalar"); endif else
--- a/scripts/image/ocean.m +++ b/scripts/image/ocean.m @@ -20,7 +20,7 @@ ## -*- texinfo -*- ## @deftypefn {Function File} {} ocean (@var{n}) ## Create color colormap. The argument @var{n} should be a scalar. If it -## is omitted, 64 is assumed. +## is omitted, the length of the current colormap or 64 is assumed. ## @end deftypefn ## Author: Tony Richardson <arichard@stark.cc.oh.us> @@ -30,7 +30,7 @@ function map = ocean (number) if (nargin == 0) - number = 64; + number = rows (colormap); elseif (nargin == 1) if (! isscalar (number)) error ("ocean: argument must be a scalar");
--- a/scripts/image/pink.m +++ b/scripts/image/pink.m @@ -32,7 +32,7 @@ if (nargin == 0) number = rows (colormap); elseif (nargin == 1) - if (! is_scalar (number)) + if (! isscalar (number)) error ("pink: argument must be a scalar"); endif else
--- a/scripts/image/prism.m +++ b/scripts/image/prism.m @@ -32,7 +32,7 @@ if (nargin == 0) number = rows (colormap); elseif (nargin == 1) - if (! is_scalar (number)) + if (! isscalar (number)) error ("prism: argument must be a scalar"); endif else
--- a/scripts/image/rainbow.m +++ b/scripts/image/rainbow.m @@ -34,7 +34,7 @@ if (nargin == 0) number = rows (colormap); elseif (nargin == 1) - if (! is_scalar (number)) + if (! isscalar (number)) error ("rainbow: argument must be a scalar"); endif else
--- a/scripts/image/spring.m +++ b/scripts/image/spring.m @@ -32,7 +32,7 @@ if (nargin == 0) number = rows (colormap); elseif (nargin == 1) - if (! is_scalar (number)) + if (! isscalar (number)) error ("spring: argument must be a scalar"); endif else
--- a/scripts/image/summer.m +++ b/scripts/image/summer.m @@ -32,7 +32,7 @@ if (nargin == 0) number = rows (colormap); elseif (nargin == 1) - if (! is_scalar (number)) + if (! isscalar (number)) error ("summer: argument must be a scalar"); endif else