% September 2002 %
% %
% %
-% Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization %
+% Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization %
% dedicated to making software imaging solutions freely available. %
% %
% You may not use this file except in compliance with the License. You may %
}
case ThreadResource:
{
- resource_info.thread+=size;
limit=resource_info.thread_limit;
status=(resource_info.thread_limit == MagickResourceInfinity) ||
((MagickSizeType) resource_info.thread < limit) ?
}
case ThreadResource:
{
- resource_info.thread-=size;
(void) FormatMagickSize((MagickSizeType) resource_info.thread,MagickFalse,
resource_current);
(void) FormatMagickSize((MagickSizeType) resource_info.thread_limit,
double
value;
- value=SiPrefixToDouble(string,interval);
+ value=SiPrefixToDoubleInterval(string,interval);
if (value >= (double) MagickULLConstant(~0))
return(MagickULLConstant(~0));
return((MagickSizeType) value);
limit=GetPolicyValue("file");
if (limit != (char *) NULL)
{
- (void) SetMagickResourceLimit(FileResource,StringToSizeType(limit,100.0));
+ (void) SetMagickResourceLimit(FileResource,StringToSizeType(limit,
+ 100.0));
limit=DestroyString(limit);
}
(void) SetMagickResourceLimit(ThreadResource,GetOpenMPMaximumThreads());
if (value != (char *) NULL)
resource_info.thread_limit=MagickMin(limit,StringToSizeType(value,
100.0));
- SetOpenMPMaximumThreads((int) resource_info.thread_limit);
+ if (resource_info.thread_limit > GetOpenMPMaximumThreads())
+ resource_info.thread_limit=GetOpenMPMaximumThreads();
break;
}
case TimeResource: