Mercurial > octave

diff libinterp/corefcn/filter.cc @ 20909:03e4ddd49396

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
omit unnecessary nargout checks * paramdemo.cc, __ichol__.cc, __ilu__.cc, balance.cc, dassl.cc, eig.cc, ellipj.cc, filter.cc, givens.cc, hess.cc, lsode.cc, lu.cc, mgorth.cc, nproc.cc, pr-output.cc, quad.cc, quadcc.cc, sylvester.cc, urlwrite.cc, variables.cc, ccolamd.cc, colamd.cc, qr.cc: Don't call print_usage based on value of nargout. If nargout doesn't alter function behavior and returning extra values is inexpensive, simply return them instead of checking nargout.
author John W. Eaton <jwe@octave.org>
date Wed, 16 Dec 2015 11:41:11 -0500
parents c07bee629973
children a3359fe50966
line wrap: on
line diff
--- a/libinterp/corefcn/filter.cc	Wed Dec 16 10:25:05 2015 +0100
+++ b/libinterp/corefcn/filter.cc	Wed Dec 16 11:41:11 2015 -0500
@@ -400,7 +400,7 @@
         dim = 0;
     }
 
-  octave_value_list retval (nargout > 1 ? 2 : 1);
+  octave_value_list retval;
 
   bool isfloat = (args(0).is_single_type ()
                   || args(1).is_single_type ()
@@ -444,9 +444,7 @@
 
           FloatComplexNDArray y (filter (b, a, x, si, dim));
 
-          retval(0) = y;
-          if (nargout == 2)
-            retval(1) = si;
+          retval = ovl (y, si);
         }
       else
         {
@@ -481,9 +479,7 @@
 
           ComplexNDArray y (filter (b, a, x, si, dim));
 
-          retval(0) = y;
-          if (nargout == 2)
-            retval(1) = si;
+          retval = ovl (y, si);
         }
     }
   else
@@ -521,9 +517,7 @@
 
           FloatNDArray y (filter (b, a, x, si, dim));
 
-          retval(0) = y;
-          if (nargout == 2)
-            retval(1) = si;
+          retval = ovl (y, si);
         }
       else
         {
@@ -558,9 +552,7 @@
 
           NDArray y (filter (b, a, x, si, dim));
 
-          retval(0) = y;
-          if (nargout == 2)
-            retval(1) = si;
+          retval = ovl (y, si);
         }
     }