(no commit message)

diff --git a/ChangeLog b/ChangeLog
index 0ede6ea8556a36187bdede3906428bd597010876..e8c7669547ca39a12ed392c30d38e2e1c764d6a3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 2009-09-13  6.5.6-0 Cristy  <quetzlzacatenango@image...>
   * Fix ICON alpha mask scanline pad.
-  * Use -define jpeg:scale to scale a JPEG image when reading.
+  * Use -define jpeg:size to scale a JPEG image to the specified size.
 
 2009-09-11  6.5.5-10 Cristy  <quetzlzacatenango@image...>
   * Return the global maximum threads to avoid the rare cache view assertions.

diff --git a/coders/jpeg.c b/coders/jpeg.c
index db67c3bdf4bb11703880cb3b82e9eb98c0e4f161..a3a8614de3aafbcbfa9ed07994c496d9b05aafa8 100644 (file)
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -959,7 +959,7 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
   if (units == 2)
     image->units=PixelsPerCentimeterResolution;
   number_pixels=(MagickSizeType) image->columns*image->rows;
-  property=GetImageProperty(image,"jpeg:scale");
+  property=GetImageProperty(image,"jpeg:size");
   if (property != (const char *) NULL)
     {
       double