Mercurial > octave-nkf
diff scripts/image/colormap.m @ 15714:b1cd65881592
Clean up scripts in image directory.
Use Octave coding conventions. Redo docstrings. Add %!tests.
* brighten.m: Put input validation first. Use iscolormap to simplify
input checking.
* cmunique.m: Use faster method of validating input class.
* colormap.m: Tweak docstring. Improve input validation.
* contrast.m: Tweak docstring. Use cmap instead of map as variable
name for clarity.
* gray2ind.m: Wrap long lines. Use faster method of validating input class.
Delete unreachable code for n>65536.
* hsv2rgb.m: Use faster method of validating input class.
* imwrite.m: Tweak FIXME notes.
* ind2gray.m: Use correct caller name for ind2x. Update %!tests
with new 2-input calling convention.
* ind2rgb.m: Tweak docstring. Update %!tests with new 2-input
calling convention.
* iscolormap.m: Tweak docstring. Re-order validation tests.
* ntsc2rgb.m: Use faster method of validating input class. Better input
validation. Add %!tests.
* private/ind2x.m: Use more descriptive variable names.
* rgb2hsv.m: Tweak docstring. Use faster method of validating input class.
* rgb2ind.m: Tweak docstring. Wrap long lines.
* rgb2ntsc.m: Use faster method of validating input class. Improve input
validation. Add %!tests.
* rgbplot.m: Match variable names in docstring to those in function
prototype.
| author | Rik <rik@octave.org> |
|---|---|
| date | Sun, 02 Dec 2012 10:02:57 -0800 |
| parents | 806ea52af230 |
| children | 7268845c0a1e |
line wrap: on
line diff
--- a/scripts/image/colormap.m Sun Dec 02 17:29:47 2012 +0100 +++ b/scripts/image/colormap.m Sun Dec 02 10:02:57 2012 -0800 @@ -22,8 +22,8 @@ ## @deftypefnx {Function File} {@var{cmap} =} colormap (@var{map}) ## @deftypefnx {Function File} {@var{cmap} =} colormap ("default") ## @deftypefnx {Function File} {@var{cmap} =} colormap ("list") -## @deftypefnx {Function File} {@var{cmap} =} colormap ("register", "name") -## @deftypefnx {Function File} {@var{cmap} =} colormap ("unregister", "name") +## @deftypefnx {Function File} {@var{cmap} =} colormap ("register", "@var{name}") +## @deftypefnx {Function File} {@var{cmap} =} colormap ("unregister", "@var{name}") ## Query or set the current colormap. ## ## @code{colormap (@var{map})} sets the current colormap to @var{map}. The @@ -68,8 +68,9 @@ endif if (! isempty (map)) - if (! ismatrix (map) || ndims (map) != 2 || columns (map) != 3) - error ("colormap: MAP must be an N x 3 ([R,G,B]) matrix"); + if (! (isnumeric (map) && isreal (map) + && ndims (map) == 2 && columns (map) == 3)) + error ("colormap: MAP must be a real-valued N x 3 ([R,G,B]) matrix"); endif if (any (map(:) < 0) || any (map(:) > 1)) error ("colormap: all MAP values must be in the range [0,1]"); @@ -98,4 +99,4 @@ endfunction -%% +%% FIXME: Need some demos/tests