...

[imagemagick] / MagickWand / magick-image.h

diff --git a/MagickWand/magick-image.h b/MagickWand/magick-image.h
index 9d01f24dca7b5b4c240241bc4452f9bcbce8be0d..bd31241bb52b0893d61cda5d2842c51250d019e8 100644 (file)
--- a/MagickWand/magick-image.h
+++ b/MagickWand/magick-image.h
@@ -1,5 +1,5 @@
 /*
-  Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization
+  Copyright 1999-2017 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.
@@ -16,8 +16,8 @@
   MagickWand image Methods.
 */
 
-#ifndef _MAGICKWAND_MAGICK_IMAGE_H
-#define _MAGICKWAND_MAGICK_IMAGE_H
+#ifndef MAGICKWAND_MAGICK_IMAGE_H
+#define MAGICKWAND_MAGICK_IMAGE_H
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
@@ -26,6 +26,9 @@ extern "C" {
 extern WandExport ChannelFeatures
   *MagickGetImageFeatures(MagickWand *,const size_t);
 
+extern WandExport ChannelType
+   MagickSetImageChannelMask(MagickWand *,const ChannelType);
+
 extern WandExport ChannelStatistics
   *MagickGetImageStatistics(MagickWand *);
 
@@ -65,13 +68,14 @@ extern WandExport Image
   *GetImageFromMagickWand(const MagickWand *);
 
 extern WandExport ImageType
-  MagickGetImageType(MagickWand *);
+  MagickGetImageType(MagickWand *),
+  MagickIdentifyImageType(MagickWand *);
 
 extern WandExport InterlaceType
   MagickGetImageInterlaceScheme(MagickWand *);
 
 extern WandExport PixelInterpolateMethod
-  MagickGetImagePixelInterpolateMethod(MagickWand *);
+  MagickGetImageInterpolateMethod(MagickWand *);
 
 extern WandExport MagickBooleanType
   MagickAdaptiveBlurImage(MagickWand *,const double,const double),
@@ -87,6 +91,7 @@ extern WandExport MagickBooleanType
   MagickAnimateImages(MagickWand *,const char *),
   MagickAutoGammaImage(MagickWand *),
   MagickAutoLevelImage(MagickWand *),
+  MagickAutoOrientImage(MagickWand *),
   MagickBlackThresholdImage(MagickWand *,const PixelWand *),
   MagickBlueShiftImage(MagickWand *,const double),
   MagickBlurImage(MagickWand *,const double,const double),
@@ -106,6 +111,8 @@ extern WandExport MagickBooleanType
   MagickCommentImage(MagickWand *,const char *),
   MagickCompositeImage(MagickWand *,const MagickWand *,const CompositeOperator,
     const MagickBooleanType,const ssize_t,const ssize_t),
+  MagickCompositeImageGravity(MagickWand *,const MagickWand *,const CompositeOperator,
+    const GravityType),
   MagickCompositeLayers(MagickWand *,const MagickWand *,const CompositeOperator,
     const ssize_t,const ssize_t),
   MagickConstituteImage(MagickWand *,const size_t,const size_t,const char *,
@@ -121,10 +128,10 @@ extern WandExport MagickBooleanType
   MagickDespeckleImage(MagickWand *),
   MagickDisplayImage(MagickWand *,const char *),
   MagickDisplayImages(MagickWand *,const char *),
-  MagickDistortImage(MagickWand *,const DistortImageMethod,const size_t,
+  MagickDistortImage(MagickWand *,const DistortMethod,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 *),
@@ -146,8 +153,9 @@ extern WandExport MagickBooleanType
   MagickGammaImage(MagickWand *,const double),
   MagickGaussianBlurImage(MagickWand *,const double,const double),
   MagickGetImageAlphaChannel(MagickWand *),
+  MagickGetImageAlphaColor(MagickWand *,PixelWand *),
   MagickGetImageBackgroundColor(MagickWand *,PixelWand *),
-  MagickGetImageBluePrimary(MagickWand *,double *,double *),
+  MagickGetImageBluePrimary(MagickWand *,double *,double *,double *),
   MagickGetImageBorderColor(MagickWand *,PixelWand *),
   MagickGetImageKurtosis(MagickWand *,double *,double *),
   MagickGetImageMean(MagickWand *,double *,double *),
@@ -155,17 +163,16 @@ extern WandExport MagickBooleanType
   MagickGetImageColormapColor(MagickWand *,const size_t,PixelWand *),
   MagickGetImageDistortion(MagickWand *,const MagickWand *,const MetricType,
     double *),
-  MagickGetImageGreenPrimary(MagickWand *,double *,double *),
-  MagickGetImageMatteColor(MagickWand *,PixelWand *),
+  MagickGetImageGreenPrimary(MagickWand *,double *,double *,double *),
   MagickGetImageLength(MagickWand *,MagickSizeType *),
   MagickGetImagePage(MagickWand *,size_t *,size_t *,ssize_t *,
     ssize_t *),
   MagickGetImagePixelColor(MagickWand *,const ssize_t,const ssize_t,
     PixelWand *),
   MagickGetImageRange(MagickWand *,double *,double *),
-  MagickGetImageRedPrimary(MagickWand *,double *,double *),
+  MagickGetImageRedPrimary(MagickWand *,double *,double *,double *),
   MagickGetImageResolution(MagickWand *,double *,double *),
-  MagickGetImageWhitePoint(MagickWand *,double *,double *),
+  MagickGetImageWhitePoint(MagickWand *,double *,double *,double *),
   MagickHaldClutImage(MagickWand *,const MagickWand *),
   MagickHasNextImage(MagickWand *),
   MagickHasPreviousImage(MagickWand *),
@@ -181,6 +188,7 @@ extern WandExport MagickBooleanType
   MagickLinearStretchImage(MagickWand *,const double,const double),
   MagickLiquidRescaleImage(MagickWand *,const size_t,const size_t,const double,
     const double),
+  MagickLocalContrastImage(MagickWand *,const double,const double),
   MagickMagnifyImage(MagickWand *),
   MagickMedianConvolveImage(MagickWand *,const double),
   MagickMinifyImage(MagickWand *),
@@ -196,7 +204,8 @@ extern WandExport MagickBooleanType
   MagickOilPaintImage(MagickWand *,const double,const double),
   MagickOpaquePaintImage(MagickWand *,const PixelWand *,const PixelWand *,
     const double,const MagickBooleanType),
-  MagickOrderedPosterizeImage(MagickWand *,const char *),
+  MagickOptimizeImageTransparency(MagickWand *),
+  MagickOrderedDitherImage(MagickWand *,const char *),
   MagickTransparentPaintImage(MagickWand *,const PixelWand *,
     const double,const double,const MagickBooleanType invert),
   MagickPingImage(MagickWand *,const char *),
@@ -210,7 +219,7 @@ extern WandExport MagickBooleanType
     const size_t,const DitherMethod,const MagickBooleanType),
   MagickQuantizeImages(MagickWand *,const size_t,const ColorspaceType,
     const size_t,const DitherMethod,const MagickBooleanType),
-  MagickRadialBlurImage(MagickWand *,const double),
+  MagickRotationalBlurImage(MagickWand *,const double),
   MagickRaiseImage(MagickWand *,const size_t,const size_t,const ssize_t,
     const ssize_t,const MagickBooleanType),
   MagickRandomThresholdImage(MagickWand *,const double,const double),
@@ -220,24 +229,27 @@ extern WandExport MagickBooleanType
   MagickReduceNoiseImage(MagickWand *,const double),
   MagickRemapImage(MagickWand *,const MagickWand *,const DitherMethod),
   MagickRemoveImage(MagickWand *),
-  MagickResampleImage(MagickWand *,const double,const double,const FilterTypes),
+  MagickResampleImage(MagickWand *,const double,const double,const FilterType),
   MagickResetImagePage(MagickWand *,const char *),
-  MagickResizeImage(MagickWand *,const size_t,const size_t,const FilterTypes),
+  MagickResizeImage(MagickWand *,const size_t,const size_t,const FilterType),
   MagickRollImage(MagickWand *,const ssize_t,const ssize_t),
   MagickRotateImage(MagickWand *,const PixelWand *,const double),
   MagickSampleImage(MagickWand *,const size_t,const size_t),
   MagickScaleImage(MagickWand *,const size_t,const size_t),
   MagickSegmentImage(MagickWand *,const ColorspaceType,const MagickBooleanType,
     const double,const double),
-  MagickSelectiveBlurImage(MagickWand *,const double,const double,const double),
+  MagickSelectiveBlurImage(MagickWand *,const double,const double,
+    const double),
   MagickSeparateImage(MagickWand *,const ChannelType),
   MagickSepiaToneImage(MagickWand *,const double),
   MagickSetImage(MagickWand *,const MagickWand *),
-  MagickSetImageAlphaChannel(MagickWand *,const AlphaChannelType),
+  MagickSetImageAlpha(MagickWand *,const double),
+  MagickSetImageAlphaChannel(MagickWand *,const AlphaChannelOption),
+  MagickSetImageAlphaColor(MagickWand *,const PixelWand *),
   MagickSetImageBackgroundColor(MagickWand *,const PixelWand *),
-  MagickSetImageBluePrimary(MagickWand *,const double,const double),
+  MagickSetImageBluePrimary(MagickWand *,const double,const double,
+    const double),
   MagickSetImageBorderColor(MagickWand *,const PixelWand *),
-  MagickSetImageClipMask(MagickWand *,const MagickWand *),
   MagickSetImageColor(MagickWand *,const PixelWand *),
   MagickSetImageColormapColor(MagickWand *,const size_t,
     const PixelWand *),
@@ -255,24 +267,25 @@ extern WandExport MagickBooleanType
   MagickSetImageFuzz(MagickWand *,const double),
   MagickSetImageGamma(MagickWand *,const double),
   MagickSetImageGravity(MagickWand *,const GravityType),
-  MagickSetImageGreenPrimary(MagickWand *,const double,const double),
+  MagickSetImageGreenPrimary(MagickWand *,const double,const double,
+    const double),
   MagickSetImageInterlaceScheme(MagickWand *,const InterlaceType),
-  MagickSetImagePixelInterpolateMethod(MagickWand *,const PixelInterpolateMethod),
+  MagickSetImageInterpolateMethod(MagickWand *,const PixelInterpolateMethod),
   MagickSetImageIterations(MagickWand *,const size_t),
   MagickSetImageMatte(MagickWand *,const MagickBooleanType),
-  MagickSetImageMatteColor(MagickWand *,const PixelWand *),
-  MagickSetImageAlpha(MagickWand *,const double),
   MagickSetImageOrientation(MagickWand *,const OrientationType),
   MagickSetImagePage(MagickWand *,const size_t,const size_t,const ssize_t,
     const ssize_t),
-  MagickSetImageRedPrimary(MagickWand *,const double,const double),
+  MagickSetImageRedPrimary(MagickWand *,const double,const double,
+    const double),
   MagickSetImageRenderingIntent(MagickWand *,const RenderingIntent),
   MagickSetImageResolution(MagickWand *,const double,const double),
   MagickSetImageScene(MagickWand *,const size_t),
   MagickSetImageTicksPerSecond(MagickWand *,const ssize_t),
   MagickSetImageType(MagickWand *,const ImageType),
   MagickSetImageUnits(MagickWand *,const ResolutionType),
-  MagickSetImageWhitePoint(MagickWand *,const double,const double),
+  MagickSetImageWhitePoint(MagickWand *,const double,const double,
+    const double),
   MagickShadeImage(MagickWand *,const MagickBooleanType,const double,
     const double),
   MagickShadowImage(MagickWand *,const double,const double,const ssize_t,
@@ -288,7 +301,7 @@ extern WandExport MagickBooleanType
     const double *),
   MagickSpliceImage(MagickWand *,const size_t,const size_t,const ssize_t,
     const ssize_t),
-  MagickSpreadImage(MagickWand *,const double,const PixelInterpolateMethod),
+  MagickSpreadImage(MagickWand *,const PixelInterpolateMethod,const double),
   MagickStatisticImage(MagickWand *,const StatisticType,const size_t,
     const size_t),
   MagickStripImage(MagickWand *),
@@ -314,7 +327,7 @@ extern WandExport MagickBooleanType
   MagickWriteImages(MagickWand *,const char *,const MagickBooleanType),
   MagickWriteImagesFile(MagickWand *,FILE *);
 
-WandExport MagickProgressMonitor
+extern WandExport MagickProgressMonitor
   MagickSetImageProgressMonitor(MagickWand *,const MagickProgressMonitor,
     void *);
 
@@ -325,27 +338,26 @@ extern WandExport 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 *),
   *MagickGetImage(MagickWand *),
-  *MagickGetImageClipMask(MagickWand *),
+  *MagickGetImageMask(MagickWand *,const PixelMask),
   *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 *,const MetricType,
-    RectangleInfo *,double *),
+    const double,RectangleInfo *,double *),
   *MagickSmushImages(MagickWand *,const MagickBooleanType,const ssize_t),
   *MagickSteganoImage(MagickWand *,const MagickWand *,const ssize_t),
   *MagickStereoImage(MagickWand *,const MagickWand *),
-  *MagickTextureImage(MagickWand *,const MagickWand *),
-  *MagickTransformImage(MagickWand *,const char *,const char *);
+  *MagickTextureImage(MagickWand *,const MagickWand *);
 
 extern WandExport OrientationType
   MagickGetImageOrientation(MagickWand *);