Mercurial > octave-nkf

changeset 13742:e1f187f4fc9f stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge release changeset
author John W. Eaton <jwe@octave.org>
date Mon, 24 Oct 2011 16:10:09 -0400
parents b0e70a71647b (current diff) fcdf0993b8c9 (diff)
children 50ef82665546
files
diffstat 2 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/image/imshow.m	Mon Oct 10 10:23:45 2011 -0400
+++ b/scripts/image/imshow.m	Mon Oct 24 16:10:09 2011 -0400
@@ -115,6 +115,12 @@
     endif
   endwhile
 
+  ## Check for complex images.
+  if (iscomplex (im))
+    warning ("imshow: only showing real part of complex image");
+    im = real (im);
+  endif
+
   ## Set default display range if display_range not set yet.
   if (isempty (display_range))
     display_range = [min(im(:)), max(im(:))];
@@ -130,12 +136,6 @@
     endswitch
   endif
 
-  ## Check for complex images.
-  if (iscomplex (im))
-    warning ("imshow: only showing real part of complex image");
-    im = real (im);
-  endif
-
   nans = isnan (im(:));
   if (any (nans))
     warning ("Octave:imshow-NaN",
--- a/src/DLD-FUNCTIONS/max.cc	Mon Oct 10 10:23:45 2011 -0400
+++ b/src/DLD-FUNCTIONS/max.cc	Mon Oct 24 16:10:09 2011 -0400
@@ -178,7 +178,7 @@
             }
 
           if (! args(1).is_empty ())
-            warning ("%s: second argument is ignored");
+            warning ("%s: second argument is ignored", func);
         }
 
       switch (arg.builtin_type ())