Mercurial > octave

diff libinterp/dldfcn/__magick_read__.cc @ 21358:f2ae78f5827f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Resolve compile time issues, when octave_idx_type is long. * libinterp/corefcn/debug.cc (bp_table::dbstop_process_map_args): Cell.index requires idx_vector, which cannot be resolved from an integer constant. * libinterp/dldfcn/__magick_read__.cc (read_indexed_images): Value "3" is an integer constant, thus std::min(long int,int) is ambiguous.
author Kai T. Ohlhus <k.ohlhus@gmail.com>
date Fri, 26 Feb 2016 16:01:22 +0100
parents c53bfd6d8e08
children ea81c2fdd568
line wrap: on
line diff
--- a/libinterp/dldfcn/__magick_read__.cc	Fri Feb 26 06:27:04 2016 -0500
+++ b/libinterp/dldfcn/__magick_read__.cc	Fri Feb 26 16:01:22 2016 +0100
@@ -218,7 +218,7 @@
 {
   typedef typename T::element_type P;
 
-  octave_value_list retval (nargout > 1 ? std::min (nargout, 3) : 1);
+  octave_value_list retval (1);
 
   std::map<std::string, octave_idx_type> region = calculate_region (options);
   const octave_idx_type nFrames = frameidx.numel ();