Mercurial > octave-antonio

comparison scripts/image/imread.m @ 10433:2c01d24459fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Detabify scripts in 'scripts/image/'
author Soren Hauberg <hauberg@gmail.com>
date Mon, 22 Mar 2010 12:36:30 -0700
parents f0f19b51b5d0
children 3140cb7a05a1
comparison
equal deleted inserted replaced
10432:10207338603a 10433:2c01d24459fb
64 map_field = false; 64 map_field = false;
65 65
66 try 66 try
67 vars = load (fn); 67 vars = load (fn);
68 if (isstruct (vars)) 68 if (isstruct (vars))
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)
80 varargout{1} = vars.img; 80 varargout{1} = vars.img;
81 else 81 else
82 varargout{1} = vars.X; 82 varargout{1} = vars.X;
83 endif 83 endif
84 else 84 else
85 error ("imread: invalid Octave image file format"); 85 error ("imread: invalid Octave image file format");
86 endif 86 endif
87 87