Mercurial > octave-antonio

comparison scripts/image/imread.m @ 8664:e07e93c04080

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
style fixes
author John W. Eaton <jwe@octave.org>
date Wed, 04 Feb 2009 10:56:23 -0500
parents cadc73247d65
children eb63fbe60fab
comparison
equal deleted inserted replaced
8663:4238f2600a17 8664:e07e93c04080
40 if (nargin < 1) 40 if (nargin < 1)
41 print_usage (); 41 print_usage ();
42 endif 42 endif
43 43
44 if (! ischar (filename)) 44 if (! ischar (filename))
45 error ("imread: filename must be a string") 45 error ("imread: filename must be a string");
46 endif 46 endif
47 47
48 filename = tilde_expand (filename); 48 filename = tilde_expand (filename);
49 49
50 fn = file_in_path (IMAGE_PATH, filename); 50 fn = file_in_path (IMAGE_PATH, filename);
69 img_field = isfield (vars, "img"); 69 img_field = isfield (vars, "img");
70 x_field = isfield (vars, "X"); 70 x_field = isfield (vars, "X");
71 map_field = isfield (vars, "map"); 71 map_field = isfield (vars, "map");
72 endif 72 endif
73 catch 73 catch
74 error ("imread: invalid image file: %s", magick_error) 74 error ("imread: invalid image file: %s", magick_error);
75 end_try_catch 75 end_try_catch
76 76
77 if (map_field && (img_field || x_field)) 77 if (map_field && (img_field || x_field))
78 varargout{2} = vars.map; 78 varargout{2} = vars.map;
79 if (img_field) 79 if (img_field)