changeset 24049:6782105f1820

imfinfo.m: Fix error when a second argument is used (bug #52041). * imfinfo.m: Use "varargin{1}" rather than "ext" as function prototype was changed.
author Mike Miller <mtmiller@octave.org>
date Mon, 18 Sep 2017 12:50:02 -0700
parents ba164db1c4a4
children a03bb64031da
files scripts/image/imfinfo.m
diffstat 1 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/image/imfinfo.m	Sun Sep 17 05:52:33 2017 +0200
+++ b/scripts/image/imfinfo.m	Mon Sep 18 12:50:02 2017 -0700
@@ -154,7 +154,7 @@
     print_usage ();
   elseif (! ischar (filename))
     error ("imfinfo: FILENAME must be a string");
-  elseif (nargin > 1 && ! ischar (ext))
+  elseif (nargin > 1 && ! ischar (varargin{1}))
     error ("imfinfo: EXT must be a string");
   endif
 
@@ -181,3 +181,9 @@
 %!   imformats ("update", "jpg", fmt_ori);
 %! end_unwind_protect
 %! assert (error_thrown, true);
+
+## Test input validation
+%!error imfinfo ()
+%!error imfinfo (1,2,3)
+%!error <FILENAME must be a string> imfinfo (1)
+%!error <EXT must be a string> imfinfo ("foo", 1)