From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 2 Nov 2014 18:14:44 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~1804
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b9d0e7e634aaf3873b8d563d5bf3299bc194c7b5;p=imagemagick

---

diff --git a/coders/jpeg.c b/coders/jpeg.c
index 2df246983..e837a1ec2 100644
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -2256,24 +2256,8 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
     }
   option=GetImageOption(image_info,"jpeg:optimize-coding");
   if (option != (const char *) NULL)
-    jpeg_info.optimize_coding=IsStringTrue(option) != MagickFalse ? TRUE : FALSE;
-  else
-    {
-      MagickSizeType
-        length;
-
-      length=(MagickSizeType) jpeg_info.input_components*image->columns*
-        image->rows*sizeof(JSAMPLE);
-      if (length == (MagickSizeType) ((size_t) length))
-        {
-          /*
-            Perform optimization only if available memory resources permit it.
-          */
-          status=AcquireMagickResource(MemoryResource,length);
-          RelinquishMagickResource(MemoryResource,length);
-          jpeg_info.optimize_coding=status == MagickFalse ? FALSE : TRUE;
-        }
-    }
+    jpeg_info.optimize_coding=IsStringTrue(option) != MagickFalse ? TRUE :
+      FALSE;
 #if (JPEG_LIB_VERSION >= 61) && defined(C_PROGRESSIVE_SUPPORTED)
   if ((LocaleCompare(image_info->magick,"PJPEG") == 0) ||
       (image_info->interlace != NoInterlace))