Mercurial > octave-nkf

changeset 17838:cfe5297e0f3b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
figure.m: Recode to pass failing test on Mac OS X. * scripts/plot/util/figure.m: Require that input is a scalar.
author Rik <rik@octave.org>
date Sat, 02 Nov 2013 22:01:59 -0700
parents 73b239db1594
children 2ff47214de72
files scripts/plot/util/figure.m
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/plot/util/figure.m	Sat Nov 02 21:59:33 2013 -0700
+++ b/scripts/plot/util/figure.m	Sat Nov 02 22:01:59 2013 -0700
@@ -53,12 +53,12 @@
     if (ischar (arg))
       arg = str2double (arg);
     endif
-    if (isfigure (arg))
+    if (isscalar (arg) && isfigure (arg))
       f = arg;
       init_new_figure = false;
       varargin(1) = [];
       nargs--;
-    elseif (isnumeric (arg) && isscalar (arg) && arg > 0 && arg == fix (arg))
+    elseif (isscalar (arg) && isnumeric (arg) && arg > 0 && arg == fix (arg))
       f = arg;
       init_new_figure = true;
       varargin(1) = [];