From: cristy <urban-warrior@git.imagemagick.org>
Date: Sat, 23 Oct 2010 23:34:32 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~8641
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b0a27eb73ac56a53be242188781b1b0f4f61d61f;p=imagemagick

---

diff --git a/magick/resource.c b/magick/resource.c
index 60f091519..deb89d3a8 100644
--- a/magick/resource.c
+++ b/magick/resource.c
@@ -102,7 +102,7 @@ static ResourceInfo
     MagickULLConstant(0),
     MagickULLConstant(0),
     MagickULLConstant(0),
-    MagickULLConstant(2048)*1024*1024,
+    MagickULLConstant(1536)*1024*1024/sizeof(PixelPacket),
     MagickULLConstant(1536)*1024*1024,
     MagickULLConstant(3072)*1024*1024,
     MagickResourceInfinity,
@@ -921,9 +921,9 @@ MagickExport MagickBooleanType ResourceComponentGenesis(void)
 #if defined(PixelCacheThreshold)
   memory=PixelCacheThreshold;
 #endif
-  (void) SetMagickResourceLimit(AreaResource,6UL*memory/4UL);
-  (void) SetMagickResourceLimit(MemoryResource,1UL*memory);
-  (void) SetMagickResourceLimit(MapResource,2UL*memory);
+  (void) SetMagickResourceLimit(AreaResource,memory/sizeof(PixelPacket));
+  (void) SetMagickResourceLimit(MemoryResource,memory);
+  (void) SetMagickResourceLimit(MapResource,2*memory);
   limit=GetEnvironmentValue("MAGICK_AREA_LIMIT");
   if (limit == (char *) NULL)
     limit=GetPolicyValue("area");