Mercurial > octave-nkf
diff scripts/image/rainbow.m @ 19647:e8e3a89fa370
Fix colormap functions when N is not of class double (bug #44070)
* autumn.m, bone.m, cool.m, copper.m, cubehelix.m, gray.m, hsv.m, ocean.m,
rainbow.m, spring.m, summer.m, winter.m: cast N to double since in this
colormap functions, N is used directly used in the operations and ends up
casting colormap to something else. Note that a colormap MUST be of class
double. Also, if N is an integer class, all values in colormap end up 0
or 1. Also simplify code for input checking by declaring default on function
signature line.
* flag.m, gmap40.m, hot.m, jet.m, lines.m, pink.m, prism.m, white.m: simplify
input check like the other colormap functions.
* test/colormaps.tst: add new test file to test all colormaps at once.
* test/Makefile.am: add new test file to build system.
used to create the colormap and if less
author | Carnë Draug <carandraug@octave.org> |
---|---|
date | Fri, 23 Jan 2015 15:37:56 +0000 |
parents | d63878346099 |
children | 4197fc428c7d |
line wrap: on
line diff
--- a/scripts/image/rainbow.m Fri Jan 23 16:33:02 2015 +0000 +++ b/scripts/image/rainbow.m Fri Jan 23 15:37:56 2015 +0000 @@ -34,17 +34,14 @@ ## PKG_ADD: colormap ("register", "rainbow"); ## PKG_DEL: colormap ("unregister", "rainbow"); -function map = rainbow (n) +function map = rainbow (n = rows (colormap ())) - if (nargin == 0) - n = rows (colormap); - elseif (nargin == 1) - if (! isscalar (n)) - error ("rainbow: N must be a scalar"); - endif - else + if (nargin > 1) print_usage (); + elseif (! isscalar (n)) + error ("rainbow: N must be a scalar"); endif + n = double (n); if (n == 1) map = [1, 0, 0]; @@ -69,7 +66,6 @@ endfunction - %!demo %! ## Show the 'rainbow' colormap as an image %! image (1:64, linspace (0, 1, 64), repmat ((1:64)', 1, 64));