From: cristy <urban-warrior@git.imagemagick.org>
Date: Mon, 14 Sep 2009 02:42:35 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~10697
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31b8e6f11ff62081a176a980a340301737dcf092;p=imagemagick

---

diff --git a/ChangeLog b/ChangeLog
index 0ede6ea85..e8c766954 100644
--- 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 db67c3bdf..a3a8614de 100644
--- 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