Mercurial > octave-nkf

changeset 6791:be31a048c449

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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	Tue Jul 24 19:02:27 2007 +0000
+++ b/scripts/image/autumn.m	Tue Jul 24 19:04:51 2007 +0000
@@ -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	Tue Jul 24 19:02:27 2007 +0000
+++ b/scripts/image/bone.m	Tue Jul 24 19:04:51 2007 +0000
@@ -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	Tue Jul 24 19:02:27 2007 +0000
+++ b/scripts/image/brighten.m	Tue Jul 24 19:04:51 2007 +0000
@@ -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	Tue Jul 24 19:02:27 2007 +0000
+++ b/scripts/image/cool.m	Tue Jul 24 19:04:51 2007 +0000
@@ -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	Tue Jul 24 19:02:27 2007 +0000
+++ b/scripts/image/copper.m	Tue Jul 24 19:04:51 2007 +0000
@@ -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	Tue Jul 24 19:02:27 2007 +0000
+++ b/scripts/image/gray.m	Tue Jul 24 19:04:51 2007 +0000
@@ -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	Tue Jul 24 19:02:27 2007 +0000
+++ b/scripts/image/hot.m	Tue Jul 24 19:04:51 2007 +0000
@@ -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	Tue Jul 24 19:02:27 2007 +0000
+++ b/scripts/image/hsv.m	Tue Jul 24 19:04:51 2007 +0000
@@ -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	Tue Jul 24 19:02:27 2007 +0000
+++ b/scripts/image/jet.m	Tue Jul 24 19:04:51 2007 +0000
@@ -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	Tue Jul 24 19:02:27 2007 +0000
+++ b/scripts/image/ocean.m	Tue Jul 24 19:04:51 2007 +0000
@@ -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	Tue Jul 24 19:02:27 2007 +0000
+++ b/scripts/image/pink.m	Tue Jul 24 19:04:51 2007 +0000
@@ -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	Tue Jul 24 19:02:27 2007 +0000
+++ b/scripts/image/prism.m	Tue Jul 24 19:04:51 2007 +0000
@@ -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	Tue Jul 24 19:02:27 2007 +0000
+++ b/scripts/image/rainbow.m	Tue Jul 24 19:04:51 2007 +0000
@@ -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	Tue Jul 24 19:02:27 2007 +0000
+++ b/scripts/image/spring.m	Tue Jul 24 19:04:51 2007 +0000
@@ -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	Tue Jul 24 19:02:27 2007 +0000
+++ b/scripts/image/summer.m	Tue Jul 24 19:04:51 2007 +0000
@@ -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
--- a/scripts/image/white.m	Tue Jul 24 19:02:27 2007 +0000
+++ b/scripts/image/white.m	Tue Jul 24 19:04:51 2007 +0000
@@ -32,7 +32,7 @@
   if (nargin == 0)
     number = rows (colormap);
   elseif (nargin == 1)
-    if (! is_scalar (number))
+    if (! isscalar (number))
       error ("white: argument must be a scalar");
     endif
   else
--- a/scripts/image/winter.m	Tue Jul 24 19:02:27 2007 +0000
+++ b/scripts/image/winter.m	Tue Jul 24 19:04:51 2007 +0000
@@ -32,7 +32,7 @@
   if (nargin == 0)
     number = rows (colormap);
   elseif (nargin == 1)
-    if (! is_scalar (number))
+    if (! isscalar (number))
       error ("winter: argument must be a scalar");
     endif
   else