(no commit message)

[imagemagick] / MagickCore / methods.h

diff --git a/MagickCore/methods.h b/MagickCore/methods.h
index b0ec36e4313cd6b36fb7b912858d10bb75ed117b..465d78e33215ce6fab5a983e1ac89e1081896c3d 100644 (file)
--- a/MagickCore/methods.h
+++ b/MagickCore/methods.h
@@ -1,5 +1,5 @@
 /*
-  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
+  Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization
   dedicated to making software imaging solutions freely available.
   
   You may not use this file except in compliance with the License.
@@ -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)
@@ -80,10 +80,10 @@ extern "C" {
 #define AcquireUniqueFilename  PrependMagickMethod(AcquireUniqueFilename)
 #define AcquireUniqueFileResource  PrependMagickMethod(AcquireUniqueFileResource)
 #define AcquireUniqueSymbolicLink  PrependMagickMethod(AcquireUniqueSymbolicLink)
-#define AdaptiveBlurImageChannel  PrependMagickMethod(AdaptiveBlurImageChannel)
+#define AdaptiveBlurImage  PrependMagickMethod(AdaptiveBlurImage)
 #define AdaptiveBlurImage  PrependMagickMethod(AdaptiveBlurImage)
 #define AdaptiveResizeImage  PrependMagickMethod(AdaptiveResizeImage)
-#define AdaptiveSharpenImageChannel  PrependMagickMethod(AdaptiveSharpenImageChannel)
+#define AdaptiveSharpenImage  PrependMagickMethod(AdaptiveSharpenImage)
 #define AdaptiveSharpenImage  PrependMagickMethod(AdaptiveSharpenImage)
 #define AdaptiveThresholdImage  PrependMagickMethod(AdaptiveThresholdImage)
 #define AddChildToXMLTree  PrependMagickMethod(AddChildToXMLTree)
@@ -118,14 +118,14 @@ extern "C" {
 #define AverageImages  PrependMagickMethod(AverageImages)
 #define Base64Decode  PrependMagickMethod(Base64Decode)
 #define Base64Encode  PrependMagickMethod(Base64Encode)
-#define BilevelImageChannel  PrependMagickMethod(BilevelImageChannel)
 #define BilevelImage  PrependMagickMethod(BilevelImage)
-#define BlackThresholdImageChannel  PrependMagickMethod(BlackThresholdImageChannel)
+#define BilevelImage  PrependMagickMethod(BilevelImage)
+#define BlackThresholdImage  PrependMagickMethod(BlackThresholdImage)
 #define BlackThresholdImage  PrependMagickMethod(BlackThresholdImage)
 #define BlobToFile  PrependMagickMethod(BlobToFile)
 #define BlobToImage  PrependMagickMethod(BlobToImage)
 #define BlueShiftImage  PrependMagickMethod(BlueShiftImage)
-#define BlurImageChannel  PrependMagickMethod(BlurImageChannel)
+#define BlurImage  PrependMagickMethod(BlurImage)
 #define BlurImage  PrependMagickMethod(BlurImage)
 #define BorderImage  PrependMagickMethod(BorderImage)
 #define BrightnessContrastImage  PrependMagickMethod(BrightnessContrastImage)
@@ -140,7 +140,7 @@ extern "C" {
 #define CharcoalImage  PrependMagickMethod(CharcoalImage)
 #define ChopImage  PrependMagickMethod(ChopImage)
 #define ChopPathComponents  PrependMagickMethod(ChopPathComponents)
-#define ClampImageChannel  PrependMagickMethod(ClampImageChannel)
+#define ClampImage  PrependMagickMethod(ClampImage)
 #define ClampImage  PrependMagickMethod(ClampImage)
 #define ClearLinkedList  PrependMagickMethod(ClearLinkedList)
 #define ClearMagickException  PrependMagickMethod(ClearMagickException)
@@ -189,7 +189,7 @@ extern "C" {
 #define CompareSplayTreeStringInfo  PrependMagickMethod(CompareSplayTreeStringInfo)
 #define CompareSplayTreeString  PrependMagickMethod(CompareSplayTreeString)
 #define CompareStringInfo  PrependMagickMethod(CompareStringInfo)
-#define CompositeImageChannel  PrependMagickMethod(CompositeImageChannel)
+#define CompositeImage  PrependMagickMethod(CompositeImage)
 #define CompositeImage  PrependMagickMethod(CompositeImage)
 #define CompositeLayers  PrependMagickMethod(CompositeLayers)
 #define CompressImageColormap  PrependMagickMethod(CompressImageColormap)
@@ -215,7 +215,7 @@ extern "C" {
 #define ConvertRGBToHSB  PrependMagickMethod(ConvertRGBToHSB)
 #define ConvertRGBToHSL  PrependMagickMethod(ConvertRGBToHSL)
 #define ConvertRGBToHWB  PrependMagickMethod(ConvertRGBToHWB)
-#define ConvolveImageChannel  PrependMagickMethod(ConvolveImageChannel)
+#define ConvolveImage  PrependMagickMethod(ConvolveImage)
 #define ConvolveImage  PrependMagickMethod(ConvolveImage)
 #define CopyMagickMemory  PrependMagickMethod(CopyMagickMemory)
 #define CopyMagickString  PrependMagickMethod(CopyMagickString)
@@ -309,7 +309,7 @@ extern "C" {
 #define EqualizeImage  PrependMagickMethod(EqualizeImage)
 #define EqualizeImage  PrependMagickMethod(EqualizeImage)
 #define EscapeString  PrependMagickMethod(EscapeString)
-#define EvaluateImageChannel  PrependMagickMethod(EvaluateImageChannel)
+#define EvaluateImage  PrependMagickMethod(EvaluateImage)
 #define EvaluateImage  PrependMagickMethod(EvaluateImage)
 #define ExcerptImage  PrependMagickMethod(ExcerptImage)
 #define ExpandAffine  PrependMagickMethod(ExpandAffine)
@@ -323,8 +323,8 @@ extern "C" {
 #define FileToImage  PrependMagickMethod(FileToImage)
 #define FileToStringInfo  PrependMagickMethod(FileToStringInfo)
 #define FileToString  PrependMagickMethod(FileToString)
-#define FilterImageChannel  PrependMagickMethod(FilterImageChannel)
-#define FilterImage  PrependMagickMethod(FilterImage)
+#define ConvolveImage  PrependMagickMethod(ConvolveImage)
+#define ConvolveImage  PrependMagickMethod(ConvolveImage)
 #define FinalizeSignature  PrependMagickMethod(FinalizeSignature)
 #define FlattenImages  PrependMagickMethod(FlattenImages)
 #define FlipImage  PrependMagickMethod(FlipImage)
@@ -343,7 +343,7 @@ extern "C" {
 #define FormatString  PrependMagickMethod(FormatString)
 #define ForwardFourierTransformImage  PrependMagickMethod(ForwardFourierTransformImage)
 #define FrameImage  PrependMagickMethod(FrameImage)
-#define FunctionImageChannel  PrependMagickMethod(FunctionImageChannel)
+#define FunctionImage  PrependMagickMethod(FunctionImage)
 #define FunctionImage  PrependMagickMethod(FunctionImage)
 #define FuzzyColorCompare  PrependMagickMethod(FuzzyColorCompare)
 #define FuzzyColorMatch  PrependMagickMethod(FuzzyColorMatch)
@@ -355,7 +355,7 @@ extern "C" {
 #define FxPreprocessExpression  PrependMagickMethod(FxPreprocessExpression)
 #define GammaImage  PrependMagickMethod(GammaImage)
 #define GammaImage  PrependMagickMethod(GammaImage)
-#define GaussianBlurImageChannel  PrependMagickMethod(GaussianBlurImageChannel)
+#define GaussianBlurImage  PrependMagickMethod(GaussianBlurImage)
 #define GaussianBlurImage  PrependMagickMethod(GaussianBlurImage)
 #define GaussJordanElimination  PrependMagickMethod(GaussJordanElimination)
 #define GenerateDifferentialNoise  PrependMagickMethod(GenerateDifferentialNoise)
@@ -423,11 +423,11 @@ extern "C" {
 #define GetImageDepth  PrependMagickMethod(GetImageDepth)
 #define GetImageDistortion  PrependMagickMethod(GetImageDistortion)
 #define GetImageDistortions  PrependMagickMethod(GetImageDistortions)
-#define GetImageChannelExtrema  PrependMagickMethod(GetImageChannelExtrema)
-#define GetImageChannelKurtosis  PrependMagickMethod(GetImageChannelKurtosis)
-#define GetImageChannelMean  PrependMagickMethod(GetImageChannelMean)
-#define GetImageChannelRange  PrependMagickMethod(GetImageChannelRange)
-#define GetImageChannelStatistics  PrependMagickMethod(GetImageChannelStatistics)
+#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)
@@ -543,7 +543,7 @@ extern "C" {
 #define GetOneCacheViewVirtualMethodPixel  PrependMagickMethod(GetOneCacheViewVirtualMethodPixel)
 #define GetOneCacheViewVirtualPixel  PrependMagickMethod(GetOneCacheViewVirtualPixel)
 #define GetOnePixel  PrependMagickMethod(GetOnePixel)
-#define GetOneVirtualMagickPixel  PrependMagickMethod(GetOneVirtualMagickPixel)
+#define GetOneVirtualPixelInfo  PrependMagickMethod(GetOneVirtualPixelInfo)
 #define GetOneVirtualMethodPixel  PrependMagickMethod(GetOneVirtualMethodPixel)
 #define GetOneVirtualPixel  PrependMagickMethod(GetOneVirtualPixel)
 #define GetOptimalKernelWidth1D  PrependMagickMethod(GetOptimalKernelWidth1D)
@@ -652,7 +652,7 @@ extern "C" {
 #define IsBlobExempt  PrependMagickMethod(IsBlobExempt)
 #define IsBlobSeekable  PrependMagickMethod(IsBlobSeekable)
 #define IsBlobTemporary  PrependMagickMethod(IsBlobTemporary)
-#define IsFuzzyEquivalencePixelPacket  PrependMagickMethod(IsFuzzyEquivalencePixelPacket)
+#define IsFuzzyEquivalencePixelInfo  PrependMagickMethod(IsFuzzyEquivalencePixelInfo)
 #define IsEventLogging  PrependMagickMethod(IsEventLogging)
 #define IsGeometry  PrependMagickMethod(IsGeometry)
 #define IsGlob  PrependMagickMethod(IsGlob)
@@ -747,7 +747,7 @@ extern "C" {
 #define MapImage  PrependMagickMethod(MapImage)
 #define MapImages  PrependMagickMethod(MapImages)
 #define MatteFloodfillImage  PrependMagickMethod(MatteFloodfillImage)
-#define MedianFilterImage  PrependMagickMethod(MedianFilterImage)
+#define MedianConvolveImage  PrependMagickMethod(MedianConvolveImage)
 #define MergeImageLayers  PrependMagickMethod(MergeImageLayers)
 #define MimeComponentGenesis  PrependMagickMethod(MimeComponentGenesis)
 #define MimeComponentTerminus  PrependMagickMethod(MimeComponentTerminus)
@@ -760,7 +760,7 @@ extern "C" {
 #define MorphImages  PrependMagickMethod(MorphImages)
 #define MorphologyImage  PrependMagickMethod(MorphologyImage)
 #define MosaicImages  PrependMagickMethod(MosaicImages)
-#define MotionBlurImageChannel  PrependMagickMethod(MotionBlurImageChannel)
+#define MotionBlurImage  PrependMagickMethod(MotionBlurImage)
 #define MotionBlurImage  PrependMagickMethod(MotionBlurImage)
 #define MSBOrderLong  PrependMagickMethod(MSBOrderLong)
 #define MSBOrderShort  PrependMagickMethod(MSBOrderShort)
@@ -778,7 +778,7 @@ extern "C" {
 #define NormalizeImage  PrependMagickMethod(NormalizeImage)
 #define OilPaintImage  PrependMagickMethod(OilPaintImage)
 #define OpaqueImage  PrependMagickMethod(OpaqueImage)
-#define OpaquePaintImageChannel  PrependMagickMethod(OpaquePaintImageChannel)
+#define OpaquePaintImage  PrependMagickMethod(OpaquePaintImage)
 #define OpaquePaintImage  PrependMagickMethod(OpaquePaintImage)
 #define OpenBlob  PrependMagickMethod(OpenBlob)
 #define OpenCacheView  PrependMagickMethod(OpenCacheView)
@@ -836,18 +836,18 @@ extern "C" {
 #define QuantizeImages  PrependMagickMethod(QuantizeImages)
 #define QueryColorDatabase  PrependMagickMethod(QueryColorDatabase)
 #define QueryColorname  PrependMagickMethod(QueryColorname)
-#define QueryMagickColorname  PrependMagickMethod(QueryMagickColorname)
+#define QueryColorname  PrependMagickMethod(QueryColorname)
 #define QueryMagickColor  PrependMagickMethod(QueryMagickColor)
-#define QueueAuthenticNexus  PrependMagickMethod(QueueAuthenticNexus)
+#define QueueAuthenticPixelCacheNexus  PrependMagickMethod(QueueAuthenticPixelCacheNexus)
 #define QueueAuthenticPixels  PrependMagickMethod(QueueAuthenticPixels)
 #define QueueCacheViewAuthenticPixels  PrependMagickMethod(QueueCacheViewAuthenticPixels)
-#define RadialBlurImageChannel  PrependMagickMethod(RadialBlurImageChannel)
+#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 RandomThresholdImageChannel  PrependMagickMethod(RandomThresholdImageChannel)
+#define RandomThresholdImage  PrependMagickMethod(RandomThresholdImage)
 #define RandomThresholdImage  PrependMagickMethod(RandomThresholdImage)
 #define ReacquireMemory  PrependMagickMethod(ReacquireMemory)
 #define ReadBlobByte  PrependMagickMethod(ReadBlobByte)
@@ -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)
@@ -1029,16 +1029,16 @@ extern "C" {
 #define ResourceComponentGenesis  PrependMagickMethod(ResourceComponentGenesis)
 #define ResourceComponentTerminus  PrependMagickMethod(ResourceComponentTerminus)
 #define ReverseImageList  PrependMagickMethod(ReverseImageList)
-#define RGBTransformImage  PrependMagickMethod(RGBTransformImage)
+#define sRGBTransformImage  PrependMagickMethod(sRGBTransformImage)
 #define RollImage  PrependMagickMethod(RollImage)
 #define RotateImage  PrependMagickMethod(RotateImage)
 #define SampleImage  PrependMagickMethod(SampleImage)
 #define ScaleImage  PrependMagickMethod(ScaleImage)
 #define ScaleResampleFilter  PrependMagickMethod(ScaleResampleFilter)
-#define SeedPseudoRandomGenerator  PrependMagickMethod(SeedPseudoRandomGenerator)
+#define SetRandomSecretKey  PrependMagickMethod(SetRandomSecretKey)
 #define SeekBlob  PrependMagickMethod(SeekBlob)
 #define SegmentImage  PrependMagickMethod(SegmentImage)
-#define SelectiveBlurImageChannel  PrependMagickMethod(SelectiveBlurImageChannel)
+#define SelectiveBlurImage  PrependMagickMethod(SelectiveBlurImage)
 #define SelectiveBlurImage  PrependMagickMethod(SelectiveBlurImage)
 #define SemaphoreComponentGenesis  PrependMagickMethod(SemaphoreComponentGenesis)
 #define SemaphoreComponentTerminus  PrependMagickMethod(SemaphoreComponentTerminus)
@@ -1123,7 +1123,7 @@ extern "C" {
 #define SetXMLTreeContent  PrependMagickMethod(SetXMLTreeContent)
 #define ShadeImage  PrependMagickMethod(ShadeImage)
 #define ShadowImage  PrependMagickMethod(ShadowImage)
-#define SharpenImageChannel  PrependMagickMethod(SharpenImageChannel)
+#define SharpenImage  PrependMagickMethod(SharpenImage)
 #define SharpenImage  PrependMagickMethod(SharpenImage)
 #define ShaveImage  PrependMagickMethod(ShaveImage)
 #define ShearImage  PrependMagickMethod(ShearImage)
@@ -1188,7 +1188,7 @@ extern "C" {
 #define TransformImageColorspace  PrependMagickMethod(TransformImageColorspace)
 #define TransformImage  PrependMagickMethod(TransformImage)
 #define TransformImages  PrependMagickMethod(TransformImages)
-#define TransformRGBImage  PrependMagickMethod(TransformRGBImage)
+#define TransformsRGBImage  PrependMagickMethod(TransformsRGBImage)
 #define TranslateText  PrependMagickMethod(TranslateText)
 #define TransparentImage  PrependMagickMethod(TransparentImage)
 #define TransparentPaintImageChroma  PrependMagickMethod(TransparentPaintImageChroma)
@@ -1308,14 +1308,14 @@ extern "C" {
 #define UnregisterXWDImage  PrependMagickMethod(UnregisterXWDImage)
 #define UnregisterYCBCRImage  PrependMagickMethod(UnregisterYCBCRImage)
 #define UnregisterYUVImage  PrependMagickMethod(UnregisterYUVImage)
-#define UnsharpMaskImageChannel  PrependMagickMethod(UnsharpMaskImageChannel)
+#define UnsharpMaskImage  PrependMagickMethod(UnsharpMaskImage)
 #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 WhiteThresholdImageChannel  PrependMagickMethod(WhiteThresholdImageChannel)
+#define WhiteThresholdImage  PrependMagickMethod(WhiteThresholdImage)
 #define WhiteThresholdImage  PrependMagickMethod(WhiteThresholdImage)
 #define WriteBlobByte  PrependMagickMethod(WriteBlobByte)
 #define WriteBlobFloat  PrependMagickMethod(WriteBlobFloat)