# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1319487009 14400
# Node ID e1f187f4fc9f095a097d44c5ea26da5b7421b3a6
# Parent  b0e70a71647b671ebcfa7a79af1ae6d3c0f52065# Parent  fcdf0993b8c9c0c9a9313931db8c74b7fa62bc75
merge release changeset

diff -r b0e70a71647b -r e1f187f4fc9f scripts/image/imshow.m
--- 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",
diff -r b0e70a71647b -r e1f187f4fc9f src/DLD-FUNCTIONS/max.cc
--- 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 ())