From: cristy Date: Tue, 25 Oct 2011 01:18:30 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~6746 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7b4457a7a2fb71dc384498a90b1fb850c0c82a1f;p=imagemagick --- diff --git a/MagickCore/decorate.c b/MagickCore/decorate.c index 6f12c2c66..4771b9ea0 100644 --- a/MagickCore/decorate.c +++ b/MagickCore/decorate.c @@ -185,7 +185,6 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info, PixelInfo accentuate, - border, highlight, interior, matte, @@ -241,39 +240,39 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info, /* Initialize 3D effects color. */ - GetPixelInfo(frame_image,&interior); - SetPixelInfoPacket(frame_image,&image->border_color,&interior); - GetPixelInfo(frame_image,&matte); - matte.colorspace=RGBColorspace; - SetPixelInfoPacket(frame_image,&image->matte_color,&matte); - GetPixelInfo(frame_image,&border); - border.colorspace=RGBColorspace; - SetPixelInfoPacket(frame_image,&image->border_color,&border); - GetPixelInfo(frame_image,&accentuate); + interior=image->border_color; + matte=image->matte_color; + accentuate=matte; accentuate.red=(MagickRealType) (QuantumScale*((QuantumRange- AccentuateModulate)*matte.red+(QuantumRange*AccentuateModulate))); accentuate.green=(MagickRealType) (QuantumScale*((QuantumRange- AccentuateModulate)*matte.green+(QuantumRange*AccentuateModulate))); accentuate.blue=(MagickRealType) (QuantumScale*((QuantumRange- AccentuateModulate)*matte.blue+(QuantumRange*AccentuateModulate))); + accentuate.black=(MagickRealType) (QuantumScale*((QuantumRange- + AccentuateModulate)*matte.black+(QuantumRange*AccentuateModulate))); accentuate.alpha=matte.alpha; - GetPixelInfo(frame_image,&highlight); + highlight=matte; highlight.red=(MagickRealType) (QuantumScale*((QuantumRange- HighlightModulate)*matte.red+(QuantumRange*HighlightModulate))); highlight.green=(MagickRealType) (QuantumScale*((QuantumRange- HighlightModulate)*matte.green+(QuantumRange*HighlightModulate))); highlight.blue=(MagickRealType) (QuantumScale*((QuantumRange- HighlightModulate)*matte.blue+(QuantumRange*HighlightModulate))); + highlight.black=(MagickRealType) (QuantumScale*((QuantumRange- + HighlightModulate)*matte.black+(QuantumRange*HighlightModulate))); highlight.alpha=matte.alpha; - GetPixelInfo(frame_image,&shadow); + shadow=matte; shadow.red=QuantumScale*matte.red*ShadowModulate; shadow.green=QuantumScale*matte.green*ShadowModulate; shadow.blue=QuantumScale*matte.blue*ShadowModulate; + shadow.black=QuantumScale*matte.black*ShadowModulate; shadow.alpha=matte.alpha; - GetPixelInfo(frame_image,&trough); + trough=matte; trough.red=QuantumScale*matte.red*TroughModulate; trough.green=QuantumScale*matte.green*TroughModulate; trough.blue=QuantumScale*matte.blue*TroughModulate; + trough.black=QuantumScale*matte.black*TroughModulate; trough.alpha=matte.alpha; status=MagickTrue; progress=0; diff --git a/MagickCore/distort.c b/MagickCore/distort.c index b934e1b7c..5d1be362d 100644 --- a/MagickCore/distort.c +++ b/MagickCore/distort.c @@ -2311,10 +2311,7 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method, */ validity = 1.0; - GetPixelInfo(distort_image,&invalid); - SetPixelInfoPacket(distort_image,&distort_image->matte_color,&invalid); - if (distort_image->colorspace == CMYKColorspace) - ConvertRGBToCMYK(&invalid); /* what about other color spaces? */ + invalid=distort_image->matte_color; for (i=0; i < (ssize_t) distort_image->columns; i++) { /* map pixel coordinate to distortion space coordinate */ diff --git a/MagickCore/histogram.c b/MagickCore/histogram.c index af17ac290..816268bdb 100644 --- a/MagickCore/histogram.c +++ b/MagickCore/histogram.c @@ -257,7 +257,7 @@ static CubeInfo *ClassifyImageColors(const Image *image, } for (i=0; i < (ssize_t) node_info->number_unique; i++) { - SetPixelInfoPacket(image,&node_info->list[i],&target); + target=node_info->list[i]; if (IsPixelInfoEquivalent(&pixel,&target) != MagickFalse) break; } @@ -725,7 +725,7 @@ MagickExport MagickBooleanType IsHistogramImage(const Image *image, break; for (i=0; i < (ssize_t) node_info->number_unique; i++) { - SetPixelInfoPacket(image,&node_info->list[i],&target); + target=node_info->list[i]; if (IsPixelInfoEquivalent(&pixel,&target) != MagickFalse) break; } @@ -885,7 +885,7 @@ MagickExport MagickBooleanType IsPaletteImage(const Image *image, break; for (i=0; i < (ssize_t) node_info->number_unique; i++) { - SetPixelInfoPacket(image,&node_info->list[i],&target); + target=node_info->list[i]; if (IsPixelInfoEquivalent(&pixel,&target) != MagickFalse) break; } @@ -1134,7 +1134,7 @@ MagickExport size_t GetNumberColors(const Image *image,FILE *file, status=MagickTrue; for (i=0; i < (ssize_t) number_colors; i++) { - SetPixelInfoPacket(image,p,&pixel); + pixel=(*p); (void) CopyMagickString(tuple,"(",MaxTextExtent); ConcatenateColorComponent(&pixel,RedPixelChannel,X11Compliance,tuple); (void) ConcatenateMagickString(tuple,",",MaxTextExtent); diff --git a/MagickCore/identify.c b/MagickCore/identify.c index ba1c16def..d6d7501d8 100644 --- a/MagickCore/identify.c +++ b/MagickCore/identify.c @@ -647,7 +647,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, p=image->colormap; for (i=0; i < (ssize_t) image->colors; i++) { - SetPixelInfoPacket(image,p,&pixel); + pixel=(*p); (void) CopyMagickString(tuple,"(",MaxTextExtent); ConcatenateColorComponent(&pixel,RedPixelChannel,X11Compliance, tuple); diff --git a/MagickCore/image.c b/MagickCore/image.c index c31f1a363..742d48058 100644 --- a/MagickCore/image.c +++ b/MagickCore/image.c @@ -2433,9 +2433,6 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image, PixelInfo background; - PixelInfo - pixel; - ssize_t y; @@ -2446,9 +2443,7 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image, break; if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) break; - GetPixelInfo(image,&background); - SetPixelInfoPacket(image,&image->background_color,&background); - SetPacketPixelInfo(image,&background,&pixel); + background=image->background_color; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(dynamic,4) shared(status) @@ -2506,8 +2501,7 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image, /* Reset all color channels to background color. */ - GetPixelInfo(image,&background); - SetPixelInfoPacket(image,&(image->background_color),&background); + background=image->background_color; (void) LevelImageColors(image,&background,&background,MagickTrue, exception); } @@ -2589,9 +2583,6 @@ MagickExport MagickBooleanType SetImageBackgroundColor(Image *image, PixelInfo background; - PixelInfo - pixel; - ssize_t y; @@ -2604,13 +2595,11 @@ MagickExport MagickBooleanType SetImageBackgroundColor(Image *image, if (image->background_color.alpha != OpaqueAlpha) image->matte=MagickTrue; GetPixelInfo(image,&background); - SetPixelInfoPacket(image,&image->background_color,&background); - SetPacketPixelInfo(image,&background,&pixel); + background=image->background_color; /* Set image background color. */ status=MagickTrue; - pixel.black=0; image_view=AcquireCacheView(image); for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h index feb5a4e24..1bf8a4958 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 @@ -435,15 +441,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 */ @@ -1171,7 +1177,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 @@ -1200,17 +1208,21 @@ #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 */ -/* #undef LTDL_DELEGATE */ +#ifndef MAGICKCORE_LTDL_DELEGATE +#define MAGICKCORE_LTDL_DELEGATE 1 +#endif /* Define if the OS needs help to load dependent libraries for dlopen(). */ /* #undef LTDL_DLOPEN_DEPLIBS */ /* 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/lib64/tracker-0.12:/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:/opt/intel/lib/intel64:/usr/lib64/llvm:/usr/local/lib:/usr/lib64/mysql:/usr/lib64/nvidia:/usr/lib64/qt-3.3/lib:/usr/lib64/tracker-0.12:/usr/lib64/xulrunner-2" #endif /* The archive extension */ @@ -1261,7 +1273,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 /* Name of package */ #ifndef MAGICKCORE_PACKAGE @@ -1321,7 +1335,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 @@ -1468,7 +1484,9 @@ #endif /* 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 */ @@ -1477,7 +1495,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). */ diff --git a/MagickCore/methods.h b/MagickCore/methods.h index dad10f322..d7858f181 100644 --- a/MagickCore/methods.h +++ b/MagickCore/methods.h @@ -37,25 +37,33 @@ extern "C" { #define PrependMagickMethod(method) \ EvaluateMagickPrefix(MAGICKCORE_NAMESPACE_PREFIX,method) -#define AccelerateConvolveImage PrependMagickMethod(AccelerateConvolveImage) -#define AcquireAlignedMemory PrependMagickMethod(AcquireAlignedMemory) +#define AcquireQuantumMemory PrependMagickMethod(AcquireQuantumMemory) +#define AcquireCacheViewIndexes PrependMagickMethod(AcquireCacheViewIndexes) +#define AcquireCacheViewPixels PrependMagickMethod(AcquireCacheViewPixels) #define AcquireCacheView PrependMagickMethod(AcquireCacheView) #define AcquireDrawInfo PrependMagickMethod(AcquireDrawInfo) #define AcquireExceptionInfo PrependMagickMethod(AcquireExceptionInfo) #define AcquireFxInfo PrependMagickMethod(AcquireFxInfo) #define AcquireImageColormap PrependMagickMethod(AcquireImageColormap) #define AcquireImageInfo PrependMagickMethod(AcquireImageInfo) +#define AcquireImagePixels PrependMagickMethod(AcquireImagePixels) #define AcquireImage PrependMagickMethod(AcquireImage) +#define AcquireIndexes PrependMagickMethod(AcquireIndexes) #define AcquireKernelBuiltIn PrependMagickMethod(AcquireKernelBuiltIn) #define AcquireKernelInfo PrependMagickMethod(AcquireKernelInfo) #define AcquireMagickMatrix PrependMagickMethod(AcquireMagickMatrix) #define AcquireMagickMemory PrependMagickMethod(AcquireMagickMemory) #define AcquireMagickResource PrependMagickMethod(AcquireMagickResource) +#define AcquireMemory PrependMagickMethod(AcquireMemory) #define AcquireNextImage PrependMagickMethod(AcquireNextImage) +#define AcquireOneCacheViewPixel PrependMagickMethod(AcquireOneCacheViewPixel) +#define AcquireOneCacheViewVirtualPixel PrependMagickMethod(AcquireOneCacheViewVirtualPixel) +#define AcquireOneMagickPixel PrependMagickMethod(AcquireOneMagickPixel) +#define AcquireOnePixel PrependMagickMethod(AcquireOnePixel) +#define AcquireOneVirtualPixel PrependMagickMethod(AcquireOneVirtualPixel) #define AcquirePixelCacheNexus PrependMagickMethod(AcquirePixelCacheNexus) -#define AcquirePixelCachePixels PrependMagickMethod(AcquirePixelCachePixels) #define AcquirePixelCache PrependMagickMethod(AcquirePixelCache) -#define AcquirePixelChannelMap PrependMagickMethod(AcquirePixelChannelMap) +#define AcquirePixels PrependMagickMethod(AcquirePixels) #define AcquireQuantizeInfo PrependMagickMethod(AcquireQuantizeInfo) #define AcquireQuantumInfo PrependMagickMethod(AcquireQuantumInfo) #define AcquireQuantumMemory PrependMagickMethod(AcquireQuantumMemory) @@ -73,20 +81,26 @@ extern "C" { #define AcquireUniqueFileResource PrependMagickMethod(AcquireUniqueFileResource) #define AcquireUniqueSymbolicLink PrependMagickMethod(AcquireUniqueSymbolicLink) #define AdaptiveBlurImage PrependMagickMethod(AdaptiveBlurImage) -#define AdaptiveLevelImage PrependMagickMethod(AdaptiveLevelImage) +#define AdaptiveBlurImage PrependMagickMethod(AdaptiveBlurImage) #define AdaptiveResizeImage PrependMagickMethod(AdaptiveResizeImage) #define AdaptiveSharpenImage PrependMagickMethod(AdaptiveSharpenImage) +#define AdaptiveSharpenImage PrependMagickMethod(AdaptiveSharpenImage) #define AdaptiveThresholdImage PrependMagickMethod(AdaptiveThresholdImage) #define AddChildToXMLTree PrependMagickMethod(AddChildToXMLTree) #define AddNoiseImage PrependMagickMethod(AddNoiseImage) +#define AddNoiseImage PrependMagickMethod(AddNoiseImage) #define AddPathToXMLTree PrependMagickMethod(AddPathToXMLTree) #define AddValueToSplayTree PrependMagickMethod(AddValueToSplayTree) #define AffineTransformImage PrependMagickMethod(AffineTransformImage) +#define AffinityImage PrependMagickMethod(AffinityImage) +#define AffinityImages PrependMagickMethod(AffinityImages) +#define AllocateImageColormap PrependMagickMethod(AllocateImageColormap) +#define AllocateImage PrependMagickMethod(AllocateImage) +#define AllocateNextImage PrependMagickMethod(AllocateNextImage) #define AllocateSemaphoreInfo PrependMagickMethod(AllocateSemaphoreInfo) +#define AllocateString PrependMagickMethod(AllocateString) #define analyzeImage PrependMagickMethod(analyzeImage) #define AnimateImages PrependMagickMethod(AnimateImages) -#define AnnotateComponentGenesis PrependMagickMethod(AnnotateComponentGenesis) -#define AnnotateComponentTerminus PrependMagickMethod(AnnotateComponentTerminus) #define AnnotateImage PrependMagickMethod(AnnotateImage) #define AppendImageFormat PrependMagickMethod(AppendImageFormat) #define AppendImages PrependMagickMethod(AppendImages) @@ -98,36 +112,46 @@ extern "C" { #define AsynchronousResourceComponentTerminus PrependMagickMethod(AsynchronousResourceComponentTerminus) #define AttachBlob PrependMagickMethod(AttachBlob) #define AutoGammaImage PrependMagickMethod(AutoGammaImage) +#define AutoGammaImage PrependMagickMethod(AutoGammaImage) +#define AutoLevelImage PrependMagickMethod(AutoLevelImage) #define AutoLevelImage PrependMagickMethod(AutoLevelImage) +#define AverageImages PrependMagickMethod(AverageImages) #define Base64Decode PrependMagickMethod(Base64Decode) #define Base64Encode PrependMagickMethod(Base64Encode) #define BilevelImage PrependMagickMethod(BilevelImage) +#define BilevelImage PrependMagickMethod(BilevelImage) +#define BlackThresholdImage PrependMagickMethod(BlackThresholdImage) #define BlackThresholdImage PrependMagickMethod(BlackThresholdImage) #define BlobToFile PrependMagickMethod(BlobToFile) #define BlobToImage PrependMagickMethod(BlobToImage) -#define BlobToStringInfo PrependMagickMethod(BlobToStringInfo) #define BlueShiftImage PrependMagickMethod(BlueShiftImage) #define BlurImage PrependMagickMethod(BlurImage) +#define BlurImage PrependMagickMethod(BlurImage) #define BorderImage PrependMagickMethod(BorderImage) #define BrightnessContrastImage PrependMagickMethod(BrightnessContrastImage) +#define BrightnessContrastImage PrependMagickMethod(BrightnessContrastImage) #define CacheComponentGenesis PrependMagickMethod(CacheComponentGenesis) #define CacheComponentTerminus PrependMagickMethod(CacheComponentTerminus) #define CanonicalXMLContent PrependMagickMethod(CanonicalXMLContent) #define CatchException PrependMagickMethod(CatchException) #define CatchImageException PrependMagickMethod(CatchImageException) +#define ChannelImage PrependMagickMethod(ChannelImage) +#define ChannelThresholdImage PrependMagickMethod(ChannelThresholdImage) #define CharcoalImage PrependMagickMethod(CharcoalImage) #define ChopImage PrependMagickMethod(ChopImage) #define ChopPathComponents PrependMagickMethod(ChopPathComponents) #define ClampImage PrependMagickMethod(ClampImage) +#define ClampImage PrependMagickMethod(ClampImage) #define ClearLinkedList PrependMagickMethod(ClearLinkedList) #define ClearMagickException PrependMagickMethod(ClearMagickException) #define ClipImagePath PrependMagickMethod(ClipImagePath) #define ClipImage PrependMagickMethod(ClipImage) +#define ClipPathImage PrependMagickMethod(ClipPathImage) #define CloneBlobInfo PrependMagickMethod(CloneBlobInfo) #define CloneCacheView PrependMagickMethod(CloneCacheView) #define CloneDrawInfo PrependMagickMethod(CloneDrawInfo) -#define CloneExceptionInfo PrependMagickMethod(CloneExceptionInfo) #define CloneImageArtifacts PrependMagickMethod(CloneImageArtifacts) +#define CloneImageAttributes PrependMagickMethod(CloneImageAttributes) #define CloneImageInfo PrependMagickMethod(CloneImageInfo) #define CloneImageList PrependMagickMethod(CloneImageList) #define CloneImageOptions PrependMagickMethod(CloneImageOptions) @@ -135,38 +159,38 @@ extern "C" { #define CloneImageProfiles PrependMagickMethod(CloneImageProfiles) #define CloneImageProperties PrependMagickMethod(CloneImageProperties) #define CloneImages PrependMagickMethod(CloneImages) -#define CloneImageView PrependMagickMethod(CloneImageView) -#define CloneKernelInfo PrependMagickMethod(CloneKernelInfo) +#define CloneMemory PrependMagickMethod(CloneMemory) #define CloneMontageInfo PrependMagickMethod(CloneMontageInfo) #define ClonePixelCacheMethods PrependMagickMethod(ClonePixelCacheMethods) #define ClonePixelCache PrependMagickMethod(ClonePixelCache) -#define ClonePixelChannelMap PrependMagickMethod(ClonePixelChannelMap) -#define ClonePixelInfo PrependMagickMethod(ClonePixelInfo) #define CloneQuantizeInfo PrependMagickMethod(CloneQuantizeInfo) #define CloneSplayTree PrependMagickMethod(CloneSplayTree) #define CloneStringInfo PrependMagickMethod(CloneStringInfo) #define CloneString PrependMagickMethod(CloneString) #define CloseBlob PrependMagickMethod(CloseBlob) +#define CloseCacheView PrependMagickMethod(CloseCacheView) #define CloseMagickLog PrependMagickMethod(CloseMagickLog) #define ClutImage PrependMagickMethod(ClutImage) +#define ClutImage PrependMagickMethod(ClutImage) #define CoalesceImages PrependMagickMethod(CoalesceImages) #define CoderComponentGenesis PrependMagickMethod(CoderComponentGenesis) #define CoderComponentTerminus PrependMagickMethod(CoderComponentTerminus) #define ColorComponentGenesis PrependMagickMethod(ColorComponentGenesis) #define ColorComponentTerminus PrependMagickMethod(ColorComponentTerminus) #define ColorDecisionListImage PrependMagickMethod(ColorDecisionListImage) +#define ColorFloodfillImage PrependMagickMethod(ColorFloodfillImage) #define ColorizeImage PrependMagickMethod(ColorizeImage) -#define ColorMatrixImage PrependMagickMethod(ColorMatrixImage) #define CombineImages PrependMagickMethod(CombineImages) -#define CommandOptionToMnemonic PrependMagickMethod(CommandOptionToMnemonic) #define CompareHashmapStringInfo PrependMagickMethod(CompareHashmapStringInfo) #define CompareHashmapString PrependMagickMethod(CompareHashmapString) +#define CompareImages PrependMagickMethod(CompareImages) #define CompareImagesLayers PrependMagickMethod(CompareImagesLayers) #define CompareImages PrependMagickMethod(CompareImages) #define CompareSplayTreeStringInfo PrependMagickMethod(CompareSplayTreeStringInfo) #define CompareSplayTreeString PrependMagickMethod(CompareSplayTreeString) #define CompareStringInfo PrependMagickMethod(CompareStringInfo) #define CompositeImage PrependMagickMethod(CompositeImage) +#define CompositeImage PrependMagickMethod(CompositeImage) #define CompositeLayers PrependMagickMethod(CompositeLayers) #define CompressImageColormap PrependMagickMethod(CompressImageColormap) #define ConcatenateColorComponent PrependMagickMethod(ConcatenateColorComponent) @@ -184,6 +208,7 @@ extern "C" { #define ContinueTimer PrependMagickMethod(ContinueTimer) #define ContrastImage PrependMagickMethod(ContrastImage) #define ContrastStretchImage PrependMagickMethod(ContrastStretchImage) +#define ContrastStretchImage PrependMagickMethod(ContrastStretchImage) #define ConvertHSBToRGB PrependMagickMethod(ConvertHSBToRGB) #define ConvertHSLToRGB PrependMagickMethod(ConvertHSLToRGB) #define ConvertHWBToRGB PrependMagickMethod(ConvertHWBToRGB) @@ -191,12 +216,13 @@ extern "C" { #define ConvertRGBToHSL PrependMagickMethod(ConvertRGBToHSL) #define ConvertRGBToHWB PrependMagickMethod(ConvertRGBToHWB) #define ConvolveImage PrependMagickMethod(ConvolveImage) +#define ConvolveImage PrependMagickMethod(ConvolveImage) #define CopyMagickMemory PrependMagickMethod(CopyMagickMemory) #define CopyMagickString PrependMagickMethod(CopyMagickString) #define CropImage PrependMagickMethod(CropImage) -#define CropImageToTiles PrependMagickMethod(CropImageToTiles) #define CycleColormapImage PrependMagickMethod(CycleColormapImage) #define DecipherImage PrependMagickMethod(DecipherImage) +#define DeconstructImages PrependMagickMethod(DeconstructImages) #define DefineImageArtifact PrependMagickMethod(DefineImageArtifact) #define DefineImageOption PrependMagickMethod(DefineImageOption) #define DefineImageProperty PrependMagickMethod(DefineImageProperty) @@ -204,14 +230,18 @@ extern "C" { #define DelegateComponentGenesis PrependMagickMethod(DelegateComponentGenesis) #define DelegateComponentTerminus PrependMagickMethod(DelegateComponentTerminus) #define DeleteImageArtifact PrependMagickMethod(DeleteImageArtifact) +#define DeleteImageAttribute PrependMagickMethod(DeleteImageAttribute) #define DeleteImageFromList PrependMagickMethod(DeleteImageFromList) +#define DeleteImageList PrependMagickMethod(DeleteImageList) #define DeleteImageOption PrependMagickMethod(DeleteImageOption) #define DeleteImageProfile PrependMagickMethod(DeleteImageProfile) #define DeleteImageProperty PrependMagickMethod(DeleteImageProperty) #define DeleteImageRegistry PrependMagickMethod(DeleteImageRegistry) #define DeleteImages PrependMagickMethod(DeleteImages) +#define DeleteMagickRegistry PrependMagickMethod(DeleteMagickRegistry) #define DeleteNodeByValueFromSplayTree PrependMagickMethod(DeleteNodeByValueFromSplayTree) #define DeleteNodeFromSplayTree PrependMagickMethod(DeleteNodeFromSplayTree) +#define DescribeImage PrependMagickMethod(DescribeImage) #define DeskewImage PrependMagickMethod(DeskewImage) #define DespeckleImage PrependMagickMethod(DespeckleImage) #define DestroyBlob PrependMagickMethod(DestroyBlob) @@ -222,6 +252,7 @@ extern "C" { #define DestroyFxInfo PrependMagickMethod(DestroyFxInfo) #define DestroyHashmap PrependMagickMethod(DestroyHashmap) #define DestroyImageArtifacts PrependMagickMethod(DestroyImageArtifacts) +#define DestroyImageAttributes PrependMagickMethod(DestroyImageAttributes) #define DestroyImageInfo PrependMagickMethod(DestroyImageInfo) #define DestroyImageList PrependMagickMethod(DestroyImageList) #define DestroyImageOptions PrependMagickMethod(DestroyImageOptions) @@ -229,15 +260,16 @@ extern "C" { #define DestroyImage PrependMagickMethod(DestroyImage) #define DestroyImageProfiles PrependMagickMethod(DestroyImageProfiles) #define DestroyImageProperties PrependMagickMethod(DestroyImageProperties) -#define DestroyImageView PrependMagickMethod(DestroyImageView) -#define DestroyKernelInfo PrependMagickMethod(DestroyKernelInfo) +#define DestroyImages PrependMagickMethod(DestroyImages) +#define DestroyKernel PrependMagickMethod(DestroyKernel) #define DestroyLinkedList PrependMagickMethod(DestroyLinkedList) #define DestroyLocaleOptions PrependMagickMethod(DestroyLocaleOptions) #define DestroyMagickMemory PrependMagickMethod(DestroyMagickMemory) +#define DestroyMagick PrependMagickMethod(DestroyMagick) +#define DestroyMagickRegistry PrependMagickMethod(DestroyMagickRegistry) #define DestroyMontageInfo PrependMagickMethod(DestroyMontageInfo) #define DestroyPixelCacheNexus PrependMagickMethod(DestroyPixelCacheNexus) #define DestroyPixelCache PrependMagickMethod(DestroyPixelCache) -#define DestroyPixelChannelMap PrependMagickMethod(DestroyPixelChannelMap) #define DestroyQuantizeInfo PrependMagickMethod(DestroyQuantizeInfo) #define DestroyQuantumInfo PrependMagickMethod(DestroyQuantumInfo) #define DestroyRandomInfo PrependMagickMethod(DestroyRandomInfo) @@ -258,29 +290,27 @@ extern "C" { #define DestroyXWidget PrependMagickMethod(DestroyXWidget) #define DetachBlob PrependMagickMethod(DetachBlob) #define DisassociateImageStream PrependMagickMethod(DisassociateImageStream) -#define DiscardBlobBytes PrependMagickMethod(DiscardBlobBytes) +#define DispatchImage PrependMagickMethod(DispatchImage) #define DisplayImages PrependMagickMethod(DisplayImages) #define DisposeImages PrependMagickMethod(DisposeImages) #define DistortImage PrependMagickMethod(DistortImage) -#define DistortResizeImage PrependMagickMethod(DistortResizeImage) #define DrawAffineImage PrependMagickMethod(DrawAffineImage) #define DrawClipPath PrependMagickMethod(DrawClipPath) #define DrawGradientImage PrependMagickMethod(DrawGradientImage) #define DrawImage PrependMagickMethod(DrawImage) #define DrawPatternPath PrependMagickMethod(DrawPatternPath) #define DrawPrimitive PrependMagickMethod(DrawPrimitive) -#define DuplexTransferImageViewIterator PrependMagickMethod(DuplexTransferImageViewIterator) #define DuplicateBlob PrependMagickMethod(DuplicateBlob) -#define DuplicateImages PrependMagickMethod(DuplicateImages) #define EdgeImage PrependMagickMethod(EdgeImage) #define EmbossImage PrependMagickMethod(EmbossImage) #define EncipherImage PrependMagickMethod(EncipherImage) #define EnhanceImage PrependMagickMethod(EnhanceImage) #define EOFBlob PrependMagickMethod(EOFBlob) #define EqualizeImage PrependMagickMethod(EqualizeImage) +#define EqualizeImage PrependMagickMethod(EqualizeImage) #define EscapeString PrependMagickMethod(EscapeString) #define EvaluateImage PrependMagickMethod(EvaluateImage) -#define EvaluateImages PrependMagickMethod(EvaluateImages) +#define EvaluateImage PrependMagickMethod(EvaluateImage) #define ExcerptImage PrependMagickMethod(ExcerptImage) #define ExpandAffine PrependMagickMethod(ExpandAffine) #define ExpandFilename PrependMagickMethod(ExpandFilename) @@ -288,30 +318,44 @@ extern "C" { #define ExportImagePixels PrependMagickMethod(ExportImagePixels) #define ExportQuantumPixels PrependMagickMethod(ExportQuantumPixels) #define ExtentImage PrependMagickMethod(ExtentImage) +#define ExtractSubimageFromImage PrependMagickMethod(ExtractSubimageFromImage) #define FileToBlob PrependMagickMethod(FileToBlob) #define FileToImage PrependMagickMethod(FileToImage) #define FileToStringInfo PrependMagickMethod(FileToStringInfo) #define FileToString PrependMagickMethod(FileToString) +#define ConvolveImage PrependMagickMethod(ConvolveImage) +#define ConvolveImage PrependMagickMethod(ConvolveImage) #define FinalizeSignature PrependMagickMethod(FinalizeSignature) +#define FlattenImages PrependMagickMethod(FlattenImages) #define FlipImage PrependMagickMethod(FlipImage) #define FloodfillPaintImage PrependMagickMethod(FloodfillPaintImage) #define FlopImage PrependMagickMethod(FlopImage) +#define FormatImageAttributeList PrependMagickMethod(FormatImageAttributeList) +#define FormatImageAttribute PrependMagickMethod(FormatImageAttribute) +#define FormatImagePropertyList PrependMagickMethod(FormatImagePropertyList) #define FormatImageProperty PrependMagickMethod(FormatImageProperty) -#define FormatLocaleFileList PrependMagickMethod(FormatLocaleFileList) -#define FormatLocaleFile PrependMagickMethod(FormatLocaleFile) -#define FormatLocaleStringList PrependMagickMethod(FormatLocaleStringList) -#define FormatLocaleString PrependMagickMethod(FormatLocaleString) #define FormatMagickCaption PrependMagickMethod(FormatMagickCaption) #define FormatMagickSize PrependMagickMethod(FormatMagickSize) +#define FormatLocaleStringList PrependMagickMethod(FormatLocaleStringList) +#define FormatLocaleString PrependMagickMethod(FormatLocaleString) #define FormatMagickTime PrependMagickMethod(FormatMagickTime) +#define FormatStringList PrependMagickMethod(FormatStringList) +#define FormatString PrependMagickMethod(FormatString) #define ForwardFourierTransformImage PrependMagickMethod(ForwardFourierTransformImage) #define FrameImage PrependMagickMethod(FrameImage) #define FunctionImage PrependMagickMethod(FunctionImage) +#define FunctionImage PrependMagickMethod(FunctionImage) +#define FuzzyColorCompare PrependMagickMethod(FuzzyColorCompare) +#define FuzzyColorMatch PrependMagickMethod(FuzzyColorMatch) +#define FuzzyOpacityCompare PrependMagickMethod(FuzzyOpacityCompare) #define FxEvaluateChannelExpression PrependMagickMethod(FxEvaluateChannelExpression) #define FxEvaluateExpression PrependMagickMethod(FxEvaluateExpression) #define FxImage PrependMagickMethod(FxImage) +#define FxImage PrependMagickMethod(FxImage) #define FxPreprocessExpression PrependMagickMethod(FxPreprocessExpression) #define GammaImage PrependMagickMethod(GammaImage) +#define GammaImage PrependMagickMethod(GammaImage) +#define GaussianBlurImage PrependMagickMethod(GaussianBlurImage) #define GaussianBlurImage PrependMagickMethod(GaussianBlurImage) #define GaussJordanElimination PrependMagickMethod(GaussJordanElimination) #define GenerateDifferentialNoise PrependMagickMethod(GenerateDifferentialNoise) @@ -331,7 +375,11 @@ extern "C" { #define GetCacheViewAuthenticPixelQueue PrependMagickMethod(GetCacheViewAuthenticPixelQueue) #define GetCacheViewAuthenticPixels PrependMagickMethod(GetCacheViewAuthenticPixels) #define GetCacheViewColorspace PrependMagickMethod(GetCacheViewColorspace) +#define GetCacheViewException PrependMagickMethod(GetCacheViewException) #define GetCacheViewExtent PrependMagickMethod(GetCacheViewExtent) +#define GetCacheViewIndexes PrependMagickMethod(GetCacheViewIndexes) +#define GetCacheViewPixels PrependMagickMethod(GetCacheViewPixels) +#define GetCacheView PrependMagickMethod(GetCacheView) #define GetCacheViewStorageClass PrependMagickMethod(GetCacheViewStorageClass) #define GetCacheViewVirtualMetacontent PrependMagickMethod(GetCacheViewVirtualMetacontent) #define GetCacheViewVirtualPixelQueue PrependMagickMethod(GetCacheViewVirtualPixelQueue) @@ -341,13 +389,11 @@ extern "C" { #define GetCoderInfoList PrependMagickMethod(GetCoderInfoList) #define GetCoderInfo PrependMagickMethod(GetCoderInfo) #define GetCoderList PrependMagickMethod(GetCoderList) -#define GetColorCompliance PrependMagickMethod(GetColorCompliance) #define GetColorInfoList PrependMagickMethod(GetColorInfoList) #define GetColorInfo PrependMagickMethod(GetColorInfo) #define GetColorList PrependMagickMethod(GetColorList) #define GetColorTuple PrependMagickMethod(GetColorTuple) -#define GetCommandOptionFlags PrependMagickMethod(GetCommandOptionFlags) -#define GetCommandOptions PrependMagickMethod(GetCommandOptions) +#define GetConfigureBlob PrependMagickMethod(GetConfigureBlob) #define GetConfigureInfoList PrependMagickMethod(GetConfigureInfoList) #define GetConfigureInfo PrependMagickMethod(GetConfigureInfo) #define GetConfigureList PrependMagickMethod(GetConfigureList) @@ -372,28 +418,44 @@ extern "C" { #define GetGeometry PrependMagickMethod(GetGeometry) #define GetImageAlphaChannel PrependMagickMethod(GetImageAlphaChannel) #define GetImageArtifact PrependMagickMethod(GetImageArtifact) +#define GetImageAttribute PrependMagickMethod(GetImageAttribute) #define GetImageBoundingBox PrependMagickMethod(GetImageBoundingBox) +#define GetImageDepth PrependMagickMethod(GetImageDepth) +#define GetImageDistortion PrependMagickMethod(GetImageDistortion) +#define GetImageDistortions PrependMagickMethod(GetImageDistortions) +#define GetImageExtrema PrependMagickMethod(GetImageExtrema) +#define GetImageKurtosis PrependMagickMethod(GetImageKurtosis) +#define GetImageMean PrependMagickMethod(GetImageMean) +#define GetImageRange PrependMagickMethod(GetImageRange) +#define GetImageStatistics PrependMagickMethod(GetImageStatistics) #define GetImageClipMask PrependMagickMethod(GetImageClipMask) +#define GetImageClippingPathAttribute PrependMagickMethod(GetImageClippingPathAttribute) #define GetImageDecoder PrependMagickMethod(GetImageDecoder) #define GetImageDepth PrependMagickMethod(GetImageDepth) #define GetImageDistortion PrependMagickMethod(GetImageDistortion) -#define GetImageDistortions PrependMagickMethod(GetImageDistortions) #define GetImageDynamicThreshold PrependMagickMethod(GetImageDynamicThreshold) #define GetImageEncoder PrependMagickMethod(GetImageEncoder) +#define GetImageException PrependMagickMethod(GetImageException) #define GetImageExtent PrependMagickMethod(GetImageExtent) #define GetImageExtrema PrependMagickMethod(GetImageExtrema) -#define GetImageFeatures PrependMagickMethod(GetImageFeatures) #define GetImageFromList PrependMagickMethod(GetImageFromList) +#define GetImageFromMagickRegistry PrependMagickMethod(GetImageFromMagickRegistry) +#define GetImageGeometry PrependMagickMethod(GetImageGeometry) #define GetImageHistogram PrependMagickMethod(GetImageHistogram) #define GetImageIndexInList PrependMagickMethod(GetImageIndexInList) #define GetImageInfoFile PrependMagickMethod(GetImageInfoFile) #define GetImageInfo PrependMagickMethod(GetImageInfo) #define GetImageKurtosis PrependMagickMethod(GetImageKurtosis) +#define GetImageListIndex PrependMagickMethod(GetImageListIndex) #define GetImageListLength PrependMagickMethod(GetImageListLength) +#define GetImageList PrependMagickMethod(GetImageList) +#define GetImageListSize PrependMagickMethod(GetImageListSize) #define GetImageMagick PrependMagickMethod(GetImageMagick) #define GetImageMask PrependMagickMethod(GetImageMask) #define GetImageMean PrependMagickMethod(GetImageMean) #define GetImageOption PrependMagickMethod(GetImageOption) +#define GetImagePixelCache PrependMagickMethod(GetImagePixelCache) +#define GetImagePixels PrependMagickMethod(GetImagePixels) #define GetImageProfile PrependMagickMethod(GetImageProfile) #define GetImageProperty PrependMagickMethod(GetImageProperty) #define GetImageQuantizeError PrependMagickMethod(GetImageQuantizeError) @@ -401,18 +463,10 @@ extern "C" { #define GetImageRange PrependMagickMethod(GetImageRange) #define GetImageReferenceCount PrependMagickMethod(GetImageReferenceCount) #define GetImageRegistry PrependMagickMethod(GetImageRegistry) -#define GetImageStatistics PrependMagickMethod(GetImageStatistics) #define GetImageTotalInkDensity PrependMagickMethod(GetImageTotalInkDensity) #define GetImageType PrependMagickMethod(GetImageType) -#define GetImageViewAuthenticMetacontent PrependMagickMethod(GetImageViewAuthenticMetacontent) -#define GetImageViewAuthenticPixels PrependMagickMethod(GetImageViewAuthenticPixels) -#define GetImageViewException PrependMagickMethod(GetImageViewException) -#define GetImageViewExtent PrependMagickMethod(GetImageViewExtent) -#define GetImageViewImage PrependMagickMethod(GetImageViewImage) -#define GetImageViewIterator PrependMagickMethod(GetImageViewIterator) -#define GetImageViewVirtualMetacontent PrependMagickMethod(GetImageViewVirtualMetacontent) -#define GetImageViewVirtualPixels PrependMagickMethod(GetImageViewVirtualPixels) #define GetImageVirtualPixelMethod PrependMagickMethod(GetImageVirtualPixelMethod) +#define GetIndexes PrependMagickMethod(GetIndexes) #define GetLastImageInList PrependMagickMethod(GetLastImageInList) #define GetLastValueInLinkedList PrependMagickMethod(GetLastValueInLinkedList) #define GetLocaleExceptionMessage PrependMagickMethod(GetLocaleExceptionMessage) @@ -433,18 +487,21 @@ extern "C" { #define GetMagickDescription PrependMagickMethod(GetMagickDescription) #define GetMagickEndianSupport PrependMagickMethod(GetMagickEndianSupport) #define GetMagickFeatures PrependMagickMethod(GetMagickFeatures) +#define GetMagickGeometry PrependMagickMethod(GetMagickGeometry) #define GetMagickHomeURL PrependMagickMethod(GetMagickHomeURL) #define GetMagickInfoList PrependMagickMethod(GetMagickInfoList) #define GetMagickInfo PrependMagickMethod(GetMagickInfo) #define GetMagickList PrependMagickMethod(GetMagickList) #define GetMagickMemoryMethods PrependMagickMethod(GetMagickMemoryMethods) +#define GetCommandOptions PrependMagickMethod(GetCommandOptions) #define GetMagickPackageName PrependMagickMethod(GetMagickPackageName) #define GetMagickPageSize PrependMagickMethod(GetMagickPageSize) -#define GetMagickPrecision PrependMagickMethod(GetMagickPrecision) +#define GetPixelInfo PrependMagickMethod(GetPixelInfo) #define GetMagickProperty PrependMagickMethod(GetMagickProperty) #define GetMagickQuantumDepth PrependMagickMethod(GetMagickQuantumDepth) #define GetMagickQuantumRange PrependMagickMethod(GetMagickQuantumRange) #define GetMagickRawSupport PrependMagickMethod(GetMagickRawSupport) +#define GetMagickRegistry PrependMagickMethod(GetMagickRegistry) #define GetMagickReleaseDate PrependMagickMethod(GetMagickReleaseDate) #define GetMagickResourceLimit PrependMagickMethod(GetMagickResourceLimit) #define GetMagickResource PrependMagickMethod(GetMagickResource) @@ -459,11 +516,14 @@ extern "C" { #define GetMimeInfo PrependMagickMethod(GetMimeInfo) #define GetMimeList PrependMagickMethod(GetMimeList) #define GetMimeType PrependMagickMethod(GetMimeType) +#define GetMonitorHandler PrependMagickMethod(GetMonitorHandler) #define GetMontageInfo PrependMagickMethod(GetMontageInfo) #define GetMultilineTypeMetrics PrependMagickMethod(GetMultilineTypeMetrics) #define GetNextImageArtifact PrependMagickMethod(GetNextImageArtifact) +#define GetNextImageAttribute PrependMagickMethod(GetNextImageAttribute) #define GetNextImageInList PrependMagickMethod(GetNextImageInList) #define GetNextImageOption PrependMagickMethod(GetNextImageOption) +#define GetNextImage PrependMagickMethod(GetNextImage) #define GetNextImageProfile PrependMagickMethod(GetNextImageProfile) #define GetNextImageProperty PrependMagickMethod(GetNextImageProperty) #define GetNextImageRegistry PrependMagickMethod(GetNextImageRegistry) @@ -477,11 +537,14 @@ extern "C" { #define GetNumberOfElementsInLinkedList PrependMagickMethod(GetNumberOfElementsInLinkedList) #define GetNumberOfEntriesInHashmap PrependMagickMethod(GetNumberOfEntriesInHashmap) #define GetNumberOfNodesInSplayTree PrependMagickMethod(GetNumberOfNodesInSplayTree) +#define GetNumberScenes PrependMagickMethod(GetNumberScenes) #define GetOneAuthenticPixel PrependMagickMethod(GetOneAuthenticPixel) #define GetOneCacheViewAuthenticPixel PrependMagickMethod(GetOneCacheViewAuthenticPixel) #define GetOneCacheViewVirtualMethodPixel PrependMagickMethod(GetOneCacheViewVirtualMethodPixel) #define GetOneCacheViewVirtualPixel PrependMagickMethod(GetOneCacheViewVirtualPixel) +#define GetOnePixel PrependMagickMethod(GetOnePixel) #define GetOneVirtualMagickPixel PrependMagickMethod(GetOneVirtualMagickPixel) +#define GetOneVirtualMethodPixel PrependMagickMethod(GetOneVirtualMethodPixel) #define GetOneVirtualPixel PrependMagickMethod(GetOneVirtualPixel) #define GetOptimalKernelWidth1D PrependMagickMethod(GetOptimalKernelWidth1D) #define GetOptimalKernelWidth2D PrependMagickMethod(GetOptimalKernelWidth2D) @@ -500,11 +563,12 @@ extern "C" { #define GetPixelCacheTileSize PrependMagickMethod(GetPixelCacheTileSize) #define GetPixelCacheType PrependMagickMethod(GetPixelCacheType) #define GetPixelCacheVirtualMethod PrependMagickMethod(GetPixelCacheVirtualMethod) -#define GetPixelInfo PrependMagickMethod(GetPixelInfo) +#define GetPixels PrependMagickMethod(GetPixels) #define GetPolicyInfoList PrependMagickMethod(GetPolicyInfoList) #define GetPolicyList PrependMagickMethod(GetPolicyList) #define GetPolicyValue PrependMagickMethod(GetPolicyValue) #define GetPreviousImageInList PrependMagickMethod(GetPreviousImageInList) +#define GetPreviousImage PrependMagickMethod(GetPreviousImage) #define GetPseudoRandomValue PrependMagickMethod(GetPseudoRandomValue) #define GetQuantizeInfo PrependMagickMethod(GetQuantizeInfo) #define GetQuantumExtent PrependMagickMethod(GetQuantumExtent) @@ -522,6 +586,7 @@ extern "C" { #define GetStringInfoDatum PrependMagickMethod(GetStringInfoDatum) #define GetStringInfoLength PrependMagickMethod(GetStringInfoLength) #define GetStringInfoPath PrependMagickMethod(GetStringInfoPath) +#define GetThresholdMapFile PrependMagickMethod(GetThresholdMapFile) #define GetThresholdMap PrependMagickMethod(GetThresholdMap) #define GetTimerInfo PrependMagickMethod(GetTimerInfo) #define GetTypeInfoByFamily PrependMagickMethod(GetTypeInfoByFamily) @@ -552,12 +617,15 @@ extern "C" { #define GradientImage PrependMagickMethod(GradientImage) #define GravityAdjustGeometry PrependMagickMethod(GravityAdjustGeometry) #define HaldClutImage PrependMagickMethod(HaldClutImage) +#define HaldClutImage PrependMagickMethod(HaldClutImage) #define HashPointerType PrependMagickMethod(HashPointerType) #define HashStringInfoType PrependMagickMethod(HashStringInfoType) #define HashStringType PrependMagickMethod(HashStringType) +#define HSLTransform PrependMagickMethod(HSLTransform) #define HuffmanDecodeImage PrependMagickMethod(HuffmanDecodeImage) #define HuffmanEncodeImage PrependMagickMethod(HuffmanEncodeImage) #define IdentifyImage PrependMagickMethod(IdentifyImage) +#define IdentityAffine PrependMagickMethod(IdentityAffine) #define ImageListToArray PrependMagickMethod(ImageListToArray) #define ImagesToBlob PrependMagickMethod(ImagesToBlob) #define ImageToBlob PrependMagickMethod(ImageToBlob) @@ -567,61 +635,67 @@ extern "C" { #define ImportQuantumPixels PrependMagickMethod(ImportQuantumPixels) #define increase PrependMagickMethod(increase) #define InheritException PrependMagickMethod(InheritException) -#define InitializePixelChannelMap PrependMagickMethod(InitializePixelChannelMap) +#define InitializeMagick PrependMagickMethod(InitializeMagick) #define InitializeSignature PrependMagickMethod(InitializeSignature) #define InjectImageBlob PrependMagickMethod(InjectImageBlob) #define InsertImageInList PrependMagickMethod(InsertImageInList) #define InsertTagIntoXMLTree PrependMagickMethod(InsertTagIntoXMLTree) #define InsertValueInLinkedList PrependMagickMethod(InsertValueInLinkedList) #define InsertValueInSortedLinkedList PrependMagickMethod(InsertValueInSortedLinkedList) -#define InterpolatePixelChannel PrependMagickMethod(InterpolatePixelChannel) -#define InterpolatePixelChannels PrependMagickMethod(InterpolatePixelChannels) -#define InterpolatePixelInfo PrependMagickMethod(InterpolatePixelInfo) +#define InterpolatePixelColor PrependMagickMethod(InterpolatePixelColor) +#define InterpretImageAttributes PrependMagickMethod(InterpretImageAttributes) #define InterpretImageFilename PrependMagickMethod(InterpretImageFilename) #define InterpretImageProperties PrependMagickMethod(InterpretImageProperties) -#define InterpretLocaleValue PrependMagickMethod(InterpretLocaleValue) #define InverseFourierTransformImage PrependMagickMethod(InverseFourierTransformImage) #define InvokeDelegate PrependMagickMethod(InvokeDelegate) #define InvokeDynamicImageFilter PrependMagickMethod(InvokeDynamicImageFilter) #define IsBlobExempt PrependMagickMethod(IsBlobExempt) #define IsBlobSeekable PrependMagickMethod(IsBlobSeekable) #define IsBlobTemporary PrependMagickMethod(IsBlobTemporary) -#define IsCommandOption PrependMagickMethod(IsCommandOption) -#define IsEquivalentAlpha PrependMagickMethod(IsEquivalentAlpha) -#define IsEquivalentImage PrependMagickMethod(IsEquivalentImage) -#define IsEventLogging PrependMagickMethod(IsEventLogging) #define IsFuzzyEquivalencePixelInfo PrependMagickMethod(IsFuzzyEquivalencePixelInfo) -#define IsFuzzyEquivalencePixel PrependMagickMethod(IsFuzzyEquivalencePixel) +#define IsEventLogging PrependMagickMethod(IsEventLogging) #define IsGeometry PrependMagickMethod(IsGeometry) #define IsGlob PrependMagickMethod(IsGlob) +#define IsImageGray PrependMagickMethod(IsImageGray) #define IsHashmapEmpty PrependMagickMethod(IsHashmapEmpty) #define IsHighDynamicRangeImage PrependMagickMethod(IsHighDynamicRangeImage) #define IsHistogramImage PrependMagickMethod(IsHistogramImage) -#define IsImageGray PrependMagickMethod(IsImageGray) -#define IsImageMonochrome PrependMagickMethod(IsImageMonochrome) #define IsImageObject PrependMagickMethod(IsImageObject) -#define IsImageOpaque PrependMagickMethod(IsImageOpaque) #define IsImagesEqual PrependMagickMethod(IsImagesEqual) -#define IsImageView PrependMagickMethod(IsImageView) +#define IsEquivalentImage PrependMagickMethod(IsEquivalentImage) #define IsLinkedListEmpty PrependMagickMethod(IsLinkedListEmpty) +#define IsFuzzyEquivalencePixelInfo PrependMagickMethod(IsFuzzyEquivalencePixelInfo) #define IsMagickConflict PrependMagickMethod(IsMagickConflict) #define IsMagickInstantiated PrependMagickMethod(IsMagickInstantiated) +#define IsCommandOption PrependMagickMethod(IsCommandOption) #define IsMagickTrue PrependMagickMethod(IsMagickTrue) +#define IsImageMonochrome PrependMagickMethod(IsImageMonochrome) +#define IsEquivalentAlpha PrependMagickMethod(IsEquivalentAlpha) +#define IsImageOpaque PrependMagickMethod(IsImageOpaque) #define IsPaletteImage PrependMagickMethod(IsPaletteImage) #define IsPathAccessible PrependMagickMethod(IsPathAccessible) #define IsRightsAuthorized PrependMagickMethod(IsRightsAuthorized) #define IsSceneGeometry PrependMagickMethod(IsSceneGeometry) +#define IsSubimage PrependMagickMethod(IsSubimage) #define IsTaintImage PrependMagickMethod(IsTaintImage) +#define KernelNormalize PrependMagickMethod(KernelNormalize) +#define KernelPrint PrependMagickMethod(KernelPrint) +#define KernelRotate PrependMagickMethod(KernelRotate) #define LeastSquaresAddTerms PrependMagickMethod(LeastSquaresAddTerms) #define LevelImageColors PrependMagickMethod(LevelImageColors) +#define LevelImageColors PrependMagickMethod(LevelImageColors) #define LevelImage PrependMagickMethod(LevelImage) +#define LevelImageColors PrependMagickMethod(LevelImageColors) +#define LevelImage PrependMagickMethod(LevelImage) +#define LevelizeImage PrependMagickMethod(LevelizeImage) #define LevelizeImage PrependMagickMethod(LevelizeImage) +#define LiberateMemory PrependMagickMethod(LiberateMemory) +#define LiberateSemaphoreInfo PrependMagickMethod(LiberateSemaphoreInfo) #define LinearStretchImage PrependMagickMethod(LinearStretchImage) #define LinkedListToArray PrependMagickMethod(LinkedListToArray) #define LiquidRescaleImage PrependMagickMethod(LiquidRescaleImage) #define ListCoderInfo PrependMagickMethod(ListCoderInfo) #define ListColorInfo PrependMagickMethod(ListColorInfo) -#define ListCommandOptions PrependMagickMethod(ListCommandOptions) #define ListConfigureInfo PrependMagickMethod(ListConfigureInfo) #define ListDelegateInfo PrependMagickMethod(ListDelegateInfo) #define ListFiles PrependMagickMethod(ListFiles) @@ -629,6 +703,7 @@ extern "C" { #define ListLogInfo PrependMagickMethod(ListLogInfo) #define ListMagicInfo PrependMagickMethod(ListMagicInfo) #define ListMagickInfo PrependMagickMethod(ListMagickInfo) +#define ListCommandOptions PrependMagickMethod(ListCommandOptions) #define ListMagickResourceInfo PrependMagickMethod(ListMagickResourceInfo) #define ListMimeInfo PrependMagickMethod(ListMimeInfo) #define ListModuleInfo PrependMagickMethod(ListModuleInfo) @@ -657,16 +732,22 @@ extern "C" { #define MagickCoreGenesis PrependMagickMethod(MagickCoreGenesis) #define MagickCoreTerminus PrependMagickMethod(MagickCoreTerminus) #define MagickCreateThreadKey PrependMagickMethod(MagickCreateThreadKey) -#define MagickDelay PrependMagickMethod(MagickDelay) #define MagickDeleteThreadKey PrependMagickMethod(MagickDeleteThreadKey) #define MagickError PrependMagickMethod(MagickError) #define MagickFatalError PrependMagickMethod(MagickFatalError) #define MagickGetThreadValue PrependMagickMethod(MagickGetThreadValue) +#define MagickIncarnate PrependMagickMethod(MagickIncarnate) +#define MagickMonitor PrependMagickMethod(MagickMonitor) +#define CommandOptionToMnemonic PrependMagickMethod(CommandOptionToMnemonic) #define MagickSetThreadValue PrependMagickMethod(MagickSetThreadValue) #define MagickToMime PrependMagickMethod(MagickToMime) #define MagickWarning PrependMagickMethod(MagickWarning) #define MagnifyImage PrependMagickMethod(MagnifyImage) #define MapBlob PrependMagickMethod(MapBlob) +#define MapImage PrependMagickMethod(MapImage) +#define MapImages PrependMagickMethod(MapImages) +#define MatteFloodfillImage PrependMagickMethod(MatteFloodfillImage) +#define MedianConvolveImage PrependMagickMethod(MedianConvolveImage) #define MergeImageLayers PrependMagickMethod(MergeImageLayers) #define MimeComponentGenesis PrependMagickMethod(MimeComponentGenesis) #define MimeComponentTerminus PrependMagickMethod(MimeComponentTerminus) @@ -677,72 +758,98 @@ extern "C" { #define MontageImageList PrependMagickMethod(MontageImageList) #define MontageImages PrependMagickMethod(MontageImages) #define MorphImages PrependMagickMethod(MorphImages) -#define MorphologyApply PrependMagickMethod(MorphologyApply) #define MorphologyImage PrependMagickMethod(MorphologyImage) +#define MosaicImages PrependMagickMethod(MosaicImages) +#define MotionBlurImage PrependMagickMethod(MotionBlurImage) #define MotionBlurImage PrependMagickMethod(MotionBlurImage) #define MSBOrderLong PrependMagickMethod(MSBOrderLong) #define MSBOrderShort PrependMagickMethod(MSBOrderShort) #define MultilineCensus PrependMagickMethod(MultilineCensus) #define NegateImage PrependMagickMethod(NegateImage) +#define NegateImage PrependMagickMethod(NegateImage) #define NewHashmap PrependMagickMethod(NewHashmap) #define NewImageList PrependMagickMethod(NewImageList) -#define NewImageView PrependMagickMethod(NewImageView) -#define NewImageViewRegion PrependMagickMethod(NewImageViewRegion) #define NewLinkedList PrependMagickMethod(NewLinkedList) #define NewMagickImage PrependMagickMethod(NewMagickImage) #define NewSplayTree PrependMagickMethod(NewSplayTree) #define NewXMLTree PrependMagickMethod(NewXMLTree) #define NewXMLTreeTag PrependMagickMethod(NewXMLTreeTag) #define NormalizeImage PrependMagickMethod(NormalizeImage) +#define NormalizeImage PrependMagickMethod(NormalizeImage) #define OilPaintImage PrependMagickMethod(OilPaintImage) +#define OpaqueImage PrependMagickMethod(OpaqueImage) +#define OpaquePaintImage PrependMagickMethod(OpaquePaintImage) #define OpaquePaintImage PrependMagickMethod(OpaquePaintImage) #define OpenBlob PrependMagickMethod(OpenBlob) +#define OpenCacheView PrependMagickMethod(OpenCacheView) +#define OpenMagickStream PrependMagickMethod(OpenMagickStream) #define OpenStream PrependMagickMethod(OpenStream) #define OptimizeImageLayers PrependMagickMethod(OptimizeImageLayers) #define OptimizeImageTransparency PrependMagickMethod(OptimizeImageTransparency) #define OptimizePlusImageLayers PrependMagickMethod(OptimizePlusImageLayers) +#define OrderedDitherImageChannel PrependMagickMethod(OrderedDitherImageChannel) +#define OrderedDitherImage PrependMagickMethod(OrderedDitherImage) +#define OrderedPosterizeImage PrependMagickMethod(OrderedPosterizeImage) #define OrderedPosterizeImage PrependMagickMethod(OrderedPosterizeImage) #define PackbitsEncodeImage PrependMagickMethod(PackbitsEncodeImage) +#define PaintFloodfillImage PrependMagickMethod(PaintFloodfillImage) +#define PaintOpaqueImageChannel PrependMagickMethod(PaintOpaqueImageChannel) +#define PaintOpaqueImage PrependMagickMethod(PaintOpaqueImage) +#define PaintTransparentImage PrependMagickMethod(PaintTransparentImage) #define ParseAbsoluteGeometry PrependMagickMethod(ParseAbsoluteGeometry) #define ParseAffineGeometry PrependMagickMethod(ParseAffineGeometry) #define ParseChannelOption PrependMagickMethod(ParseChannelOption) -#define ParseCommandOption PrependMagickMethod(ParseCommandOption) #define ParseGeometry PrependMagickMethod(ParseGeometry) #define ParseGravityGeometry PrependMagickMethod(ParseGravityGeometry) +#define ParseImageGeometry PrependMagickMethod(ParseImageGeometry) +#define ParseCommandOption PrependMagickMethod(ParseCommandOption) #define ParseMetaGeometry PrependMagickMethod(ParseMetaGeometry) #define ParsePageGeometry PrependMagickMethod(ParsePageGeometry) #define ParseRegionGeometry PrependMagickMethod(ParseRegionGeometry) +#define ParseSizeGeometry PrependMagickMethod(ParseSizeGeometry) #define PasskeyDecipherImage PrependMagickMethod(PasskeyDecipherImage) #define PasskeyEncipherImage PrependMagickMethod(PasskeyEncipherImage) -#define PendInitializePixelChannelMap PrependMagickMethod(PendInitializePixelChannelMap) #define PersistPixelCache PrependMagickMethod(PersistPixelCache) #define PingBlob PrependMagickMethod(PingBlob) #define PingImage PrependMagickMethod(PingImage) #define PingImages PrependMagickMethod(PingImages) #define PlasmaImage PrependMagickMethod(PlasmaImage) +#define PlasmaImageProxy PrependMagickMethod(PlasmaImageProxy) #define PolaroidImage PrependMagickMethod(PolaroidImage) #define PolicyComponentGenesis PrependMagickMethod(PolicyComponentGenesis) #define PolicyComponentTerminus PrependMagickMethod(PolicyComponentTerminus) +#define PopImageList PrependMagickMethod(PopImageList) +#define PopImagePixels PrependMagickMethod(PopImagePixels) #define PosterizeImage PrependMagickMethod(PosterizeImage) +#define PostscriptGeometry PrependMagickMethod(PostscriptGeometry) #define PrependImageToList PrependMagickMethod(PrependImageToList) #define PreviewImage PrependMagickMethod(PreviewImage) #define PrintStringInfo PrependMagickMethod(PrintStringInfo) #define process_message PrependMagickMethod(process_message) #define ProfileImage PrependMagickMethod(ProfileImage) #define PruneTagFromXMLTree PrependMagickMethod(PruneTagFromXMLTree) +#define PushImageList PrependMagickMethod(PushImageList) +#define PushImagePixels PrependMagickMethod(PushImagePixels) #define PutEntryInHashmap PrependMagickMethod(PutEntryInHashmap) +#define QuantizationError PrependMagickMethod(QuantizationError) #define QuantizeImage PrependMagickMethod(QuantizeImage) #define QuantizeImages PrependMagickMethod(QuantizeImages) -#define QueryColorCompliance PrependMagickMethod(QueryColorCompliance) +#define QueryColorDatabase PrependMagickMethod(QueryColorDatabase) #define QueryColorname PrependMagickMethod(QueryColorname) +#define QueryColorname PrependMagickMethod(QueryColorname) +#define QueryMagickColor PrependMagickMethod(QueryMagickColor) #define QueueAuthenticNexus PrependMagickMethod(QueueAuthenticNexus) #define QueueAuthenticPixels PrependMagickMethod(QueueAuthenticPixels) #define QueueCacheViewAuthenticPixels PrependMagickMethod(QueueCacheViewAuthenticPixels) #define RadialBlurImage PrependMagickMethod(RadialBlurImage) +#define RadialBlurImage PrependMagickMethod(RadialBlurImage) #define RaiseImage PrependMagickMethod(RaiseImage) +#define RandomChannelThresholdImage PrependMagickMethod(RandomChannelThresholdImage) #define RandomComponentGenesis PrependMagickMethod(RandomComponentGenesis) #define RandomComponentTerminus PrependMagickMethod(RandomComponentTerminus) #define RandomThresholdImage PrependMagickMethod(RandomThresholdImage) +#define RandomThresholdImage PrependMagickMethod(RandomThresholdImage) +#define ReacquireMemory PrependMagickMethod(ReacquireMemory) #define ReadBlobByte PrependMagickMethod(ReadBlobByte) #define ReadBlobDouble PrependMagickMethod(ReadBlobDouble) #define ReadBlobFloat PrependMagickMethod(ReadBlobFloat) @@ -750,7 +857,6 @@ extern "C" { #define ReadBlobLong PrependMagickMethod(ReadBlobLong) #define ReadBlobLSBLong PrependMagickMethod(ReadBlobLSBLong) #define ReadBlobLSBShort PrependMagickMethod(ReadBlobLSBShort) -#define ReadBlobMSBLongLong PrependMagickMethod(ReadBlobMSBLongLong) #define ReadBlobMSBLong PrependMagickMethod(ReadBlobMSBLong) #define ReadBlobMSBShort PrependMagickMethod(ReadBlobMSBShort) #define ReadBlob PrependMagickMethod(ReadBlob) @@ -760,13 +866,13 @@ extern "C" { #define ReadImages PrependMagickMethod(ReadImages) #define ReadInlineImage PrependMagickMethod(ReadInlineImage) #define ReadStream PrependMagickMethod(ReadStream) +#define RecolorImage PrependMagickMethod(RecolorImage) +#define ReduceNoiseImage PrependMagickMethod(ReduceNoiseImage) #define ReferenceBlob PrependMagickMethod(ReferenceBlob) #define ReferenceImage PrependMagickMethod(ReferenceImage) #define ReferencePixelCache PrependMagickMethod(ReferencePixelCache) -#define RegisterAAIImage PrependMagickMethod(RegisterAAIImage) #define RegisterARTImage PrependMagickMethod(RegisterARTImage) #define RegisterAVSImage PrependMagickMethod(RegisterAVSImage) -#define RegisterBGRImage PrependMagickMethod(RegisterBGRImage) #define RegisterBMPImage PrependMagickMethod(RegisterBMPImage) #define RegisterBRAILLEImage PrependMagickMethod(RegisterBRAILLEImage) #define RegisterCALSImage PrependMagickMethod(RegisterCALSImage) @@ -778,7 +884,6 @@ extern "C" { #define RegisterCUTImage PrependMagickMethod(RegisterCUTImage) #define RegisterDCMImage PrependMagickMethod(RegisterDCMImage) #define RegisterDDSImage PrependMagickMethod(RegisterDDSImage) -#define RegisterDEBUGImage PrependMagickMethod(RegisterDEBUGImage) #define RegisterDIBImage PrependMagickMethod(RegisterDIBImage) #define RegisterDJVUImage PrependMagickMethod(RegisterDJVUImage) #define RegisterDNGImage PrependMagickMethod(RegisterDNGImage) @@ -791,7 +896,6 @@ extern "C" { #define RegisterGRADIENTImage PrependMagickMethod(RegisterGRADIENTImage) #define RegisterGRAYImage PrependMagickMethod(RegisterGRAYImage) #define RegisterHALDImage PrependMagickMethod(RegisterHALDImage) -#define RegisterHDRImage PrependMagickMethod(RegisterHDRImage) #define RegisterHISTOGRAMImage PrependMagickMethod(RegisterHISTOGRAMImage) #define RegisterHRZImage PrependMagickMethod(RegisterHRZImage) #define RegisterHTMLImage PrependMagickMethod(RegisterHTMLImage) @@ -802,7 +906,7 @@ extern "C" { #define RegisterJP2Image PrependMagickMethod(RegisterJP2Image) #define RegisterJPEGImage PrependMagickMethod(RegisterJPEGImage) #define RegisterLABELImage PrependMagickMethod(RegisterLABELImage) -#define RegisterMACImage PrependMagickMethod(RegisterMACImage) +#define RegisterMCPImage PrependMagickMethod(RegisterMACImage) #define RegisterMAGICKImage PrependMagickMethod(RegisterMAGICKImage) #define RegisterMagickInfo PrependMagickMethod(RegisterMagickInfo) #define RegisterMAPImage PrependMagickMethod(RegisterMAPImage) @@ -826,7 +930,6 @@ extern "C" { #define RegisterPCXImage PrependMagickMethod(RegisterPCXImage) #define RegisterPDBImage PrependMagickMethod(RegisterPDBImage) #define RegisterPDFImage PrependMagickMethod(RegisterPDFImage) -#define RegisterPESImage PrependMagickMethod(RegisterPESImage) #define RegisterPICTImage PrependMagickMethod(RegisterPICTImage) #define RegisterPIXImage PrependMagickMethod(RegisterPIXImage) #define RegisterPLASMAImage PrependMagickMethod(RegisterPLASMAImage) @@ -864,6 +967,7 @@ extern "C" { #define RegisterVIDImage PrependMagickMethod(RegisterVIDImage) #define RegisterVIFFImage PrependMagickMethod(RegisterVIFFImage) #define RegisterWBMPImage PrependMagickMethod(RegisterWBMPImage) +#define RegisterWMFImage PrependMagickMethod(RegisterWMFImage) #define RegisterWPGImage PrependMagickMethod(RegisterWPGImage) #define RegisterXBMImage PrependMagickMethod(RegisterXBMImage) #define RegisterXCFImage PrependMagickMethod(RegisterXCFImage) @@ -876,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) @@ -902,11 +1006,11 @@ extern "C" { #define RemoveNodeFromSplayTree PrependMagickMethod(RemoveNodeFromSplayTree) #define RemoveZeroDelayLayers PrependMagickMethod(RemoveZeroDelayLayers) #define ReplaceImageInList PrependMagickMethod(ReplaceImageInList) -#define ReplaceImageInListReturnLast PrependMagickMethod(ReplaceImageInListReturnLast) #define ResampleImage PrependMagickMethod(ResampleImage) #define ResamplePixelColor PrependMagickMethod(ResamplePixelColor) #define ResetHashmapIterator PrependMagickMethod(ResetHashmapIterator) #define ResetImageArtifactIterator PrependMagickMethod(ResetImageArtifactIterator) +#define ResetImageAttributeIterator PrependMagickMethod(ResetImageAttributeIterator) #define ResetImageOptionIterator PrependMagickMethod(ResetImageOptionIterator) #define ResetImageOptions PrependMagickMethod(ResetImageOptions) #define ResetImagePage PrependMagickMethod(ResetImagePage) @@ -929,14 +1033,13 @@ extern "C" { #define RollImage PrependMagickMethod(RollImage) #define RotateImage PrependMagickMethod(RotateImage) #define SampleImage PrependMagickMethod(SampleImage) -#define ScaleGeometryKernelInfo PrependMagickMethod(ScaleGeometryKernelInfo) #define ScaleImage PrependMagickMethod(ScaleImage) -#define ScaleKernelInfo PrependMagickMethod(ScaleKernelInfo) #define ScaleResampleFilter PrependMagickMethod(ScaleResampleFilter) #define SeedPseudoRandomGenerator PrependMagickMethod(SeedPseudoRandomGenerator) #define SeekBlob PrependMagickMethod(SeekBlob) #define SegmentImage PrependMagickMethod(SegmentImage) #define SelectiveBlurImage PrependMagickMethod(SelectiveBlurImage) +#define SelectiveBlurImage PrependMagickMethod(SelectiveBlurImage) #define SemaphoreComponentGenesis PrependMagickMethod(SemaphoreComponentGenesis) #define SemaphoreComponentTerminus PrependMagickMethod(SemaphoreComponentTerminus) #define SeparateImage PrependMagickMethod(SeparateImage) @@ -944,21 +1047,24 @@ extern "C" { #define SepiaToneImage PrependMagickMethod(SepiaToneImage) #define SetBlobExempt PrependMagickMethod(SetBlobExempt) #define SetBlobExtent PrependMagickMethod(SetBlobExtent) +#define SetCacheThreshold PrependMagickMethod(SetCacheThreshold) +#define SetCacheViewPixels PrependMagickMethod(SetCacheViewPixels) #define SetCacheViewStorageClass PrependMagickMethod(SetCacheViewStorageClass) #define SetCacheViewVirtualPixelMethod PrependMagickMethod(SetCacheViewVirtualPixelMethod) #define SetClientName PrependMagickMethod(SetClientName) #define SetClientPath PrependMagickMethod(SetClientPath) #define SetErrorHandler PrependMagickMethod(SetErrorHandler) +#define SetExceptionInfo PrependMagickMethod(SetExceptionInfo) #define SetFatalErrorHandler PrependMagickMethod(SetFatalErrorHandler) #define SetGeometryInfo PrependMagickMethod(SetGeometryInfo) #define SetGeometry PrependMagickMethod(SetGeometry) #define SetHeaderFromIPL PrependMagickMethod(SetHeaderFromIPL) #define SetImageAlphaChannel PrependMagickMethod(SetImageAlphaChannel) -#define SetImageAlpha PrependMagickMethod(SetImageAlpha) #define SetImageArtifact PrependMagickMethod(SetImageArtifact) +#define SetImageAttribute PrependMagickMethod(SetImageAttribute) #define SetImageBackgroundColor PrependMagickMethod(SetImageBackgroundColor) +#define SetImageDepth PrependMagickMethod(SetImageDepth) #define SetImageClipMask PrependMagickMethod(SetImageClipMask) -#define SetImageColor PrependMagickMethod(SetImageColor) #define SetImageColorspace PrependMagickMethod(SetImageColorspace) #define SetImageDepth PrependMagickMethod(SetImageDepth) #define SetImageExtent PrependMagickMethod(SetImageExtent) @@ -966,29 +1072,29 @@ extern "C" { #define SetImageInfoFile PrependMagickMethod(SetImageInfoFile) #define SetImageInfo PrependMagickMethod(SetImageInfo) #define SetImageInfoProgressMonitor PrependMagickMethod(SetImageInfoProgressMonitor) +#define SetImageList PrependMagickMethod(SetImageList) #define SetImageMask PrependMagickMethod(SetImageMask) +#define SetImageOpacity PrependMagickMethod(SetImageOpacity) #define SetImageOption PrependMagickMethod(SetImageOption) +#define SetImagePixels PrependMagickMethod(SetImagePixels) +#define SetImage PrependMagickMethod(SetImage) #define SetImageProfile PrependMagickMethod(SetImageProfile) #define SetImageProgressMonitor PrependMagickMethod(SetImageProgressMonitor) #define SetImageProperty PrependMagickMethod(SetImageProperty) #define SetImageRegistry PrependMagickMethod(SetImageRegistry) #define SetImageStorageClass PrependMagickMethod(SetImageStorageClass) #define SetImageType PrependMagickMethod(SetImageType) -#define SetImageViewDescription PrependMagickMethod(SetImageViewDescription) -#define SetImageViewIterator PrependMagickMethod(SetImageViewIterator) -#define SetImageViewThreads PrependMagickMethod(SetImageViewThreads) #define SetImageVirtualPixelMethod PrependMagickMethod(SetImageVirtualPixelMethod) #define SetLogEventMask PrependMagickMethod(SetLogEventMask) #define SetLogFormat PrependMagickMethod(SetLogFormat) #define SetLogName PrependMagickMethod(SetLogName) #define SetMagickInfo PrependMagickMethod(SetMagickInfo) #define SetMagickMemoryMethods PrependMagickMethod(SetMagickMemoryMethods) -#define SetMagickPrecision PrependMagickMethod(SetMagickPrecision) +#define SetMagickRegistry PrependMagickMethod(SetMagickRegistry) #define SetMagickResourceLimit PrependMagickMethod(SetMagickResourceLimit) +#define SetMonitorHandler PrependMagickMethod(SetMonitorHandler) #define SetPixelCacheMethods PrependMagickMethod(SetPixelCacheMethods) #define SetPixelCacheVirtualMethod PrependMagickMethod(SetPixelCacheVirtualMethod) -#define SetPixelChannelMap PrependMagickMethod(SetPixelChannelMap) -#define SetPixelChannelMask PrependMagickMethod(SetPixelChannelMask) #define SetQuantumAlphaType PrependMagickMethod(SetQuantumAlphaType) #define SetQuantumDepth PrependMagickMethod(SetQuantumDepth) #define SetQuantumFormat PrependMagickMethod(SetQuantumFormat) @@ -1003,6 +1109,7 @@ extern "C" { #define SetResampleFilterInterpolateMethod PrependMagickMethod(SetResampleFilterInterpolateMethod) #define SetResampleFilter PrependMagickMethod(SetResampleFilter) #define SetResampleFilterVirtualPixelMethod PrependMagickMethod(SetResampleFilterVirtualPixelMethod) +#define SetResizeFilterSupport PrependMagickMethod(SetResizeFilterSupport) #define SetSignatureDigest PrependMagickMethod(SetSignatureDigest) #define SetStreamInfoClientData PrependMagickMethod(SetStreamInfoClientData) #define SetStreamInfoMap PrependMagickMethod(SetStreamInfoMap) @@ -1017,24 +1124,26 @@ extern "C" { #define ShadeImage PrependMagickMethod(ShadeImage) #define ShadowImage PrependMagickMethod(ShadowImage) #define SharpenImage PrependMagickMethod(SharpenImage) +#define SharpenImage PrependMagickMethod(SharpenImage) #define ShaveImage PrependMagickMethod(ShaveImage) #define ShearImage PrependMagickMethod(ShearImage) -#define ShowKernelInfo PrependMagickMethod(ShowKernelInfo) +#define ShiftImageList PrependMagickMethod(ShiftImageList) +#define SigmoidalContrastImage PrependMagickMethod(SigmoidalContrastImage) #define SigmoidalContrastImage PrependMagickMethod(SigmoidalContrastImage) #define SignatureImage PrependMagickMethod(SignatureImage) #define SimilarityImage PrependMagickMethod(SimilarityImage) +#define SizeBlob PrependMagickMethod(SizeBlob) #define SketchImage PrependMagickMethod(SketchImage) -#define SmushImages PrependMagickMethod(SmushImages) #define SolarizeImage PrependMagickMethod(SolarizeImage) #define SortColormapByIntensity PrependMagickMethod(SortColormapByIntensity) #define SparseColorImage PrependMagickMethod(SparseColorImage) #define SpliceImageIntoList PrependMagickMethod(SpliceImageIntoList) +#define SpliceImageList PrependMagickMethod(SpliceImageList) #define SpliceImage PrependMagickMethod(SpliceImage) #define SplitImageList PrependMagickMethod(SplitImageList) #define SplitStringInfo PrependMagickMethod(SplitStringInfo) #define SpreadImage PrependMagickMethod(SpreadImage) #define StartTimer PrependMagickMethod(StartTimer) -#define StatisticImage PrependMagickMethod(StatisticImage) #define SteganoImage PrependMagickMethod(SteganoImage) #define StereoAnaglyphImage PrependMagickMethod(StereoAnaglyphImage) #define StereoImage PrependMagickMethod(StereoImage) @@ -1046,14 +1155,17 @@ extern "C" { #define StringToList PrependMagickMethod(StringToList) #define StringToStringInfo PrependMagickMethod(StringToStringInfo) #define StripImage PrependMagickMethod(StripImage) +#define Strip PrependMagickMethod(Strip) #define StripString PrependMagickMethod(StripString) #define SubstituteString PrependMagickMethod(SubstituteString) #define SwirlImage PrependMagickMethod(SwirlImage) #define SyncAuthenticPixelCacheNexus PrependMagickMethod(SyncAuthenticPixelCacheNexus) #define SyncAuthenticPixels PrependMagickMethod(SyncAuthenticPixels) #define SyncCacheViewAuthenticPixels PrependMagickMethod(SyncCacheViewAuthenticPixels) +#define SyncCacheViewPixels PrependMagickMethod(SyncCacheViewPixels) +#define SyncCacheView PrependMagickMethod(SyncCacheView) #define SyncImageList PrependMagickMethod(SyncImageList) -#define SyncImagePixelCache PrependMagickMethod(SyncImagePixelCache) +#define SyncImagePixels PrependMagickMethod(SyncImagePixels) #define SyncImage PrependMagickMethod(SyncImage) #define SyncImageProfiles PrependMagickMethod(SyncImageProfiles) #define SyncImageSettings PrependMagickMethod(SyncImageSettings) @@ -1061,17 +1173,24 @@ extern "C" { #define SyncNextImageInList PrependMagickMethod(SyncNextImageInList) #define SystemCommand PrependMagickMethod(SystemCommand) #define TellBlob PrependMagickMethod(TellBlob) +#define TemporaryFilename PrependMagickMethod(TemporaryFilename) #define TextureImage PrependMagickMethod(TextureImage) +#define ThresholdImageChannel PrependMagickMethod(ThresholdImageChannel) +#define ThresholdImage PrependMagickMethod(ThresholdImage) #define ThrowException PrependMagickMethod(ThrowException) +#define ThrowMagickExceptionList PrependMagickMethod(ThrowMagickExceptionList) #define ThrowMagickException PrependMagickMethod(ThrowMagickException) #define ThumbnailImage PrependMagickMethod(ThumbnailImage) #define TintImage PrependMagickMethod(TintImage) #define Tokenizer PrependMagickMethod(Tokenizer) -#define TransferImageViewIterator PrependMagickMethod(TransferImageViewIterator) +#define TransformColorspace PrependMagickMethod(TransformColorspace) +#define TransformHSL PrependMagickMethod(TransformHSL) #define TransformImageColorspace PrependMagickMethod(TransformImageColorspace) #define TransformImage PrependMagickMethod(TransformImage) #define TransformImages PrependMagickMethod(TransformImages) #define TransformRGBImage PrependMagickMethod(TransformRGBImage) +#define TranslateText PrependMagickMethod(TranslateText) +#define TransparentImage PrependMagickMethod(TransparentImage) #define TransparentPaintImageChroma PrependMagickMethod(TransparentPaintImageChroma) #define TransparentPaintImage PrependMagickMethod(TransparentPaintImage) #define TransposeImage PrependMagickMethod(TransposeImage) @@ -1080,13 +1199,10 @@ extern "C" { #define TypeComponentGenesis PrependMagickMethod(TypeComponentGenesis) #define TypeComponentTerminus PrependMagickMethod(TypeComponentTerminus) #define UniqueImageColors PrependMagickMethod(UniqueImageColors) -#define UnityAddKernelInfo PrependMagickMethod(UnityAddKernelInfo) #define UnlockSemaphoreInfo PrependMagickMethod(UnlockSemaphoreInfo) #define UnmapBlob PrependMagickMethod(UnmapBlob) -#define UnregisterAAIImage PrependMagickMethod(UnregisterAAIImage) #define UnregisterARTImage PrependMagickMethod(UnregisterARTImage) #define UnregisterAVSImage PrependMagickMethod(UnregisterAVSImage) -#define UnregisterBGRImage PrependMagickMethod(UnregisterBGRImage) #define UnregisterBMPImage PrependMagickMethod(UnregisterBMPImage) #define UnregisterBRAILLEImage PrependMagickMethod(UnregisterBRAILLEImage) #define UnregisterCALSImage PrependMagickMethod(UnregisterCALSImage) @@ -1098,7 +1214,6 @@ extern "C" { #define UnregisterCUTImage PrependMagickMethod(UnregisterCUTImage) #define UnregisterDCMImage PrependMagickMethod(UnregisterDCMImage) #define UnregisterDDSImage PrependMagickMethod(UnregisterDDSImage) -#define UnregisterDEBUGImage PrependMagickMethod(UnregisterDEBUGImage) #define UnregisterDIBImage PrependMagickMethod(UnregisterDIBImage) #define UnregisterDJVUImage PrependMagickMethod(UnregisterDJVUImage) #define UnregisterDNGImage PrependMagickMethod(UnregisterDNGImage) @@ -1111,7 +1226,6 @@ extern "C" { #define UnregisterGRADIENTImage PrependMagickMethod(UnregisterGRADIENTImage) #define UnregisterGRAYImage PrependMagickMethod(UnregisterGRAYImage) #define UnregisterHALDImage PrependMagickMethod(UnregisterHALDImage) -#define UnregisterHDRImage PrependMagickMethod(UnregisterHDRImage) #define UnregisterHISTOGRAMImage PrependMagickMethod(UnregisterHISTOGRAMImage) #define UnregisterHRZImage PrependMagickMethod(UnregisterHRZImage) #define UnregisterHTMLImage PrependMagickMethod(UnregisterHTMLImage) @@ -1146,7 +1260,6 @@ extern "C" { #define UnregisterPCXImage PrependMagickMethod(UnregisterPCXImage) #define UnregisterPDBImage PrependMagickMethod(UnregisterPDBImage) #define UnregisterPDFImage PrependMagickMethod(UnregisterPDFImage) -#define UnregisterPESImage PrependMagickMethod(UnregisterPESImage) #define UnregisterPICTImage PrependMagickMethod(UnregisterPICTImage) #define UnregisterPIXImage PrependMagickMethod(UnregisterPIXImage) #define UnregisterPLASMAImage PrependMagickMethod(UnregisterPLASMAImage) @@ -1184,6 +1297,7 @@ extern "C" { #define UnregisterVIDImage PrependMagickMethod(UnregisterVIDImage) #define UnregisterVIFFImage PrependMagickMethod(UnregisterVIFFImage) #define UnregisterWBMPImage PrependMagickMethod(UnregisterWBMPImage) +#define UnregisterWMFImage PrependMagickMethod(UnregisterWMFImage) #define UnregisterWPGImage PrependMagickMethod(UnregisterWPGImage) #define UnregisterXBMImage PrependMagickMethod(UnregisterXBMImage) #define UnregisterXCFImage PrependMagickMethod(UnregisterXCFImage) @@ -1195,17 +1309,19 @@ extern "C" { #define UnregisterYCBCRImage PrependMagickMethod(UnregisterYCBCRImage) #define UnregisterYUVImage PrependMagickMethod(UnregisterYUVImage) #define UnsharpMaskImage PrependMagickMethod(UnsharpMaskImage) -#define UpdateImageViewIterator PrependMagickMethod(UpdateImageViewIterator) +#define UnsharpMaskImage PrependMagickMethod(UnsharpMaskImage) +#define UnshiftImageList PrependMagickMethod(UnshiftImageList) #define UpdateSignature PrependMagickMethod(UpdateSignature) +#define ValidateColormapIndex PrependMagickMethod(ValidateColormapIndex) #define VignetteImage PrependMagickMethod(VignetteImage) #define WaveImage PrependMagickMethod(WaveImage) #define WhiteThresholdImage PrependMagickMethod(WhiteThresholdImage) +#define WhiteThresholdImage PrependMagickMethod(WhiteThresholdImage) #define WriteBlobByte PrependMagickMethod(WriteBlobByte) #define WriteBlobFloat PrependMagickMethod(WriteBlobFloat) #define WriteBlobLong PrependMagickMethod(WriteBlobLong) #define WriteBlobLSBLong PrependMagickMethod(WriteBlobLSBLong) #define WriteBlobLSBShort PrependMagickMethod(WriteBlobLSBShort) -#define WriteBlobMSBLongLong PrependMagickMethod(WriteBlobMSBLongLong) #define WriteBlobMSBLong PrependMagickMethod(WriteBlobMSBLong) #define WriteBlobMSBShort PrependMagickMethod(WriteBlobMSBShort) #define WriteBlob PrependMagickMethod(WriteBlob) @@ -1273,7 +1389,7 @@ extern "C" { #define XNoticeWidget PrependMagickMethod(XNoticeWidget) #define XPreferencesWidget PrependMagickMethod(XPreferencesWidget) #define XProgressMonitorWidget PrependMagickMethod(XProgressMonitorWidget) -#define XQueryColorCompliance PrependMagickMethod(XQueryColorCompliance) +#define XQueryColorDatabase PrependMagickMethod(XQueryColorDatabase) #define XQueryPosition PrependMagickMethod(XQueryPosition) #define XRefreshWindow PrependMagickMethod(XRefreshWindow) #define XRemoteCommand PrependMagickMethod(XRemoteCommand) @@ -1286,8 +1402,8 @@ extern "C" { #define XWindowByID PrependMagickMethod(XWindowByID) #define XWindowByName PrependMagickMethod(XWindowByName) #define XWindowByProperty PrependMagickMethod(XWindowByProperty) -#define ZeroKernelNans PrependMagickMethod(ZeroKernelNans) #define ZLIBEncodeImage PrependMagickMethod(ZLIBEncodeImage) +#define ZoomImage PrependMagickMethod(ZoomImage) #endif #if defined(__cplusplus) || defined(c_plusplus) diff --git a/MagickCore/paint.c b/MagickCore/paint.c index 5d13857cb..5dc2bd31d 100644 --- a/MagickCore/paint.c +++ b/MagickCore/paint.c @@ -335,7 +335,7 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image, if (GetPixelAlpha(floodplane_image,p) != OpaqueAlpha) { (void) GetFillColor(draw_info,x,y,&fill_color,exception); - SetPixelInfoPacket(image,&fill_color,&fill); + fill=fill_color; if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0) SetPixelRed(image,ClampToQuantum(fill.red),q); if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0) @@ -456,9 +456,9 @@ MagickExport MagickBooleanType GradientImage(Image *image, sizeof(*gradient->stops)); for (i=0; i < (ssize_t) gradient->number_stops; i++) GetPixelInfo(image,&gradient->stops[i].color); - SetPixelInfoPacket(image,start_color,&gradient->stops[0].color); + gradient->stops[0].color=(*start_color); gradient->stops[0].offset=0.0; - SetPixelInfoPacket(image,stop_color,&gradient->stops[1].color); + gradient->stops[1].color=(*stop_color); gradient->stops[1].offset=1.0; /* Draw a gradient on the image. diff --git a/MagickCore/pixel-accessor.h b/MagickCore/pixel-accessor.h index c480fd69f..872099726 100644 --- a/MagickCore/pixel-accessor.h +++ b/MagickCore/pixel-accessor.h @@ -525,19 +525,6 @@ static inline void SetPixelInfo(const Image *image,const Quantum *pixel, pixel[image->channel_map[IndexPixelChannel].channel]; } -static inline void SetPixelInfoPacket(const Image *image, - const PixelInfo *pixel,PixelInfo *pixel_info) -{ - pixel_info->red=(MagickRealType) pixel->red; - pixel_info->green=(MagickRealType) pixel->green; - pixel_info->blue=(MagickRealType) pixel->blue; - pixel_info->alpha=(MagickRealType) pixel->alpha; - if (image->colorspace == CMYKColorspace) - pixel_info->black=(MagickRealType) pixel->black; - if (image->storage_class == PseudoClass) - pixel_info->index=(MagickRealType) pixel->index; -} - static inline void SetPixelMagenta(const Image *image,const Quantum magenta, Quantum *pixel) { diff --git a/MagickCore/shear.c b/MagickCore/shear.c index 384faee80..7377f5966 100644 --- a/MagickCore/shear.c +++ b/MagickCore/shear.c @@ -1480,8 +1480,7 @@ static MagickBooleanType XShearImage(Image *image,const MagickRealType degrees, assert(image->signature == MagickSignature); if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); - GetPixelInfo(image,&background); - SetPixelInfoPacket(image,&image->background_color,&background); + background=image->background_color; /* X shear image. */ @@ -1696,8 +1695,7 @@ static MagickBooleanType YShearImage(Image *image,const MagickRealType degrees, assert(image->signature == MagickSignature); if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); - GetPixelInfo(image,&background); - SetPixelInfoPacket(image,&image->background_color,&background); + background=image->background_color; /* Y Shear image. */ diff --git a/MagickCore/version.h b/MagickCore/version.h index 8782d8614..57e65ca23 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 "5733" +#define MagickSVNRevision "exported" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 7,0,0 diff --git a/MagickWand/drawing-wand.c b/MagickWand/drawing-wand.c index 5aa037b62..8827cda6a 100644 --- a/MagickWand/drawing-wand.c +++ b/MagickWand/drawing-wand.c @@ -2464,17 +2464,17 @@ WandExport char *DrawGetVectorGraphics(DrawingWand *wand) if (child != (XMLTreeInfo *) NULL) { if (CurrentContext->fill.alpha != OpaqueAlpha) - pixel.matte=CurrentContext->fill.alpha != OpaqueAlpha ? - MagickTrue : MagickFalse; - SetPixelInfoPacket(wand->image,&CurrentContext->fill,&pixel); + pixel.matte=CurrentContext->fill.alpha != OpaqueAlpha ? MagickTrue : + MagickFalse; + pixel=CurrentContext->fill; GetColorTuple(&pixel,MagickTrue,value); (void) SetXMLTreeContent(child,value); } child=AddChildToXMLTree(xml_info,"fill-alpha",0); if (child != (XMLTreeInfo *) NULL) { - (void) FormatLocaleString(value,MaxTextExtent,"%g", - (double) QuantumScale*CurrentContext->fill.alpha); + (void) FormatLocaleString(value,MaxTextExtent,"%g",(double) QuantumScale* + CurrentContext->fill.alpha); (void) SetXMLTreeContent(child,value); } child=AddChildToXMLTree(xml_info,"fill-rule",0); @@ -2532,7 +2532,7 @@ WandExport char *DrawGetVectorGraphics(DrawingWand *wand) if (CurrentContext->stroke.alpha != OpaqueAlpha) pixel.matte=CurrentContext->stroke.alpha != OpaqueAlpha ? MagickTrue : MagickFalse; - SetPixelInfoPacket(wand->image,&CurrentContext->stroke,&pixel); + pixel=CurrentContext->stroke; GetColorTuple(&pixel,MagickTrue,value); (void) SetXMLTreeContent(child,value); } @@ -2625,7 +2625,7 @@ WandExport char *DrawGetVectorGraphics(DrawingWand *wand) if (CurrentContext->undercolor.alpha != OpaqueAlpha) pixel.matte=CurrentContext->undercolor.alpha != OpaqueAlpha ? MagickTrue : MagickFalse; - SetPixelInfoPacket(wand->image,&CurrentContext->undercolor,&pixel); + pixel=CurrentContext->undercolor; GetColorTuple(&pixel,MagickTrue,value); (void) SetXMLTreeContent(child,value); } diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c index b73476e32..c70f7be8a 100644 --- a/MagickWand/mogrify.c +++ b/MagickWand/mogrify.c @@ -678,7 +678,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, quantize_info=AcquireQuantizeInfo(mogrify_info); SetGeometryInfo(&geometry_info); GetPixelInfo(*image,&fill); - SetPixelInfoPacket(*image,&(*image)->background_color,&fill); + fill=(*image)->background_color; attenuate=1.0; compose=(*image)->compose; interpolate_method=UndefinedInterpolatePixel;