(no commit message)

[imagemagick] / MagickWand / magick-image.h

diff --git a/MagickWand/magick-image.h b/MagickWand/magick-image.h
index b89e6eb4397a1d6b230ec3379402b312aaabec13..319df504bdd4b80efccf1f21784f39f13cc95ab1 100644 (file)
--- a/MagickWand/magick-image.h
+++ b/MagickWand/magick-image.h
@@ -1,5 +1,5 @@
 /*
-  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
+  Copyright 1999-2013 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.
@@ -54,6 +54,9 @@ extern WandExport double
   MagickGetImageGamma(MagickWand *),
   MagickGetImageTotalInkDensity(MagickWand *);
 
+extern WandExport EndianType
+  MagickGetImageEndian(MagickWand *);
+
 extern WandExport GravityType
   MagickGetImageGravity(MagickWand *);
 
@@ -67,18 +70,17 @@ extern WandExport ImageType
 extern WandExport InterlaceType
   MagickGetImageInterlaceScheme(MagickWand *);
 
-extern WandExport InterpolatePixelMethod
-  MagickGetImageInterpolateMethod(MagickWand *);
+extern WandExport PixelInterpolateMethod
+  MagickGetImagePixelInterpolateMethod(MagickWand *);
 
 extern WandExport MagickBooleanType
-  MagickAdaptiveBlurImage(MagickWand *,const double,const double,const double),
+  MagickAdaptiveBlurImage(MagickWand *,const double,const double),
   MagickAdaptiveResizeImage(MagickWand *,const size_t,const size_t),
-  MagickAdaptiveSharpenImage(MagickWand *,const double,const double,
-    const double),
+  MagickAdaptiveSharpenImage(MagickWand *,const double,const double),
   MagickAdaptiveThresholdImage(MagickWand *,const size_t,const size_t,
-    const ssize_t),
+    const double),
   MagickAddImage(MagickWand *,const MagickWand *),
-  MagickAddNoiseImage(MagickWand *,const NoiseType),
+  MagickAddNoiseImage(MagickWand *,const NoiseType,const double),
   MagickAffineTransformImage(MagickWand *,const DrawingWand *),
   MagickAnnotateImage(MagickWand *,const DrawingWand *,const double,
     const double,const double,const char *),
@@ -87,21 +89,24 @@ extern WandExport MagickBooleanType
   MagickAutoLevelImage(MagickWand *),
   MagickBlackThresholdImage(MagickWand *,const PixelWand *),
   MagickBlueShiftImage(MagickWand *,const double),
-  MagickBlurImage(MagickWand *,const double,const double,const double),
-  MagickBorderImage(MagickWand *,const PixelWand *,const size_t,const size_t),
+  MagickBlurImage(MagickWand *,const double,const double),
+  MagickBorderImage(MagickWand *,const PixelWand *,const size_t,const size_t,
+    const CompositeOperator compose),
   MagickBrightnessContrastImage(MagickWand *,const double,const double),
-  MagickCharcoalImage(MagickWand *,const double,const double,const double),
+  MagickCharcoalImage(MagickWand *,const double,const double),
   MagickChopImage(MagickWand *,const size_t,const size_t,const ssize_t,
     const ssize_t),
   MagickClampImage(MagickWand *),
   MagickClipImage(MagickWand *),
   MagickClipImagePath(MagickWand *,const char *,const MagickBooleanType),
-  MagickClutImage(MagickWand *,const MagickWand *),
+  MagickClutImage(MagickWand *,const MagickWand *,const PixelInterpolateMethod),
   MagickColorDecisionListImage(MagickWand *,const char *),
   MagickColorizeImage(MagickWand *,const PixelWand *,const PixelWand *),
   MagickColorMatrixImage(MagickWand *,const KernelInfo *),
   MagickCommentImage(MagickWand *,const char *),
   MagickCompositeImage(MagickWand *,const MagickWand *,const CompositeOperator,
+    const MagickBooleanType,const ssize_t,const ssize_t),
+  MagickCompositeLayers(MagickWand *,const MagickWand *,const CompositeOperator,
     const ssize_t,const ssize_t),
   MagickConstituteImage(MagickWand *,const size_t,const size_t,const char *,
     const StorageType,const void *),
@@ -119,7 +124,7 @@ extern WandExport MagickBooleanType
   MagickDistortImage(MagickWand *,const DistortImageMethod,const size_t,
     const double *,const MagickBooleanType),
   MagickDrawImage(MagickWand *,const DrawingWand *),
-  MagickEdgeImage(MagickWand *,const double,const double),
+  MagickEdgeImage(MagickWand *,const double),
   MagickEmbossImage(MagickWand *,const double,const double),
   MagickEncipherImage(MagickWand *,const char *),
   MagickEnhanceImage(MagickWand *),
@@ -135,11 +140,11 @@ extern WandExport MagickBooleanType
   MagickFlopImage(MagickWand *),
   MagickForwardFourierTransformImage(MagickWand *,const MagickBooleanType),
   MagickFrameImage(MagickWand *,const PixelWand *,const size_t,const size_t,
-    const ssize_t,const ssize_t),
+    const ssize_t,const ssize_t,const CompositeOperator),
   MagickFunctionImage(MagickWand *,const MagickFunction,const size_t,
     const double *),
   MagickGammaImage(MagickWand *,const double),
-  MagickGaussianBlurImage(MagickWand *,const double,const double,const double),
+  MagickGaussianBlurImage(MagickWand *,const double,const double),
   MagickGetImageAlphaChannel(MagickWand *),
   MagickGetImageBackgroundColor(MagickWand *,PixelWand *),
   MagickGetImageBluePrimary(MagickWand *,double *,double *),
@@ -164,9 +169,11 @@ extern WandExport MagickBooleanType
   MagickHaldClutImage(MagickWand *,const MagickWand *),
   MagickHasNextImage(MagickWand *),
   MagickHasPreviousImage(MagickWand *),
-  MagickImplodeImage(MagickWand *,const double),
+  MagickImplodeImage(MagickWand *,const double,const PixelInterpolateMethod),
   MagickImportImagePixels(MagickWand *,const ssize_t,const ssize_t,const size_t,
     const size_t,const char *,const StorageType,const void *),
+  MagickInterpolativeResizeImage(MagickWand *,const size_t,const size_t,
+    const PixelInterpolateMethod),
   MagickInverseFourierTransformImage(MagickWand *,MagickWand *,
     const MagickBooleanType),
   MagickLabelImage(MagickWand *,const char *),
@@ -181,8 +188,7 @@ extern WandExport MagickBooleanType
   MagickModulateImage(MagickWand *,const double,const double,const double),
   MagickMorphologyImage(MagickWand *,MorphologyMethod,const ssize_t,
     KernelInfo *),
-  MagickMotionBlurImage(MagickWand *,const double,const double,const double,
-    const double),
+  MagickMotionBlurImage(MagickWand *,const double,const double,const double),
   MagickNegateImage(MagickWand *,const MagickBooleanType),
   MagickNewImage(MagickWand *,const size_t,const size_t,const PixelWand *),
   MagickNextImage(MagickWand *),
@@ -190,19 +196,21 @@ extern WandExport MagickBooleanType
   MagickOilPaintImage(MagickWand *,const double,const double),
   MagickOpaquePaintImage(MagickWand *,const PixelWand *,const PixelWand *,
     const double,const MagickBooleanType),
+  MagickOptimizeImageTransparency(MagickWand *),
   MagickOrderedPosterizeImage(MagickWand *,const char *),
   MagickTransparentPaintImage(MagickWand *,const PixelWand *,
     const double,const double,const MagickBooleanType invert),
   MagickPingImage(MagickWand *,const char *),
   MagickPingImageBlob(MagickWand *,const void *,const size_t),
   MagickPingImageFile(MagickWand *,FILE *),
-  MagickPolaroidImage(MagickWand *,const DrawingWand *,const double),
-  MagickPosterizeImage(MagickWand *,const size_t,const MagickBooleanType),
+  MagickPolaroidImage(MagickWand *,const DrawingWand *,const char *,
+    const double,const PixelInterpolateMethod),
+  MagickPosterizeImage(MagickWand *,const size_t,const DitherMethod),
   MagickPreviousImage(MagickWand *),
   MagickQuantizeImage(MagickWand *,const size_t,const ColorspaceType,
-    const size_t,const MagickBooleanType,const MagickBooleanType),
+    const size_t,const DitherMethod,const MagickBooleanType),
   MagickQuantizeImages(MagickWand *,const size_t,const ColorspaceType,
-    const size_t,const MagickBooleanType,const MagickBooleanType),
+    const size_t,const DitherMethod,const MagickBooleanType),
   MagickRadialBlurImage(MagickWand *,const double),
   MagickRaiseImage(MagickWand *,const size_t,const size_t,const ssize_t,
     const ssize_t,const MagickBooleanType),
@@ -213,11 +221,9 @@ extern WandExport MagickBooleanType
   MagickReduceNoiseImage(MagickWand *,const double),
   MagickRemapImage(MagickWand *,const MagickWand *,const DitherMethod),
   MagickRemoveImage(MagickWand *),
-  MagickResampleImage(MagickWand *,const double,const double,const FilterTypes,
-    const double),
+  MagickResampleImage(MagickWand *,const double,const double,const FilterTypes),
   MagickResetImagePage(MagickWand *,const char *),
-  MagickResizeImage(MagickWand *,const size_t,const size_t,const FilterTypes,
-    const double),
+  MagickResizeImage(MagickWand *,const size_t,const size_t,const FilterTypes),
   MagickRollImage(MagickWand *,const ssize_t,const ssize_t),
   MagickRotateImage(MagickWand *,const PixelWand *,const double),
   MagickSampleImage(MagickWand *,const size_t,const size_t),
@@ -225,12 +231,11 @@ extern WandExport MagickBooleanType
   MagickSegmentImage(MagickWand *,const ColorspaceType,const MagickBooleanType,
     const double,const double),
   MagickSelectiveBlurImage(MagickWand *,const double,const double,const double),
-  MagickSeparateImage(MagickWand *),
+  MagickSeparateImage(MagickWand *,const ChannelType),
   MagickSepiaToneImage(MagickWand *,const double),
   MagickSetImage(MagickWand *,const MagickWand *),
-  MagickSetImageAlphaChannel(MagickWand *,const AlphaChannelType),
+  MagickSetImageAlphaChannel(MagickWand *,const AlphaChannelOption),
   MagickSetImageBackgroundColor(MagickWand *,const PixelWand *),
-  MagickSetImageBias(MagickWand *,const double),
   MagickSetImageBluePrimary(MagickWand *,const double,const double),
   MagickSetImageBorderColor(MagickWand *,const PixelWand *),
   MagickSetImageClipMask(MagickWand *,const MagickWand *),
@@ -244,6 +249,7 @@ extern WandExport MagickBooleanType
   MagickSetImageDepth(MagickWand *,const size_t),
   MagickSetImageDispose(MagickWand *,const DisposeType),
   MagickSetImageCompressionQuality(MagickWand *,const size_t),
+  MagickSetImageEndian(MagickWand *,const EndianType),
   MagickSetImageExtent(MagickWand *,const size_t,const size_t),
   MagickSetImageFilename(MagickWand *,const char *),
   MagickSetImageFormat(MagickWand *,const char *),
@@ -252,11 +258,12 @@ extern WandExport MagickBooleanType
   MagickSetImageGravity(MagickWand *,const GravityType),
   MagickSetImageGreenPrimary(MagickWand *,const double,const double),
   MagickSetImageInterlaceScheme(MagickWand *,const InterlaceType),
-  MagickSetImageInterpolateMethod(MagickWand *,const InterpolatePixelMethod),
+  MagickSetImagePixelInterpolateMethod(MagickWand *,
+    const PixelInterpolateMethod),
   MagickSetImageIterations(MagickWand *,const size_t),
   MagickSetImageMatte(MagickWand *,const MagickBooleanType),
   MagickSetImageMatteColor(MagickWand *,const PixelWand *),
-  MagickSetImageOpacity(MagickWand *,const double),
+  MagickSetImageAlpha(MagickWand *,const double),
   MagickSetImageOrientation(MagickWand *,const OrientationType),
   MagickSetImagePage(MagickWand *,const size_t,const size_t,const ssize_t,
     const ssize_t),
@@ -272,23 +279,22 @@ extern WandExport MagickBooleanType
     const double),
   MagickShadowImage(MagickWand *,const double,const double,const ssize_t,
     const ssize_t),
-  MagickSharpenImage(MagickWand *,const double,const double,const double),
+  MagickSharpenImage(MagickWand *,const double,const double),
   MagickShaveImage(MagickWand *,const size_t,const size_t),
   MagickShearImage(MagickWand *,const PixelWand *,const double,const double),
   MagickSigmoidalContrastImage(MagickWand *,const MagickBooleanType,
     const double,const double),
-  MagickSketchImage(MagickWand *,const double,const double,const double,
-    const double),
+  MagickSketchImage(MagickWand *,const double,const double,const double),
   MagickSolarizeImage(MagickWand *,const double),
   MagickSparseColorImage(MagickWand *,const SparseColorMethod,const size_t,
     const double *),
   MagickSpliceImage(MagickWand *,const size_t,const size_t,const ssize_t,
     const ssize_t),
-  MagickSpreadImage(MagickWand *,const double),
+  MagickSpreadImage(MagickWand *,const double,const PixelInterpolateMethod),
   MagickStatisticImage(MagickWand *,const StatisticType,const size_t,
     const size_t),
   MagickStripImage(MagickWand *),
-  MagickSwirlImage(MagickWand *,const double),
+  MagickSwirlImage(MagickWand *,const double,const PixelInterpolateMethod),
   MagickTintImage(MagickWand *,const PixelWand *,const PixelWand *),
   MagickTransformImageColorspace(MagickWand *,const ColorspaceType),
   MagickTransposeImage(MagickWand *),
@@ -302,7 +308,8 @@ extern WandExport MagickBooleanType
     const double),
   MagickVignetteImage(MagickWand *,const double,const double,const ssize_t,
     const ssize_t),
-  MagickWaveImage(MagickWand *,const double,const double),
+  MagickWaveImage(MagickWand *,const double,const double,
+    const PixelInterpolateMethod),
   MagickWhiteThresholdImage(MagickWand *,const PixelWand *),
   MagickWriteImage(MagickWand *,const char *),
   MagickWriteImageFile(MagickWand *,FILE *),
@@ -315,11 +322,12 @@ WandExport MagickProgressMonitor
 
 extern WandExport MagickWand
   *MagickAppendImages(MagickWand *,const MagickBooleanType),
+  *MagickChannelFxImage(MagickWand *,const char *),
   *MagickCoalesceImages(MagickWand *),
-  *MagickCombineImages(MagickWand *),
+  *MagickCombineImages(MagickWand *,const ColorspaceType),
   *MagickCompareImages(MagickWand *,const MagickWand *,const MetricType,
     double *),
-  *MagickCompareImagesLayers(MagickWand *,const ImageLayerMethod),
+  *MagickCompareImagesLayers(MagickWand *,const LayerMethod),
   *MagickDeconstructImages(MagickWand *),
   *MagickEvaluateImages(MagickWand *,const MagickEvaluateOperator),
   *MagickFxImage(MagickWand *,const char *),
@@ -327,14 +335,14 @@ extern WandExport MagickWand
   *MagickGetImageClipMask(MagickWand *),
   *MagickGetImageRegion(MagickWand *,const size_t,const size_t,const ssize_t,
     const ssize_t),
-  *MagickMergeImageLayers(MagickWand *,const ImageLayerMethod),
+  *MagickMergeImageLayers(MagickWand *,const LayerMethod),
   *MagickMorphImages(MagickWand *,const size_t),
   *MagickMontageImage(MagickWand *,const DrawingWand *,const char *,
     const char *,const MontageMode,const char *),
   *MagickOptimizeImageLayers(MagickWand *),
   *MagickPreviewImages(MagickWand *wand,const PreviewType),
-  *MagickSimilarityImage(MagickWand *,const MagickWand *,RectangleInfo *,
-    double *),
+  *MagickSimilarityImage(MagickWand *,const MagickWand *,const MetricType,
+    const double,RectangleInfo *,double *),
   *MagickSmushImages(MagickWand *,const MagickBooleanType,const ssize_t),
   *MagickSteganoImage(MagickWand *,const MagickWand *,const ssize_t),
   *MagickStereoImage(MagickWand *,const MagickWand *),