Mercurial > octave

changeset 20869:69b37757030c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2015 Code Sprint: __magick_read__.cc: use ovl ().
author Rik <rik@octave.org>
date Sat, 12 Dec 2015 09:55:20 -0800
parents 04748b009201
children 020b71557b12
files libinterp/dldfcn/__magick_read__.cc
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/dldfcn/__magick_read__.cc	Sat Dec 12 18:35:27 2015 +0100
+++ b/libinterp/dldfcn/__magick_read__.cc	Sat Dec 12 09:55:20 2015 -0800
@@ -218,7 +218,7 @@
 {
   typedef typename T::element_type P;
 
-  octave_value_list retval (3, Matrix ());
+  octave_value_list retval (nargout > 1 ? std::min (nargout, 3) : 1);
 
   std::map<std::string, octave_idx_type> region = calculate_region (options);
   const octave_idx_type nFrames = frameidx.numel ();
@@ -672,6 +672,7 @@
     }
 
   retval(0) = img;
+
   return retval;
 }