# HG changeset patch
# User Jaroslav Hajek <highegg@gmail.com>
# Date 1243403000 -7200
# Node ID a9c4aece8c2aad8c4861b17a24a5ad4c98d6c0a3
# Parent  cf4683ff0b2c67c668ce978e514e64f10093badf
Backed out changeset 7f3a1a90f4f4

diff -r cf4683ff0b2c -r a9c4aece8c2a scripts/ChangeLog
--- 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. 
diff -r cf4683ff0b2c -r a9c4aece8c2a scripts/deprecated/loadimage.m
--- 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
diff -r cf4683ff0b2c -r a9c4aece8c2a scripts/image/imread.m
--- 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");