From: cristy Date: Wed, 14 Sep 2011 01:02:31 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~7005 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a64b85d7873d5e540fe6e2941aa98ec7653a4e2d;p=imagemagick --- diff --git a/MagickCore/cache-view.c b/MagickCore/cache-view.c index fe7837d7d..7a4e2cd14 100644 --- a/MagickCore/cache-view.c +++ b/MagickCore/cache-view.c @@ -113,7 +113,7 @@ MagickExport CacheView *AcquireCacheView(const Image *image) assert(image->signature == MagickSignature); if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); - cache_view=(CacheView *) AcquireAlignedMemory(1,sizeof(*cache_view)); + cache_view=(CacheView *) AcquireQuantumMemory(1,sizeof(*cache_view)); if (cache_view == (CacheView *) NULL) ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed"); (void) ResetMagickMemory(cache_view,0,sizeof(*cache_view)); @@ -160,7 +160,7 @@ MagickExport CacheView *CloneCacheView(const CacheView *cache_view) if (cache_view->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", cache_view->image->filename); - clone_view=(CacheView *) AcquireAlignedMemory(1,sizeof(*clone_view)); + clone_view=(CacheView *) AcquireQuantumMemory(1,sizeof(*clone_view)); if (clone_view == (CacheView *) NULL) ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed"); (void) ResetMagickMemory(clone_view,0,sizeof(*clone_view)); diff --git a/MagickCore/cache.c b/MagickCore/cache.c index fc6f2adbd..d173dffa5 100644 --- a/MagickCore/cache.c +++ b/MagickCore/cache.c @@ -186,7 +186,7 @@ MagickPrivate Cache AcquirePixelCache(const size_t number_threads) CacheInfo *cache_info; - cache_info=(CacheInfo *) AcquireAlignedMemory(1,sizeof(*cache_info)); + cache_info=(CacheInfo *) AcquireQuantumMemory(1,sizeof(*cache_info)); if (cache_info == (CacheInfo *) NULL) ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed"); (void) ResetMagickMemory(cache_info,0,sizeof(*cache_info)); @@ -255,7 +255,7 @@ MagickPrivate NexusInfo **AcquirePixelCacheNexus(const size_t number_threads) register ssize_t i; - nexus_info=(NexusInfo **) AcquireAlignedMemory(number_threads, + nexus_info=(NexusInfo **) AcquireQuantumMemory(number_threads, sizeof(*nexus_info)); if (nexus_info == (NexusInfo **) NULL) ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed"); @@ -783,7 +783,7 @@ static MagickBooleanType DiskToDiskPixelCacheClone(CacheInfo *clone_info, */ if (cache_info->debug != MagickFalse) (void) LogMagickEvent(CacheEvent,GetMagickModule(),"disk => disk"); - blob=(unsigned char *) AcquireAlignedMemory(MagickMaxBufferExtent, + blob=(unsigned char *) AcquireQuantumMemory(MagickMaxBufferExtent, sizeof(*blob)); if (blob == (unsigned char *) NULL) { @@ -949,7 +949,7 @@ static MagickBooleanType UnoptimizedPixelCacheClone(CacheInfo *clone_info, length=(size_t) MagickMax(MagickMax(cache_info->number_channels, clone_info->number_channels)*sizeof(Quantum),MagickMax( cache_info->metacontent_extent,clone_info->metacontent_extent)); - blob=(unsigned char *) AcquireAlignedMemory(length,sizeof(*blob)); + blob=(unsigned char *) AcquireQuantumMemory(length,sizeof(*blob)); if (blob == (unsigned char *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), @@ -1483,7 +1483,7 @@ MagickPrivate NexusInfo **DestroyPixelCacheNexus(NexusInfo **nexus_info, if (nexus_info[i]->cache != (Quantum *) NULL) RelinquishCacheNexusPixels(nexus_info[i]); nexus_info[i]->signature=(~MagickSignature); - nexus_info[i]=(NexusInfo *) RelinquishMagickMemory(nexus_info[i]); + nexus_info[i]=(NexusInfo *) RelinquishAlignedMemory(nexus_info[i]); } nexus_info=(NexusInfo **) RelinquishMagickMemory(nexus_info); return(nexus_info); @@ -3253,7 +3253,7 @@ MagickPrivate const Quantum *GetVirtualPixelsFromNexus(const Image *image, /* Acquire a metacontent buffer. */ - virtual_metacontent=(void *) AcquireAlignedMemory(1, + virtual_metacontent=(void *) AcquireQuantumMemory(1, cache_info->metacontent_extent); if (virtual_metacontent == (void *) NULL) { @@ -3922,7 +3922,7 @@ static MagickBooleanType MaskPixelCacheNexus(Image *image,NexusInfo *nexus_info, static inline void AllocatePixelCachePixels(CacheInfo *cache_info) { cache_info->mapped=MagickFalse; - cache_info->pixels=(Quantum *) AcquireAlignedMemory(1,(size_t) + cache_info->pixels=(Quantum *) AcquireQuantumMemory(1,(size_t) cache_info->length); if (cache_info->pixels == (Quantum *) NULL) { @@ -4986,7 +4986,7 @@ static inline MagickBooleanType AcquireCacheNexusPixels(CacheInfo *cache_info, if (nexus_info->length != (MagickSizeType) ((size_t) nexus_info->length)) return(MagickFalse); nexus_info->mapped=MagickFalse; - nexus_info->cache=(Quantum *) AcquireAlignedMemory(1,(size_t) + nexus_info->cache=(Quantum *) AcquireQuantumMemory(1,(size_t) nexus_info->length); if (nexus_info->cache == (Quantum *) NULL) { diff --git a/MagickCore/effect.c b/MagickCore/effect.c index 98ea3197a..65d1528a2 100644 --- a/MagickCore/effect.c +++ b/MagickCore/effect.c @@ -1802,7 +1802,7 @@ MagickExport Image *EdgeImage(const Image *image,const double radius, ThrowImageException(ResourceLimitError,"MemoryAllocationFailed"); kernel_info->width=width; kernel_info->height=width; - kernel_info->values=(double *) AcquireAlignedMemory(kernel_info->width, + kernel_info->values=(double *) AcquireQuantumMemory(kernel_info->width, kernel_info->width*sizeof(*kernel_info->values)); if (kernel_info->values == (double *) NULL) { @@ -1892,7 +1892,7 @@ MagickExport Image *EmbossImage(const Image *image,const double radius, ThrowImageException(ResourceLimitError,"MemoryAllocationFailed"); kernel_info->width=width; kernel_info->height=width; - kernel_info->values=(double *) AcquireAlignedMemory(kernel_info->width, + kernel_info->values=(double *) AcquireQuantumMemory(kernel_info->width, kernel_info->width*sizeof(*kernel_info->values)); if (kernel_info->values == (double *) NULL) { @@ -1993,7 +1993,7 @@ MagickExport Image *GaussianBlurImage(const Image *image,const double radius, kernel_info->height=width; kernel_info->bias=bias; kernel_info->signature=MagickSignature; - kernel_info->values=(double *) AcquireAlignedMemory(kernel_info->width, + kernel_info->values=(double *) AcquireQuantumMemory(kernel_info->width, kernel_info->width*sizeof(*kernel_info->values)); if (kernel_info->values == (double *) NULL) { @@ -3677,7 +3677,7 @@ MagickExport Image *SharpenImage(const Image *image,const double radius, kernel_info->height=width; kernel_info->bias=bias; kernel_info->signature=MagickSignature; - kernel_info->values=(double *) AcquireAlignedMemory(kernel_info->width, + kernel_info->values=(double *) AcquireQuantumMemory(kernel_info->width, kernel_info->width*sizeof(*kernel_info->values)); if (kernel_info->values == (double *) NULL) { diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h index df4049a78..dd61047ab 100644 --- a/MagickCore/magick-config.h +++ b/MagickCore/magick-config.h @@ -12,7 +12,9 @@ /* #undef AUTOTRACE_DELEGATE */ /* Define if coders and filters are to be built as modules. */ -/* #undef BUILD_MODULES */ +#ifndef MAGICKCORE_BUILD_MODULES +#define MAGICKCORE_BUILD_MODULES 1 +#endif /* Define if you have the bzip2 library */ #ifndef MAGICKCORE_BZLIB_DELEGATE @@ -75,7 +77,9 @@ #endif /* Define if you have FFTW library */ -/* #undef FFTW_DELEGATE */ +#ifndef MAGICKCORE_FFTW_DELEGATE +#define MAGICKCORE_FFTW_DELEGATE 1 +#endif /* Location of filter modules */ #ifndef MAGICKCORE_FILTER_PATH @@ -217,7 +221,9 @@ #endif /* Define to 1 if you have the header file. */ -/* #undef HAVE_CL_CL_H */ +#ifndef MAGICKCORE_HAVE_CL_CL_H +#define MAGICKCORE_HAVE_CL_CL_H 1 +#endif /* Define to 1 if you have the header file. */ #ifndef MAGICKCORE_HAVE_COMPLEX_H @@ -429,15 +435,15 @@ #endif /* Define if you have the header file. */ -#ifndef MAGICKCORE_HAVE_LCMS2_H -#define MAGICKCORE_HAVE_LCMS2_H 1 -#endif +/* #undef HAVE_LCMS2_H */ /* Define if you have the header file. */ /* #undef HAVE_LCMS2_LCMS2_H */ /* Define if you have the header file. */ -/* #undef HAVE_LCMS_H */ +#ifndef MAGICKCORE_HAVE_LCMS_H +#define MAGICKCORE_HAVE_LCMS_H 1 +#endif /* Define if you have the header file. */ /* #undef HAVE_LCMS_LCMS_H */ @@ -1160,7 +1166,9 @@ #endif /* Define if you have JBIG library */ -/* #undef JBIG_DELEGATE */ +#ifndef MAGICKCORE_JBIG_DELEGATE +#define MAGICKCORE_JBIG_DELEGATE 1 +#endif /* Define if you have JPEG version 2 "Jasper" library */ #ifndef MAGICKCORE_JP2_DELEGATE @@ -1189,7 +1197,9 @@ #endif /* Define if you have LQR library */ -/* #undef LQR_DELEGATE */ +#ifndef MAGICKCORE_LQR_DELEGATE +#define MAGICKCORE_LQR_DELEGATE 1 +#endif /* Define if using libltdl to support dynamically loadable modules */ #ifndef MAGICKCORE_LTDL_DELEGATE @@ -1201,7 +1211,7 @@ /* Define to the system default library search path. */ #ifndef MAGICKCORE_LT_DLSEARCH_PATH -#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/atlas:/usr/lib/llvm:/usr/lib64/llvm:/usr/lib64/mysql:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/usr/lib64/tcl8.5:/usr/lib/wine/:/usr/lib64/wine/:/usr/lib64/xulrunner-2" +#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/R/lib:/usr/lib64/atlas:/opt/modules/pkg/intel/f77/10.0.025/lib:/usr/lib64/llvm:/usr/local/lib:/usr/lib64/mysql:/usr/lib64/nvidia:/usr/lib64/qt-3.3/lib:/usr/lib64/xulrunner-2" #endif /* The archive extension */ @@ -1252,7 +1262,9 @@ /* #undef NO_MINUS_C_MINUS_O */ /* Define if you have OPENEXR library */ -/* #undef OPENEXR_DELEGATE */ +#ifndef MAGICKCORE_OPENEXR_DELEGATE +#define MAGICKCORE_OPENEXR_DELEGATE 1 +#endif /* Define to the address where bug reports for this package should be sent. */ #ifndef MAGICKCORE_PACKAGE_BUGREPORT @@ -1307,7 +1319,9 @@ #endif /* Define if you have RSVG library */ -/* #undef RSVG_DELEGATE */ +#ifndef MAGICKCORE_RSVG_DELEGATE +#define MAGICKCORE_RSVG_DELEGATE 1 +#endif /* Define to the type of arg 1 for `select'. */ #ifndef MAGICKCORE_SELECT_TYPE_ARG1 @@ -1444,7 +1458,9 @@ /* Define if you have WEBP library */ -/* #undef WEBP_DELEGATE */ +#ifndef MAGICKCORE_WEBP_DELEGATE +#define MAGICKCORE_WEBP_DELEGATE 1 +#endif /* Define to use the Windows GDI32 library */ /* #undef WINGDI32_DELEGATE */ @@ -1453,7 +1469,9 @@ /* #undef WITH_DMALLOC */ /* Define if you have WMF library */ -/* #undef WMF_DELEGATE */ +#ifndef MAGICKCORE_WMF_DELEGATE +#define MAGICKCORE_WMF_DELEGATE 1 +#endif /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ @@ -1486,7 +1504,9 @@ /* #undef X_DISPLAY_MISSING */ /* Build self-contained, embeddable, zero-configuration ImageMagick */ -/* #undef ZERO_CONFIGURATION_SUPPORT */ +#ifndef MAGICKCORE_ZERO_CONFIGURATION_SUPPORT +#define MAGICKCORE_ZERO_CONFIGURATION_SUPPORT 1 +#endif /* Define if you have zlib compression library */ #ifndef MAGICKCORE_ZLIB_DELEGATE @@ -1509,7 +1529,9 @@ /* #undef _MINIX */ /* Define this for the OpenCL Accelerator */ -/* #undef _OPENCL */ +#ifndef MAGICKCORE__OPENCL +#define MAGICKCORE__OPENCL 1 +#endif /* Define to 2 if the system does not provide POSIX.1 features except with this defined. */ diff --git a/MagickCore/methods.h b/MagickCore/methods.h index 50aba3a03..59b05b6a5 100644 --- a/MagickCore/methods.h +++ b/MagickCore/methods.h @@ -37,7 +37,7 @@ extern "C" { #define PrependMagickMethod(method) \ EvaluateMagickPrefix(MAGICKCORE_NAMESPACE_PREFIX,method) -#define AcquireAlignedMemory PrependMagickMethod(AcquireAlignedMemory) +#define AcquireQuantumMemory PrependMagickMethod(AcquireQuantumMemory) #define AcquireCacheViewIndexes PrependMagickMethod(AcquireCacheViewIndexes) #define AcquireCacheViewPixels PrependMagickMethod(AcquireCacheViewPixels) #define AcquireCacheView PrependMagickMethod(AcquireCacheView) @@ -980,7 +980,7 @@ extern "C" { #define RegisterYUVImage PrependMagickMethod(RegisterYUVImage) #define RegistryComponentGenesis PrependMagickMethod(RegistryComponentGenesis) #define RegistryComponentTerminus PrependMagickMethod(RegistryComponentTerminus) -#define RelinquishAlignedMemory PrependMagickMethod(RelinquishAlignedMemory) +#define RelinquishMagickMemory PrependMagickMethod(RelinquishMagickMemory) #define RelinquishMagickMatrix PrependMagickMethod(RelinquishMagickMatrix) #define RelinquishMagickMemory PrependMagickMethod(RelinquishMagickMemory) #define RelinquishMagickResource PrependMagickMethod(RelinquishMagickResource) diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c index f8a629783..9d78d497a 100644 --- a/MagickCore/morphology.c +++ b/MagickCore/morphology.c @@ -240,7 +240,7 @@ static KernelInfo *ParseKernelArray(const char *kernel_string) GeometryInfo args; - kernel=(KernelInfo *) AcquireMagickMemory(sizeof(*kernel)); + kernel=(KernelInfo *) AcquireQuantumMemory(1,sizeof(*kernel)); if (kernel == (KernelInfo *)NULL) return(kernel); (void) ResetMagickMemory(kernel,0,sizeof(*kernel)); @@ -314,7 +314,7 @@ static KernelInfo *ParseKernelArray(const char *kernel_string) } /* Read in the kernel values from rest of input string argument */ - kernel->values=(double *) AcquireAlignedMemory(kernel->width, + kernel->values=(double *) AcquireQuantumMemory(kernel->width, kernel->height*sizeof(double)); if (kernel->values == (double *) NULL) return(DestroyKernelInfo(kernel)); @@ -1030,7 +1030,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type, { kernel->height = kernel->width = (size_t) 1; kernel->x = kernel->y = (ssize_t) 0; - kernel->values=(double *) AcquireAlignedMemory(1,sizeof(double)); + kernel->values=(double *) AcquireQuantumMemory(1,sizeof(double)); if (kernel->values == (double *) NULL) return(DestroyKernelInfo(kernel)); kernel->maximum = kernel->values[0] = args->rho; @@ -1053,7 +1053,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type, kernel->width = GetOptimalKernelWidth2D(args->rho,sigma2); kernel->height = kernel->width; kernel->x = kernel->y = (ssize_t) (kernel->width-1)/2; - kernel->values=(double *) AcquireAlignedMemory(kernel->width, + kernel->values=(double *) AcquireQuantumMemory(kernel->width, kernel->height*sizeof(double)); if (kernel->values == (double *) NULL) return(DestroyKernelInfo(kernel)); @@ -1144,7 +1144,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type, kernel->x = (ssize_t) (kernel->width-1)/2; kernel->y = 0; kernel->negative_range = kernel->positive_range = 0.0; - kernel->values=(double *) AcquireAlignedMemory(kernel->width, + kernel->values=(double *) AcquireQuantumMemory(kernel->width, kernel->height*sizeof(double)); if (kernel->values == (double *) NULL) return(DestroyKernelInfo(kernel)); @@ -1228,7 +1228,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type, kernel->x = kernel->y = 0; kernel->height = 1; kernel->negative_range = kernel->positive_range = 0.0; - kernel->values=(double *) AcquireAlignedMemory(kernel->width, + kernel->values=(double *) AcquireQuantumMemory(kernel->width, kernel->height*sizeof(double)); if (kernel->values == (double *) NULL) return(DestroyKernelInfo(kernel)); @@ -1499,7 +1499,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type, kernel->width = kernel->height = ((size_t)args->rho)*2+1; kernel->x = kernel->y = (ssize_t) (kernel->width-1)/2; - kernel->values=(double *) AcquireAlignedMemory(kernel->width, + kernel->values=(double *) AcquireQuantumMemory(kernel->width, kernel->height*sizeof(double)); if (kernel->values == (double *) NULL) return(DestroyKernelInfo(kernel)); @@ -1540,7 +1540,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type, kernel->y = (ssize_t) args->psi; scale = 1.0; } - kernel->values=(double *) AcquireAlignedMemory(kernel->width, + kernel->values=(double *) AcquireQuantumMemory(kernel->width, kernel->height*sizeof(double)); if (kernel->values == (double *) NULL) return(DestroyKernelInfo(kernel)); @@ -1561,7 +1561,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type, kernel->width = kernel->height = ((size_t)args->rho)*2+1; kernel->x = kernel->y = (ssize_t) (kernel->width-1)/2; - kernel->values=(double *) AcquireAlignedMemory(kernel->width, + kernel->values=(double *) AcquireQuantumMemory(kernel->width, kernel->height*sizeof(double)); if (kernel->values == (double *) NULL) return(DestroyKernelInfo(kernel)); @@ -1587,7 +1587,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type, kernel->width = kernel->height = (size_t)fabs(args->rho)*2+1; kernel->x = kernel->y = (ssize_t) (kernel->width-1)/2; - kernel->values=(double *) AcquireAlignedMemory(kernel->width, + kernel->values=(double *) AcquireQuantumMemory(kernel->width, kernel->height*sizeof(double)); if (kernel->values == (double *) NULL) return(DestroyKernelInfo(kernel)); @@ -1609,7 +1609,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type, kernel->width = kernel->height = ((size_t)args->rho)*2+1; kernel->x = kernel->y = (ssize_t) (kernel->width-1)/2; - kernel->values=(double *) AcquireAlignedMemory(kernel->width, + kernel->values=(double *) AcquireQuantumMemory(kernel->width, kernel->height*sizeof(double)); if (kernel->values == (double *) NULL) return(DestroyKernelInfo(kernel)); @@ -1630,7 +1630,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type, kernel->width = kernel->height = ((size_t)args->rho)*2+1; kernel->x = kernel->y = (ssize_t) (kernel->width-1)/2; - kernel->values=(double *) AcquireAlignedMemory(kernel->width, + kernel->values=(double *) AcquireQuantumMemory(kernel->width, kernel->height*sizeof(double)); if (kernel->values == (double *) NULL) return(DestroyKernelInfo(kernel)); @@ -1671,7 +1671,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type, kernel->height = kernel->width; kernel->x = kernel->y = (ssize_t) (kernel->width-1)/2; - kernel->values=(double *) AcquireAlignedMemory(kernel->width, + kernel->values=(double *) AcquireQuantumMemory(kernel->width, kernel->height*sizeof(double)); if (kernel->values == (double *) NULL) return(DestroyKernelInfo(kernel)); @@ -2041,7 +2041,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type, kernel->width = kernel->height = ((size_t)args->rho)*2+1; kernel->x = kernel->y = (ssize_t) (kernel->width-1)/2; - kernel->values=(double *) AcquireAlignedMemory(kernel->width, + kernel->values=(double *) AcquireQuantumMemory(kernel->width, kernel->height*sizeof(double)); if (kernel->values == (double *) NULL) return(DestroyKernelInfo(kernel)); @@ -2061,7 +2061,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type, kernel->width = kernel->height = ((size_t)args->rho)*2+1; kernel->x = kernel->y = (ssize_t) (kernel->width-1)/2; - kernel->values=(double *) AcquireAlignedMemory(kernel->width, + kernel->values=(double *) AcquireQuantumMemory(kernel->width, kernel->height*sizeof(double)); if (kernel->values == (double *) NULL) return(DestroyKernelInfo(kernel)); @@ -2081,7 +2081,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type, kernel->width = kernel->height = ((size_t)args->rho)*2+1; kernel->x = kernel->y = (ssize_t) (kernel->width-1)/2; - kernel->values=(double *) AcquireAlignedMemory(kernel->width, + kernel->values=(double *) AcquireQuantumMemory(kernel->width, kernel->height*sizeof(double)); if (kernel->values == (double *) NULL) return(DestroyKernelInfo(kernel)); @@ -2106,7 +2106,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type, kernel->width = kernel->height = ((size_t)args->rho)*2+1; kernel->x = kernel->y = (ssize_t) (kernel->width-1)/2; - kernel->values=(double *) AcquireAlignedMemory(kernel->width, + kernel->values=(double *) AcquireQuantumMemory(kernel->width, kernel->height*sizeof(double)); if (kernel->values == (double *) NULL) return(DestroyKernelInfo(kernel)); @@ -2171,7 +2171,7 @@ MagickExport KernelInfo *CloneKernelInfo(const KernelInfo *kernel) *new_kernel=(*kernel); /* copy values in structure */ /* replace the values with a copy of the values */ - new_kernel->values=(double *) AcquireAlignedMemory(kernel->width, + new_kernel->values=(double *) AcquireQuantumMemory(kernel->width, kernel->height*sizeof(double)); if (new_kernel->values == (double *) NULL) return(DestroyKernelInfo(new_kernel)); diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c index 79c890b2e..96c290467 100644 --- a/MagickCore/pixel.c +++ b/MagickCore/pixel.c @@ -168,7 +168,7 @@ MagickExport PixelInfo *ClonePixelInfo(const PixelInfo *pixel) PixelInfo *pixel_info; - pixel_info=(PixelInfo *) AcquireAlignedMemory(1,sizeof(*pixel_info)); + pixel_info=(PixelInfo *) AcquireQuantumMemory(1,sizeof(*pixel_info)); if (pixel_info == (PixelInfo *) NULL) ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed"); *pixel_info=(*pixel); diff --git a/MagickCore/random-private.h b/MagickCore/random-private.h index 112faa8a4..c337de7c1 100644 --- a/MagickCore/random-private.h +++ b/MagickCore/random-private.h @@ -40,7 +40,7 @@ static inline RandomInfo **DestroyRandomInfoThreadSet( for (i=0; i < (ssize_t) GetOpenMPMaximumThreads(); i++) if (random_info[i] != (RandomInfo *) NULL) random_info[i]=DestroyRandomInfo(random_info[i]); - return((RandomInfo **) RelinquishAlignedMemory(random_info)); + return((RandomInfo **) RelinquishMagickMemory(random_info)); } static inline RandomInfo **AcquireRandomInfoThreadSet(void) @@ -55,7 +55,7 @@ static inline RandomInfo **AcquireRandomInfoThreadSet(void) number_threads; number_threads=GetOpenMPMaximumThreads(); - random_info=(RandomInfo **) AcquireAlignedMemory(number_threads, + random_info=(RandomInfo **) AcquireQuantumMemory(number_threads, sizeof(*random_info)); if (random_info == (RandomInfo **) NULL) return((RandomInfo **) NULL); diff --git a/MagickCore/resample-private.h b/MagickCore/resample-private.h index 2658859f2..446064f87 100644 --- a/MagickCore/resample-private.h +++ b/MagickCore/resample-private.h @@ -34,7 +34,7 @@ static inline ResampleFilter **DestroyResampleFilterThreadSet( for (i=0; i < (ssize_t) GetOpenMPMaximumThreads(); i++) if (filter[i] != (ResampleFilter *) NULL) filter[i]=DestroyResampleFilter(filter[i]); - filter=(ResampleFilter **) RelinquishAlignedMemory(filter); + filter=(ResampleFilter **) RelinquishMagickMemory(filter); return(filter); } @@ -52,7 +52,7 @@ static inline ResampleFilter **AcquireResampleFilterThreadSet( number_threads; number_threads=GetOpenMPMaximumThreads(); - filter=(ResampleFilter **) AcquireAlignedMemory(number_threads, + filter=(ResampleFilter **) AcquireQuantumMemory(number_threads, sizeof(*filter)); if (filter == (ResampleFilter **) NULL) return((ResampleFilter **) NULL); diff --git a/MagickCore/version.h b/MagickCore/version.h index 6e668b425..9b5d7d3fc 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,7 +27,7 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2011 ImageMagick Studio LLC" -#define MagickSVNRevision "5290" +#define MagickSVNRevision "exported" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 7,0,0