Mercurial > octave

changeset 26994:734901c8979e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge stable to default.
author John W. Eaton <jwe@octave.org>
date Wed, 27 Mar 2019 23:26:27 +0000
parents 05f389459461 (current diff) 119353eb6b38 (diff)
children ab5bfee22d18
files libinterp/corefcn/graphics.cc scripts/plot/util/print.m
diffstat 4 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Wed Mar 27 14:41:01 2019 -0700
+++ b/.hgignore	Wed Mar 27 23:26:27 2019 +0000
@@ -99,7 +99,7 @@
 (^|/)doc/interpreter/octave\.html/
 (^|/)doc/liboctave/liboctave\.html/
 
-# Miscellaneous auto-generated files 
+# Miscellaneous auto-generated files
 (^|/)doc/interpreter/octave\.dvi$
 (^|/)doc/interpreter/octave\.ps$
 (^|/)doc/interpreter/doc-cache$
--- a/libinterp/corefcn/graphics.cc	Wed Mar 27 14:41:01 2019 -0700
+++ b/libinterp/corefcn/graphics.cc	Wed Mar 27 23:26:27 2019 +0000
@@ -9569,8 +9569,8 @@
 
   // check coplanarity for 3D-faces with more than 3 corners
   int fcmax = idx.rows ();
-  if (fcmax > 3 && vert.columns () > 2 &&
-      ! (facecolor_is ("none") && edgecolor_is ("none")))
+  if (fcmax > 3 && vert.columns () > 2
+      && ! (facecolor_is ("none") && edgecolor_is ("none")))
     {
       for (octave_idx_type jj = 0; jj < idx.columns (); jj++)
         {
--- a/scripts/plot/util/print.m	Wed Mar 27 14:41:01 2019 -0700
+++ b/scripts/plot/util/print.m	Wed Mar 27 23:26:27 2019 +0000
@@ -1016,7 +1016,7 @@
   endif
 
   dos_shell = (ispc () && ! isunix ());
-  
+
   if (! do_svg)
     if (dos_shell)
       cmd = sprintf ("%s -f %s 2> NUL", opts.pstoedit_binary, devopt);
--- a/src/octave-svgconvert.cc	Wed Mar 27 14:41:01 2019 -0700
+++ b/src/octave-svgconvert.cc	Wed Mar 27 23:26:27 2019 +0000
@@ -765,7 +765,7 @@
       file.close();
       return -1;
     }
-  
+
   file.close ();
 
   // Format