# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1243364266 14400
# Node ID 7f3a1a90f4f48ea3ac3e93ac216d29f6ad328751
# Parent  be7d8132c1392a90ce12f11c1ad7182eb0c9f648
imread: scale values from old Octave image format

diff -r be7d8132c139 -r 7f3a1a90f4f4 scripts/ChangeLog
--- a/scripts/ChangeLog	Tue May 26 18:59:12 2009 +0200
+++ b/scripts/ChangeLog	Tue May 26 14:57:46 2009 -0400
@@ -1,3 +1,9 @@
+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. 
diff -r be7d8132c139 -r 7f3a1a90f4f4 scripts/deprecated/loadimage.m
--- a/scripts/deprecated/loadimage.m	Tue May 26 18:59:12 2009 +0200
+++ b/scripts/deprecated/loadimage.m	Tue May 26 14:57:46 2009 -0400
@@ -41,4 +41,6 @@
 
   [img_retval, map_retval] = imread (varargin{:});
 
+  img_retval *= 64;
+
 endfunction
diff -r be7d8132c139 -r 7f3a1a90f4f4 scripts/image/imread.m
--- a/scripts/image/imread.m	Tue May 26 18:59:12 2009 +0200
+++ b/scripts/image/imread.m	Tue May 26 14:57:46 2009 -0400
@@ -77,9 +77,9 @@
     if (map_field && (img_field || x_field))
       varargout{2} = vars.map;
       if (img_field)
-	varargout{1} = vars.img;
+	varargout{1} = vars.img / 64;
       else
-	varargout{1} = vars.X;
+	varargout{1} = vars.X / 64;
       endif
     else
       error ("imread: invalid Octave image file format");