Mercurial > hg > octave-lojdl

changeset 17374:9258de031721

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
imread: always return image, even if nargout is zero.
author Carnë Draug <carandraug@octave.org>
date Tue, 03 Sep 2013 15:37:26 +0100
parents afc3d47f7704
children 6e1a3b8fc312
files scripts/image/imread.m
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/image/imread.m
+++ b/scripts/image/imread.m
@@ -88,7 +88,7 @@
 ## Author: Stefan van der Walt <stefan@sun.ac.za>
 ## Author: Andy Adler
 
-function varargout = imread (varargin)
+function [img, varargout] = imread (varargin)
   if (nargin < 1)
     print_usage ();
   elseif (! ischar (varargin{1}))
@@ -104,7 +104,7 @@
     filename{2} = varargin{2};
   endif
 
-  [varargout{1:nargout}] = imageIO (@__imread__, "read", filename, varargin{:});
+  [img, varargout{2:nargout}] = imageIO (@__imread__, "read", filename, varargin{:});
 endfunction