From: cristy <urban-warrior@git.imagemagick.org>
Date: Fri, 14 Dec 2012 14:47:26 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~4593
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a86d361dd74f74992cc2d8ca4501287f61e82428;p=imagemagick

---

diff --git a/MagickCore/resource.c b/MagickCore/resource.c
index 23f534e6f..d265cc90a 100644
--- a/MagickCore/resource.c
+++ b/MagickCore/resource.c
@@ -184,8 +184,8 @@ MagickExport MagickBooleanType AcquireMagickResource(const ResourceType type,
       resource_info.memory+=size;
       limit=resource_info.memory_limit;
       status=(resource_info.memory_limit == MagickResourceInfinity) ||
-        ((MagickSizeType) resource_info.memory < limit) ?
-        MagickTrue : MagickFalse;
+        ((MagickSizeType) resource_info.memory < limit) ? MagickTrue :
+        MagickFalse;
       (void) FormatMagickSize((MagickSizeType) resource_info.memory,MagickTrue,
         resource_current);
       (void) FormatMagickSize(resource_info.memory_limit,MagickTrue,
@@ -197,8 +197,7 @@ MagickExport MagickBooleanType AcquireMagickResource(const ResourceType type,
       resource_info.map+=size;
       limit=resource_info.map_limit;
       status=(resource_info.map_limit == MagickResourceInfinity) ||
-        ((MagickSizeType) resource_info.map < limit) ?
-        MagickTrue : MagickFalse;
+        ((MagickSizeType) resource_info.map < limit) ? MagickTrue : MagickFalse;
       (void) FormatMagickSize((MagickSizeType) resource_info.map,MagickTrue,
         resource_current);
       (void) FormatMagickSize(resource_info.map_limit,MagickTrue,
@@ -210,8 +209,8 @@ MagickExport MagickBooleanType AcquireMagickResource(const ResourceType type,
       resource_info.disk+=size;
       limit=resource_info.disk_limit;
       status=(resource_info.disk_limit == MagickResourceInfinity) ||
-        ((MagickSizeType) resource_info.disk < limit) ?
-        MagickTrue : MagickFalse;
+        ((MagickSizeType) resource_info.disk < limit) ? MagickTrue :
+        MagickFalse;
       (void) FormatMagickSize((MagickSizeType) resource_info.disk,MagickTrue,
         resource_current);
       (void) FormatMagickSize(resource_info.disk_limit,MagickTrue,
diff --git a/config/policy.xml b/config/policy.xml
index 3be0a4bcb..f73c02fbb 100644
--- a/config/policy.xml
+++ b/config/policy.xml
@@ -32,7 +32,7 @@
 
   The /repository file system is restricted to read only.  We use a glob
   expression to match all paths that start with /repository:
-  
+
     <policy domain="path" rights="read" pattern="/repository/*" />
 
   Any large image is cached to disk rather than memory: