Mercurial > octave-nkf

changeset 13738:7ee61e56eaed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Periodic merge of stable to default
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Thu, 20 Oct 2011 14:12:05 -0500
parents 30414ff19d5e (current diff) fcdf0993b8c9 (diff)
children 0206484682c6
files scripts/image/imshow.m
diffstat 2 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/image/imshow.m	Thu Oct 20 15:35:44 2011 +0100
+++ b/scripts/image/imshow.m	Thu Oct 20 14:12:05 2011 -0500
@@ -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	Thu Oct 20 15:35:44 2011 +0100
+++ b/src/DLD-FUNCTIONS/max.cc	Thu Oct 20 14:12:05 2011 -0500
@@ -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 ())