changeset 27773:54767f6a93f5

maint: merge stable to default.
author Rik <rik@octave.org>
date Wed, 04 Dec 2019 12:02:13 -0800
parents cd566153edd6 (current diff) 2d1af61d8f5e (diff)
children f47bb02c8d06
files libinterp/corefcn/graphics.cc
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/graphics.cc	Mon Dec 02 23:37:39 2019 -0600
+++ b/libinterp/corefcn/graphics.cc	Wed Dec 04 12:02:13 2019 -0800
@@ -10005,7 +10005,7 @@
       octave_idx_type nc = 3;
       if (max_nc > 3)
         {
-          while (! octave::math::isnan (f(i,nc)) && nc < max_nc)
+          while (nc < max_nc && ! octave::math::isnan (f(i,nc)))
             nc++;
         }
 
@@ -10129,7 +10129,7 @@
           octave_idx_type nc = 3;
           if (max_nc > 3)
             {
-              while (! octave::math::isnan (f(i,nc)) && nc < max_nc)
+              while (nc < max_nc && ! octave::math::isnan (f(i,nc)))
                 nc++;
             }