Mercurial > octave-antonio
changeset 9268:a9c4aece8c2a
Backed out changeset 7f3a1a90f4f4
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Wed, 27 May 2009 07:43:20 +0200 |
| parents | cf4683ff0b2c |
| children | 06518194dba0 |
| files | scripts/ChangeLog scripts/deprecated/loadimage.m scripts/image/imread.m |
| diffstat | 3 files changed, 2 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/ChangeLog Tue May 26 17:20:53 2009 -0400 +++ b/scripts/ChangeLog Wed May 27 07:43:20 2009 +0200 @@ -1,9 +1,3 @@ -2009-05-26 John W. Eaton <jwe@octave.org> - - * image/imread.m: Scale image data from old Octave image format so - that it will work with imshow. - * deprecated/loadimage.m: Undo scaling here for compatibility. - 2009-05-26 Søren Hauberg <hauberg@gmail.com> * help/__makeinfo__.m: Support several @seealso's in one text.
--- a/scripts/deprecated/loadimage.m Tue May 26 17:20:53 2009 -0400 +++ b/scripts/deprecated/loadimage.m Wed May 27 07:43:20 2009 +0200 @@ -41,6 +41,4 @@ [img_retval, map_retval] = imread (varargin{:}); - img_retval *= 64; - endfunction
--- a/scripts/image/imread.m Tue May 26 17:20:53 2009 -0400 +++ b/scripts/image/imread.m Wed May 27 07:43:20 2009 +0200 @@ -77,9 +77,9 @@ if (map_field && (img_field || x_field)) varargout{2} = vars.map; if (img_field) - varargout{1} = vars.img / 64; + varargout{1} = vars.img; else - varargout{1} = vars.X / 64; + varargout{1} = vars.X; endif else error ("imread: invalid Octave image file format");