]> granicus.if.org Git - imagemagick/commitdiff
https://github.com/ImageMagick/ImageMagick/issues/393
authorCristy <urban-warrior@imagemagick.org>
Mon, 6 Mar 2017 12:23:36 +0000 (07:23 -0500)
committerCristy <urban-warrior@imagemagick.org>
Mon, 6 Mar 2017 12:23:36 +0000 (07:23 -0500)
MagickCore/resource.c

index 700c57c107622e0fd20bc629ecb4827bcb5b6e1b..40c5593fb6b44234e28b0f4df65c4481c60614da 100644 (file)
@@ -1314,8 +1314,9 @@ MagickExport MagickBooleanType SetMagickResourceLimit(const ResourceType type,
           100.0));
       if (resource_info.thread_limit > GetOpenMPMaximumThreads())
         resource_info.thread_limit=GetOpenMPMaximumThreads();
-      else if (resource_info.thread_limit == 0)
-        resource_info.thread_limit=1;
+      else
+        if (resource_info.thread_limit == 0)
+          resource_info.thread_limit=1;
       break;
     }
     case ThrottleResource:
@@ -1323,10 +1324,8 @@ MagickExport MagickBooleanType SetMagickResourceLimit(const ResourceType type,
       resource_info.throttle_limit=limit;
       value=GetPolicyValue("throttle");
       if (value != (char *) NULL)
-        resource_info.throttle_limit=MagickMin(limit,StringToSizeType(value,
+        resource_info.throttle_limit=MagickMax(limit,StringToSizeType(value,
           100.0));
-      if (resource_info.throttle_limit > GetOpenMPMaximumThreads())
-        resource_info.throttle_limit=GetOpenMPMaximumThreads();
       break;
     }
     case TimeResource: