Mercurial > octave-nkf

changeset 17266:b1a09f72a520

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
imwrite: fix input checking for colormap (bug #39791)
author Carnë Draug <carandraug@octave.org>
date Sat, 17 Aug 2013 04:44:21 +0100
parents 53f1d5bb58bc
children 27800ef1f7d2
files scripts/image/private/__imwrite__.m
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/image/private/__imwrite__.m	Fri Aug 16 18:36:49 2013 -0700
+++ b/scripts/image/private/__imwrite__.m	Sat Aug 17 04:44:21 2013 +0100
@@ -26,14 +26,16 @@
 
   if (nargin < 2 || ! (isnumeric (img) || islogical (img)))
     print_usage ("imwrite");
-  elseif (isempty (img))
+  endif
+
+  [filename, ext, map, param_list] = imwrite_filename (varargin{:});
+
+  if (isempty (img))
     error ("imwrite: invalid empty image");
   elseif (issparse (img) || issparse (map))
     error ("imwrite: sparse images are not supported");
   endif
 
-  [filename, ext, map, param_list] = imwrite_filename (varargin{:});
-
   if (rem (numel (param_list), 2) != 0)
     error ("imwrite: no pair for all arguments (odd number left)");
   endif