From: Dirk Lemstra Date: Fri, 24 Nov 2017 09:49:22 +0000 (+0100) Subject: Use same case order in AcquireMagickResource and RelinquishMagickResource. X-Git-Tag: 7.0.7-12~32 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5895593f4d55538f0d485643a1d4808ff31ce785;p=imagemagick Use same case order in AcquireMagickResource and RelinquishMagickResource. --- diff --git a/MagickCore/resource.c b/MagickCore/resource.c index 642502a2d..505e69704 100644 --- a/MagickCore/resource.c +++ b/MagickCore/resource.c @@ -944,24 +944,6 @@ MagickExport void RelinquishMagickResource(const ResourceType type, LockSemaphoreInfo(resource_semaphore); switch (type) { - case WidthResource: - { - resource_info.width=(MagickOffsetType) size; - (void) FormatMagickSize((MagickSizeType) resource_info.width,MagickFalse, - "P",MagickFormatExtent,resource_current); - (void) FormatMagickSize(resource_info.width_limit,MagickFalse,"P", - MagickFormatExtent,resource_limit); - break; - } - case HeightResource: - { - resource_info.height=(MagickOffsetType) size; - (void) FormatMagickSize((MagickSizeType) resource_info.height,MagickFalse, - "P",MagickFormatExtent,resource_current); - (void) FormatMagickSize(resource_info.height_limit,MagickFalse,"P", - MagickFormatExtent,resource_limit); - break; - } case AreaResource: { resource_info.area=(MagickOffsetType) size; @@ -1007,6 +989,15 @@ MagickExport void RelinquishMagickResource(const ResourceType type, MagickFalse,"B",MagickFormatExtent,resource_limit); break; } + case HeightResource: + { + resource_info.height=(MagickOffsetType) size; + (void) FormatMagickSize((MagickSizeType) resource_info.height,MagickFalse, + "P",MagickFormatExtent,resource_current); + (void) FormatMagickSize(resource_info.height_limit,MagickFalse,"P", + MagickFormatExtent,resource_limit); + break; + } case ThreadResource: { (void) FormatMagickSize((MagickSizeType) resource_info.thread,MagickFalse, @@ -1032,6 +1023,15 @@ MagickExport void RelinquishMagickResource(const ResourceType type, MagickFalse,"B",MagickFormatExtent,resource_limit); break; } + case WidthResource: + { + resource_info.width=(MagickOffsetType) size; + (void) FormatMagickSize((MagickSizeType) resource_info.width,MagickFalse, + "P",MagickFormatExtent,resource_current); + (void) FormatMagickSize(resource_info.width_limit,MagickFalse,"P", + MagickFormatExtent,resource_limit); + break; + } default: break; }