Mercurial > octave

diff libinterp/corefcn/graphics.in.h @ 23450:855122b993da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Wrap tertiary operator in parentheses "(COND ? x : y)". * Canvas.cc, color-picker.cc, dialog.cc, marker.cc, main-window.cc, Cell.cc, __magick_read__.cc, __pchip_deriv__.cc, __qp__.cc, bsxfun.cc, call-stack.cc, cellfun.cc, data.cc, defaults.cc, det.cc, eig.cc, error.cc, file-io.cc, filter.cc, find.cc, gammainc.cc, gcd.cc, gl-render.cc, graphics.cc, graphics.in.h, help.cc, hex2num.cc, inv.cc, load-save.cc, lookup.cc, ls-mat4.cc, ls-mat5.cc, ls-oct-binary.cc, ls-oct-text.cc, lu.cc, max.cc, mex.cc, oct-hist.cc, oct-map.cc, oct-procbuf.cc, oct-stream.cc, pr-output.cc, rand.cc, regexp.cc, schur.cc, str2double.cc, strfns.cc, symtab.cc, sysdep.cc, tril.cc, variables.cc, xdiv.cc, audiodevinfo.cc, audioread.cc, colamd.cc, gzip.cc, ov-base-diag.cc, ov-base-mat.h, ov-base-scalar.h, ov-class.cc, ov-classdef.cc, ov-fcn-handle.cc, ov-range.cc, ov-range.h, ov-struct.cc, ov-usr-fcn.cc, ov.cc, octave.cc, op-class.cc, pt-eval.cc, pt-funcall.cc, pt-idx.cc, pt-jit.cc, pt-stmt.cc, version.cc, Array-util.cc, Array.cc, CDiagMatrix.cc, CMatrix.cc, CNDArray.cc, CSparse.cc, Range.cc, Sparse.cc, chNDArray.cc, dDiagMatrix.cc, dMatrix.cc, dNDArray.cc, dSparse.cc, dim-vector.cc, fCDiagMatrix.cc, fCMatrix.cc, fCNDArray.cc, fDiagMatrix.cc, fMatrix.cc, fNDArray.cc, idx-vector.cc, idx-vector.h, Faddeeva.cc, DASPK.cc, DASRT.cc, DASSL.cc, EIG.cc, fEIG.cc, gsvd.cc, lo-specfun.cc, oct-rand.cc, qr.cc, qrp.cc, randgamma.cc, schur.cc, svd.cc, Sparse-diag-op-defs.h, mx-inlines.cc, oct-env.cc, cmd-edit.cc, kpse.cc, oct-inttypes.h, oct-sort.cc: Wrap tertiary operator in parentheses "(COND ? x : y)".
author Rik <rik@octave.org>
date Thu, 27 Apr 2017 17:33:10 -0700
parents c763214a8260
children 21baad6b35c4
line wrap: on
line diff
--- a/libinterp/corefcn/graphics.in.h	Thu Apr 27 15:18:20 2017 -0700
+++ b/libinterp/corefcn/graphics.in.h	Thu Apr 27 17:33:10 2017 -0700
@@ -197,8 +197,11 @@
   scaler (const std::string& s)
     : rep (s == "log"
            ? new log_scaler ()
-           : (s == "neglog" ? new neg_log_scaler ()
-              : (s == "linear" ? new lin_scaler () : new base_scaler ())))
+           : (s == "neglog"
+              ? new neg_log_scaler ()
+              : (s == "linear"
+                 ? new lin_scaler ()
+                 : new base_scaler ())))
   { }
 
   ~scaler (void) { delete rep; }
@@ -1443,7 +1446,7 @@
 protected:
   bool do_set (const octave_value& v)
   {
-    octave_value tmp = v.is_sparse_type () ? v.full_value () : v;
+    octave_value tmp = (v.is_sparse_type () ? v.full_value () : v);
 
     if (! validate (tmp))
       error ("invalid value for array property \"%s\"",
@@ -4779,18 +4782,18 @@
       Matrix lim;
 
       lim = Matrix (1, 3, pos(0));
-      lim(2) = lim(2) <= 0 ? octave::numeric_limits<double>::Inf () : lim(2);
+      lim(2) = (lim(2) <= 0 ? octave::numeric_limits<double>::Inf () : lim(2));
       set_xlim (lim);
 
       lim = Matrix (1, 3, pos(1));
-      lim(2) = lim(2) <= 0 ? octave::numeric_limits<double>::Inf () : lim(2);
+      lim(2) = (lim(2) <= 0 ? octave::numeric_limits<double>::Inf () : lim(2));
       set_ylim (lim);
 
       if (pos.numel () == 3)
         {
           lim = Matrix (1, 3, pos(2));
-          lim(2) = lim(2) <= 0 ? octave::numeric_limits<double>::Inf ()
-                               : lim(2);
+          lim(2) = (lim(2) <= 0 ? octave::numeric_limits<double>::Inf ()
+                                : lim(2));
           set_zliminclude ("on");
           set_zlim (lim);
         }