From: Dirk Lemstra Date: Sun, 20 Oct 2019 15:22:05 +0000 (+0200) Subject: Order methods alphabetically. X-Git-Tag: 7.0.9-0~30 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1a1db9e8f676e6f20208a259c00ba45e82321fbd;p=imagemagick Order methods alphabetically. --- diff --git a/MagickCore/memory.c b/MagickCore/memory.c index 085a40347..95436df98 100644 --- a/MagickCore/memory.c +++ b/MagickCore/memory.c @@ -1386,6 +1386,42 @@ MagickExport void *ResizeQuantumMemory(void *memory,const size_t count, % % % % % % +% S e t M a g i c k A l i g n e d M e m o r y M e t h o d s % +% % +% % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% SetMagickAlignedMemoryMethods() sets the methods to acquire and relinquish +% aligned memory. +% +% The format of the SetMagickAlignedMemoryMethods() method is: +% +% SetMagickAlignedMemoryMethods( +% AcquireAlignedMemoryHandler acquire_aligned_memory_handler, +% RelinquishAlignedMemoryHandler relinquish_aligned_memory_handler) +% +% A description of each parameter follows: +% +% o acquire_memory_handler: method to acquire aligned memory. +% +% o relinquish_aligned_memory_handler: method to relinquish aligned memory. +% +*/ +MagickExport void SetMagickAlignedMemoryMethods( + AcquireAlignedMemoryHandler acquire_aligned_memory_handler, + RelinquishAlignedMemoryHandler relinquish_aligned_memory_handler) +{ + memory_methods.acquire_aligned_memory_handler=acquire_aligned_memory_handler; + memory_methods.relinquish_aligned_memory_handler= + relinquish_aligned_memory_handler; +} + +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % % S e t M a g i c k M e m o r y M e t h o d s % % % % % @@ -1426,39 +1462,3 @@ MagickExport void SetMagickMemoryMethods( if (destroy_memory_handler != (DestroyMemoryHandler) NULL) memory_methods.destroy_memory_handler=destroy_memory_handler; } - -/* -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% % -% % -% % -% S e t M a g i c k A l i g n e d M e m o r y M e t h o d s % -% % -% % -% % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% SetMagickAlignedMemoryMethods() sets the methods to acquire and relinquish -% aligned memory. -% -% The format of the SetMagickAlignedMemoryMethods() method is: -% -% SetMagickAlignedMemoryMethods( -% AcquireAlignedMemoryHandler acquire_aligned_memory_handler, -% RelinquishAlignedMemoryHandler relinquish_aligned_memory_handler) -% -% A description of each parameter follows: -% -% o acquire_memory_handler: method to acquire aligned memory. -% -% o relinquish_aligned_memory_handler: method to relinquish aligned memory. -% -*/ -MagickExport void SetMagickAlignedMemoryMethods( - AcquireAlignedMemoryHandler acquire_aligned_memory_handler, - RelinquishAlignedMemoryHandler relinquish_aligned_memory_handler) -{ - memory_methods.acquire_aligned_memory_handler=acquire_aligned_memory_handler; - memory_methods.relinquish_aligned_memory_handler= - relinquish_aligned_memory_handler; -} diff --git a/MagickCore/memory_.h b/MagickCore/memory_.h index bacaa9b4a..b0fefd97c 100644 --- a/MagickCore/memory_.h +++ b/MagickCore/memory_.h @@ -56,10 +56,10 @@ extern MagickExport void magick_attribute((__malloc__)) magick_alloc_size(2), *ResizeQuantumMemory(void *,const size_t,const size_t) magick_attribute((__malloc__)) magick_alloc_sizes(2,3), - SetMagickMemoryMethods(AcquireMemoryHandler,ResizeMemoryHandler, - DestroyMemoryHandler), SetMagickAlignedMemoryMethods(AcquireAlignedMemoryHandler, - RelinquishAlignedMemoryHandler); + RelinquishAlignedMemoryHandler), + SetMagickMemoryMethods(AcquireMemoryHandler,ResizeMemoryHandler, + DestroyMemoryHandler); #if defined(__cplusplus) || defined(c_plusplus) }