(no commit message)

diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp
index 0e0b54e77a92781b3e7bc07efd2fde3372bab254..dde74bf73f682161ddec1a95e350aeb4333569eb 100644 (file)
--- a/Magick++/lib/Image.cpp
+++ b/Magick++/lib/Image.cpp
@@ -1398,6 +1398,20 @@ void Magick::Image::medianFilter ( const double radius_ )
   (void) DestroyExceptionInfo( &exceptionInfo );
 }
 
+// Merge layers
+void Magick::Image::mergeLayers( const LayerMethod layerMethod_ )
+{
+  ExceptionInfo exceptionInfo;
+  GetExceptionInfo( &exceptionInfo );
+  MagickCore::Image* newImage =
+    MergeImageLayers ( image(),
+        layerMethod_,
+        &exceptionInfo );
+  replaceImage( newImage );
+  throwException( exceptionInfo );
+  (void) DestroyExceptionInfo( &exceptionInfo );
+}
+
 // Reduce image by integral size
 void Magick::Image::minify ( void )
 {

diff --git a/Magick++/lib/Magick++/Image.h b/Magick++/lib/Magick++/Image.h
index f0ebfa7b6cc06b6d0833f6a6bf689633fbaee953..34dedd4fbcff7a1fa67eeddb82031c1c881a998d 100644 (file)
--- a/Magick++/lib/Magick++/Image.h
+++ b/Magick++/lib/Magick++/Image.h
@@ -1032,6 +1032,9 @@ typedef struct _ImageStatistics
     // Transparent color
     void            matteColor ( const Color &matteColor_ );
     Color           matteColor ( void ) const;
+
+    // Merge image layers
+    void            mergeLayers ( const LayerMethod layerType_ );
     
     // The mean error per pixel computed when an image is color reduced
     double          meanErrorPerPixel ( void ) const;

diff --git a/Magick++/lib/Magick++/Include.h b/Magick++/lib/Magick++/Include.h
index 40aacb55027bacd061cfc1e5b5882cd6faa511ea..f5dde9b3f9a91d77d29c91c0d23e20143406e9ff 100644 (file)
--- a/Magick++/lib/Magick++/Include.h
+++ b/Magick++/lib/Magick++/Include.h
@@ -364,8 +364,24 @@ namespace Magick
   using MagickCore::PartitionInterlace;
 
   // Layer method
+  using MagickCore::LayerMethod;
+  using MagickCore::UndefinedLayer;
+  using MagickCore::CoalesceLayer;
+  using MagickCore::CompareAnyLayer;
+  using MagickCore::CompareClearLayer;
+  using MagickCore::CompareOverlayLayer;
+  using MagickCore::DisposeLayer;
+  using MagickCore::OptimizeLayer;
+  using MagickCore::OptimizeImageLayer;
+  using MagickCore::OptimizePlusLayer;
+  using MagickCore::OptimizeTransLayer;
+  using MagickCore::RemoveDupsLayer;
+  using MagickCore::RemoveZeroLayer;
+  using MagickCore::CompositeLayer;
+  using MagickCore::MergeLayer;
   using MagickCore::FlattenLayer;
   using MagickCore::MosaicLayer;
+  using MagickCore::TrimBoundsLayer;
 
   // Line cap types
   using MagickCore::LineCap;

diff --git a/Magick++/lib/Magick++/STL.h b/Magick++/lib/Magick++/STL.h
index 56678bbc424664505255115a66dc6fa10b8d68aa..d4c30a1833d308cbae26b5226f3dc7dcf315df8a 100644 (file)
--- a/Magick++/lib/Magick++/STL.h
+++ b/Magick++/lib/Magick++/STL.h
@@ -725,6 +725,19 @@ namespace Magick
   private:
     double _radius;
   };
+  
+  // Merge image layers
+  class MagickPPExport mergeLayersImage : public
+    std::unary_function<Image&,void>
+  {
+  public:
+    mergeLayersImage ( LayerMethod layerMethod_ );
+
+    void operator()( Image &image_ ) const;
+
+  private:
+    LayerMethod _layerMethod;
+  };
 
   // Reduce image by integral size
   class MagickPPExport minifyImage : public std::unary_function<Image&,void>

diff --git a/Magick++/lib/STL.cpp b/Magick++/lib/STL.cpp
index 0228c8b4321e497518bfdfa302d6ecfc09934f3e..721163ce5cc63e23900eee42f822ec46025fcc3d 100644 (file)
--- a/Magick++/lib/STL.cpp
+++ b/Magick++/lib/STL.cpp
@@ -689,6 +689,17 @@ void Magick::medianConvolveImage::operator()( Magick::Image &image_ ) const
   image_.medianFilter( _radius );
 }
 
+// Merge image layers
+Magick::mergeLayersImage::mergeLayersImage( 
+  Magick::LayerMethod layerMethod_ )
+  : _layerMethod( layerMethod_ )
+{
+}
+void Magick::mergeLayersImage::operator()( Magick::Image &image_ ) const
+{
+  image_.mergeLayers( _layerMethod );
+}
+
 // Reduce image by integral size
 Magick::minifyImage::minifyImage( void )
 {

diff --git a/MagickCore/layer.c b/MagickCore/layer.c
index 472f1d6ab01c91f26935df69ef3119cf605a93c7..7f7868cb775c5e0e191ccc438f2cd795e22a97b6 100644 (file)
--- a/MagickCore/layer.c
+++ b/MagickCore/layer.c
@@ -507,7 +507,7 @@ MagickExport Image *DisposeImages(const Image *images,ExceptionInfo *exception)
 %
 %  The format of the ComparePixels method is:
 %
-%      MagickBooleanType *ComparePixels(const ImageLayerMethod method,
+%      MagickBooleanType *ComparePixels(const LayerMethod method,
 %        const PixelInfo *p,const PixelInfo *q)
 %
 %  A description of each parameter follows:
@@ -519,7 +519,7 @@ MagickExport Image *DisposeImages(const Image *images,ExceptionInfo *exception)
 %
 */
 
-static MagickBooleanType ComparePixels(const ImageLayerMethod method,
+static MagickBooleanType ComparePixels(const LayerMethod method,
   const PixelInfo *p,const PixelInfo *q)
 {
   double
@@ -575,7 +575,7 @@ static MagickBooleanType ComparePixels(const ImageLayerMethod method,
 %
 %  The format of the CompareImagesBounds method is:
 %
-%      RectangleInfo *CompareImagesBounds(const ImageLayerMethod method,
+%      RectangleInfo *CompareImagesBounds(const LayerMethod method,
 %        const Image *image1, const Image *image2, ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
@@ -590,7 +590,7 @@ static MagickBooleanType ComparePixels(const ImageLayerMethod method,
 */
 
 static RectangleInfo CompareImagesBounds(const Image *image1,const Image *image2,
-  const ImageLayerMethod method,ExceptionInfo *exception)
+  const LayerMethod method,ExceptionInfo *exception)
 {
   RectangleInfo
     bounds;
@@ -721,7 +721,7 @@ static RectangleInfo CompareImagesBounds(const Image *image1,const Image *image2
 %
 %  CompareImagesLayers() compares each image with the next in a sequence and
 %  returns the minimum bounding region of all the pixel differences (of the
-%  ImageLayerMethod specified) it discovers.
+%  LayerMethod specified) it discovers.
 %
 %  Images do NOT have to be the same size, though it is best that all the
 %  images are 'coalesced' (images are all the same size, on a flattened
@@ -733,7 +733,7 @@ static RectangleInfo CompareImagesBounds(const Image *image1,const Image *image2
 %  The format of the CompareImagesLayers method is:
 %
 %      Image *CompareImagesLayers(const Image *images,
-%        const ImageLayerMethod method,ExceptionInfo *exception)
+%        const LayerMethod method,ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
 %
@@ -747,7 +747,7 @@ static RectangleInfo CompareImagesBounds(const Image *image1,const Image *image2
 */
 
 MagickExport Image *CompareImagesLayers(const Image *image,
-  const ImageLayerMethod method, ExceptionInfo *exception)
+  const LayerMethod method, ExceptionInfo *exception)
 {
   Image
     *image_a,
@@ -878,7 +878,7 @@ MagickExport Image *CompareImagesLayers(const Image *image,
 %  The format of the OptimizeLayerFrames method is:
 %
 %      Image *OptimizeLayerFrames(const Image *image,
-%        const ImageLayerMethod method, ExceptionInfo *exception)
+%        const LayerMethod method, ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
 %
@@ -907,7 +907,7 @@ MagickExport Image *CompareImagesLayers(const Image *image,
 #define DEBUG_OPT_FRAME 0
 
 static Image *OptimizeLayerFrames(const Image *image,
-  const ImageLayerMethod method, ExceptionInfo *exception)
+  const LayerMethod method, ExceptionInfo *exception)
 {
   ExceptionInfo
     *sans_exception;
@@ -1852,7 +1852,7 @@ MagickExport void CompositeLayers(Image *destination,
 %  MergeImageLayers() composes all the image layers from the current given
 %  image onward to produce a single image of the merged layers.
 %
-%  The inital canvas's size depends on the given ImageLayerMethod, and is
+%  The inital canvas's size depends on the given LayerMethod, and is
 %  initialized using the first images background color.  The images
 %  are then compositied onto that image in sequence using the given
 %  composition that has been assigned to each individual image.
@@ -1860,7 +1860,7 @@ MagickExport void CompositeLayers(Image *destination,
 %  The format of the MergeImageLayers is:
 %
 %      Image *MergeImageLayers(const Image *image,
-%        const ImageLayerMethod method, ExceptionInfo *exception)
+%        const LayerMethod method, ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
 %
@@ -1891,7 +1891,7 @@ MagickExport void CompositeLayers(Image *destination,
 %    o exception: return any errors or warnings in this structure.
 %
 */
-MagickExport Image *MergeImageLayers(Image *image,const ImageLayerMethod method,
+MagickExport Image *MergeImageLayers(Image *image,const LayerMethod method,
   ExceptionInfo *exception)
 {
 #define MergeLayersTag  "Merge/Layers"

diff --git a/MagickCore/layer.h b/MagickCore/layer.h
index 29413c88c397f628b36a82aa39a17299d9a8c850..d19c74facf02d2ed3a5e540e9a7bb7a8ca31ab71 100644 (file)
--- a/MagickCore/layer.h
+++ b/MagickCore/layer.h
@@ -52,13 +52,13 @@ typedef enum
   FlattenLayer,
   MosaicLayer,
   TrimBoundsLayer
-} ImageLayerMethod;
+} LayerMethod;
 
 extern MagickExport Image
   *CoalesceImages(const Image *,ExceptionInfo *),
   *DisposeImages(const Image *,ExceptionInfo *),
-  *CompareImagesLayers(const Image *,const ImageLayerMethod,ExceptionInfo *),
-  *MergeImageLayers(Image *,const ImageLayerMethod,ExceptionInfo *),
+  *CompareImagesLayers(const Image *,const LayerMethod,ExceptionInfo *),
+  *MergeImageLayers(Image *,const LayerMethod,ExceptionInfo *),
   *OptimizeImageLayers(const Image *,ExceptionInfo *),
   *OptimizePlusImageLayers(const Image *,ExceptionInfo *);
 

diff --git a/MagickWand/magick-image.c b/MagickWand/magick-image.c
index 6f644a7ea61a1eea10555b55ea5e3b035f4f69ac..5b939b56c4152772b23c81ff2ccd38cf145a5b1b 100644 (file)
--- a/MagickWand/magick-image.c
+++ b/MagickWand/magick-image.c
@@ -1731,7 +1731,7 @@ WandExport MagickBooleanType MagickCommentImage(MagickWand *wand,
 %  The format of the MagickCompareImagesLayers method is:
 %
 %      MagickWand *MagickCompareImagesLayers(MagickWand *wand,
-%        const ImageLayerMethod method)
+%        const LayerMethod method)
 %
 %  A description of each parameter follows:
 %
@@ -1741,7 +1741,7 @@ WandExport MagickBooleanType MagickCommentImage(MagickWand *wand,
 %
 */
 WandExport MagickWand *MagickCompareImagesLayers(MagickWand *wand,
-  const ImageLayerMethod method)
+  const LayerMethod method)
 {
   Image
     *layers_image;
@@ -6562,7 +6562,7 @@ WandExport MagickBooleanType MagickMagnifyImage(MagickWand *wand)
 %  MagickMergeImageLayers() composes all the image layers from the current
 %  given image onward to produce a single image of the merged layers.
 %
-%  The inital canvas's size depends on the given ImageLayerMethod, and is
+%  The inital canvas's size depends on the given LayerMethod, and is
 %  initialized using the first images background color.  The images
 %  are then compositied onto that image in sequence using the given
 %  composition that has been assigned to each individual image.
@@ -6570,7 +6570,7 @@ WandExport MagickBooleanType MagickMagnifyImage(MagickWand *wand)
 %  The format of the MagickMergeImageLayers method is:
 %
 %      MagickWand *MagickMergeImageLayers(MagickWand *wand,
-%        const ImageLayerMethod method)
+%        const LayerMethod method)
 %
 %  A description of each parameter follows:
 %
@@ -6592,7 +6592,7 @@ WandExport MagickBooleanType MagickMagnifyImage(MagickWand *wand)
 %
 */
 WandExport MagickWand *MagickMergeImageLayers(MagickWand *wand,
-  const ImageLayerMethod method)
+  const LayerMethod method)
 {
   Image
     *mosaic_image;

diff --git a/MagickWand/magick-image.h b/MagickWand/magick-image.h
index fa4d79c7edca2b015858c96715a2e6f6bbce0ec0..ab019002c3bbe44a26d176c382cee35be8a4845a 100644 (file)
--- a/MagickWand/magick-image.h
+++ b/MagickWand/magick-image.h
@@ -326,7 +326,7 @@ 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 *),
@@ -334,7 +334,7 @@ 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 *),

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index 9eb8577c860f56018e9e516f9d598ad79903c2fd..eafd86b8657165df8b0c7bb72cff0ae9e45e5736 100644 (file)
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -7755,12 +7755,12 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info,
             Image
               *layers;
 
-            ImageLayerMethod
+            LayerMethod
               method;
 
             (void) SyncImagesSettings(mogrify_info,*images,exception);
             layers=(Image *) NULL;
-            method=(ImageLayerMethod) ParseCommandOption(MagickLayerOptions,
+            method=(LayerMethod) ParseCommandOption(MagickLayerOptions,
               MagickFalse,argv[i+1]);
             switch (method)
             {

diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index d4ff50068cacd016714751aced97a9956e3a648f..224cf486d4ed9eeb48fd65dd57862fbd5f2d0798 100644 (file)
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -3906,7 +3906,7 @@ WandExport void CLIListOperatorImages(MagickCLI *cli_wand,
           if ( parse < 0 )
             CLIWandExceptArgBreak(OptionError,"UnrecognizedLayerMethod",
                  option,arg1);
-          switch ((ImageLayerMethod) parse)
+          switch ((LayerMethod) parse)
           {
             case CoalesceLayer:
             {
@@ -3918,7 +3918,7 @@ WandExport void CLIListOperatorImages(MagickCLI *cli_wand,
             case CompareOverlayLayer:
             default:
             {
-              new_images=CompareImagesLayers(_images,(ImageLayerMethod) parse,
+              new_images=CompareImagesLayers(_images,(LayerMethod) parse,
                    _exception);
               break;
             }
@@ -3927,7 +3927,7 @@ WandExport void CLIListOperatorImages(MagickCLI *cli_wand,
             case MosaicLayer:
             case TrimBoundsLayer:
             {
-              new_images=MergeImageLayers(_images,(ImageLayerMethod) parse,
+              new_images=MergeImageLayers(_images,(LayerMethod) parse,
                    _exception);
               break;
             }

diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs
index b2a203b2496c5ee6cf30ad2276c51f2feb6f8277..7f293572131924244e58dc1827ae607fd5064fd6 100644 (file)
--- a/PerlMagick/Magick.xs
+++ b/PerlMagick/Magick.xs
@@ -3444,7 +3444,7 @@ CompareLayers(ref)
     Image
       *image;
 
-    ImageLayerMethod
+    LayerMethod
       method;
 
     register ssize_t
@@ -3505,7 +3505,7 @@ CompareLayers(ref)
                     SvPV(ST(i),na));
                   break;
                 }
-               method=(ImageLayerMethod) option;
+               method=(LayerMethod) option;
               break;
             }
           ThrowPerlException(exception,OptionError,"UnrecognizedAttribute",
@@ -6786,7 +6786,7 @@ Layers(ref,...)
       *image,
       *layers;
 
-    ImageLayerMethod
+    LayerMethod
       method;
 
     register ssize_t
@@ -6869,7 +6869,7 @@ Layers(ref,...)
                     SvPV(ST(i),na));
                   break;
                 }
-              method=(ImageLayerMethod) option;
+              method=(LayerMethod) option;
               break;
             }
           ThrowPerlException(exception,OptionError,"UnrecognizedAttribute",

diff --git a/www/api/MagickCore/globals_0x69.html b/www/api/MagickCore/globals_0x69.html
index 579cad6982ab10788577b9990bce68ad0dcd5d0f..07b4e15594ac76b75075a05a0a5bedf1874c9346 100644 (file)
--- a/www/api/MagickCore/globals_0x69.html
+++ b/www/api/MagickCore/globals_0x69.html
@@ -96,7 +96,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="magick-type_8h.html#635d5570f64bd6f0aeb4455f4c1581ae">magick-type.h</a>
 <li>ImageInfoRegistryType
 : <a class="el" href="registry_8h.html#fe9c82c15e20af89ea9c02ea878a6b776afc361716bbf20f8fc8294dd46cf935">registry.h</a>
-<li>ImageLayerMethod
+<li>LayerMethod
 : <a class="el" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c">layer.h</a>
 <li>ImageListToArray()
 : <a class="el" href="list_8c.html#3bba7f8d5e782b8f97a37db854ae1fda">list.c</a>

diff --git a/www/api/MagickCore/globals_enum.html b/www/api/MagickCore/globals_enum.html
index f9562a0718f1b1633319996b8afe53c53e508cd3..97999ebecb95a68a13ce787167c9d21b4f87a3b8 100644 (file)
--- a/www/api/MagickCore/globals_enum.html
+++ b/www/api/MagickCore/globals_enum.html
@@ -108,7 +108,7 @@
 : <a class="el" href="geometry_8h.html#fd1e527b17eba5305ea949fa7c717069">geometry.h</a>
 </ul>
 <h3><a class="anchor" name="index_i">- i -</a></h3><ul>
-<li>ImageLayerMethod
+<li>LayerMethod
 : <a class="el" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c">layer.h</a>
 <li>ImageType
 : <a class="el" href="image_8h.html#3154c405c975616503bac23f51b78fc0">image.h</a>

diff --git a/www/api/MagickCore/layer_8c.html b/www/api/MagickCore/layer_8c.html
index aea63e70fa154992d4d021d1704e7a108e29d306..fa8d5d978bd86443c2ce67167408d3758df59eb1 100644 (file)
--- a/www/api/MagickCore/layer_8c.html
+++ b/www/api/MagickCore/layer_8c.html
@@ -49,15 +49,15 @@
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">MagickExport <a class="el" href="struct__Image.html">Image</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="layer_8c.html#74f7466674bbb340c0f9574be6f9be8d">DisposeImages</a> (const <a class="el" href="struct__Image.html">Image</a> *image, <a class="el" href="struct__ExceptionInfo.html">ExceptionInfo</a> *exception)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">static <a class="el" href="magick-type_8h.html#c740cbce6e8928a679ae3767b49428dd">MagickBooleanType</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="layer_8c.html#a836ef452c121f3f136d5280b9c4b654">ComparePixels</a> (const <a class="el" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c">ImageLayerMethod</a> method, const <a class="el" href="struct__MagickPixelPacket.html">MagickPixelPacket</a> *p, const <a class="el" href="struct__MagickPixelPacket.html">MagickPixelPacket</a> *q)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">static <a class="el" href="magick-type_8h.html#c740cbce6e8928a679ae3767b49428dd">MagickBooleanType</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="layer_8c.html#a836ef452c121f3f136d5280b9c4b654">ComparePixels</a> (const <a class="el" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c">LayerMethod</a> method, const <a class="el" href="struct__MagickPixelPacket.html">MagickPixelPacket</a> *p, const <a class="el" href="struct__MagickPixelPacket.html">MagickPixelPacket</a> *q)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">static <a class="el" href="struct__RectangleInfo.html">RectangleInfo</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="layer_8c.html#1515f44cecb9e26d50ba75c0ee1f7cfb">CompareImageBounds</a> (const <a class="el" href="struct__Image.html">Image</a> *image1, const <a class="el" href="struct__Image.html">Image</a> *image2, const <a class="el" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c">ImageLayerMethod</a> method, <a class="el" href="struct__ExceptionInfo.html">ExceptionInfo</a> *exception)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">static <a class="el" href="struct__RectangleInfo.html">RectangleInfo</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="layer_8c.html#1515f44cecb9e26d50ba75c0ee1f7cfb">CompareImageBounds</a> (const <a class="el" href="struct__Image.html">Image</a> *image1, const <a class="el" href="struct__Image.html">Image</a> *image2, const <a class="el" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c">LayerMethod</a> method, <a class="el" href="struct__ExceptionInfo.html">ExceptionInfo</a> *exception)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">MagickExport <a class="el" href="struct__Image.html">Image</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="layer_8c.html#ed239bf00a874a3aa69067b3ee6642ce">CompareImageLayers</a> (const <a class="el" href="struct__Image.html">Image</a> *image, const <a class="el" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c">ImageLayerMethod</a> method, <a class="el" href="struct__ExceptionInfo.html">ExceptionInfo</a> *exception)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">MagickExport <a class="el" href="struct__Image.html">Image</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="layer_8c.html#ed239bf00a874a3aa69067b3ee6642ce">CompareImageLayers</a> (const <a class="el" href="struct__Image.html">Image</a> *image, const <a class="el" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c">LayerMethod</a> method, <a class="el" href="struct__ExceptionInfo.html">ExceptionInfo</a> *exception)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">MagickExport <a class="el" href="struct__Image.html">Image</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="layer_8c.html#92475ff255e437326149c0d3511b958e">DeconstructImages</a> (const <a class="el" href="struct__Image.html">Image</a> *images, <a class="el" href="struct__ExceptionInfo.html">ExceptionInfo</a> *exception)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">static <a class="el" href="struct__Image.html">Image</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="layer_8c.html#fd1d49e98cd3e49d7e55bb51f67806f6">OptimizeLayerFrames</a> (const <a class="el" href="struct__Image.html">Image</a> *image, const <a class="el" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c">ImageLayerMethod</a> method, <a class="el" href="struct__ExceptionInfo.html">ExceptionInfo</a> *exception)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">static <a class="el" href="struct__Image.html">Image</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="layer_8c.html#fd1d49e98cd3e49d7e55bb51f67806f6">OptimizeLayerFrames</a> (const <a class="el" href="struct__Image.html">Image</a> *image, const <a class="el" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c">LayerMethod</a> method, <a class="el" href="struct__ExceptionInfo.html">ExceptionInfo</a> *exception)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">MagickExport <a class="el" href="struct__Image.html">Image</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="layer_8c.html#27a025b9176a87cf78f039d0daf7d339">OptimizeImageLayers</a> (const <a class="el" href="struct__Image.html">Image</a> *image, <a class="el" href="struct__ExceptionInfo.html">ExceptionInfo</a> *exception)</td></tr>
 
@@ -73,7 +73,7 @@
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">MagickExport void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="layer_8c.html#446039a203126b5c0b0a356ffcb48eee">CompositeLayers</a> (<a class="el" href="struct__Image.html">Image</a> *destination, const <a class="el" href="composite_8h.html#55ded0ef54def8597243db2375b987fb">CompositeOperator</a> compose, <a class="el" href="struct__Image.html">Image</a> *source, const long x_offset, const long y_offset, <a class="el" href="struct__ExceptionInfo.html">ExceptionInfo</a> *exception)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">MagickExport <a class="el" href="struct__Image.html">Image</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="layer_8c.html#0eefac6979459b3f53f0ff3c9f6070a3">MergeImageLayers</a> (const <a class="el" href="struct__Image.html">Image</a> *image, const <a class="el" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c">ImageLayerMethod</a> method, <a class="el" href="struct__ExceptionInfo.html">ExceptionInfo</a> *exception)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">MagickExport <a class="el" href="struct__Image.html">Image</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="layer_8c.html#0eefac6979459b3f53f0ff3c9f6070a3">MergeImageLayers</a> (const <a class="el" href="struct__Image.html">Image</a> *image, const <a class="el" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c">LayerMethod</a> method, <a class="el" href="struct__ExceptionInfo.html">ExceptionInfo</a> *exception)</td></tr>
 
 </table>
 <hr><h2>Define Documentation</h2>
@@ -181,7 +181,7 @@
 
 </div>
 </div><p>
-<a class="anchor" name="1515f44cecb9e26d50ba75c0ee1f7cfb"></a><!-- doxytag: member="layer.c::CompareImageBounds" ref="1515f44cecb9e26d50ba75c0ee1f7cfb" args="(const Image *image1, const Image *image2, const ImageLayerMethod method, ExceptionInfo *exception)" -->
+<a class="anchor" name="1515f44cecb9e26d50ba75c0ee1f7cfb"></a><!-- doxytag: member="layer.c::CompareImageBounds" ref="1515f44cecb9e26d50ba75c0ee1f7cfb" args="(const Image *image1, const Image *image2, const LayerMethod method, ExceptionInfo *exception)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -200,7 +200,7 @@
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">const <a class="el" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c">ImageLayerMethod</a>&nbsp;</td>
+          <td class="paramtype">const <a class="el" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c">LayerMethod</a>&nbsp;</td>
           <td class="paramname"> <em>method</em>, </td>
         </tr>
         <tr>
@@ -222,7 +222,7 @@
 
 </div>
 </div><p>
-<a class="anchor" name="ed239bf00a874a3aa69067b3ee6642ce"></a><!-- doxytag: member="layer.c::CompareImageLayers" ref="ed239bf00a874a3aa69067b3ee6642ce" args="(const Image *image, const ImageLayerMethod method, ExceptionInfo *exception)" -->
+<a class="anchor" name="ed239bf00a874a3aa69067b3ee6642ce"></a><!-- doxytag: member="layer.c::CompareImageLayers" ref="ed239bf00a874a3aa69067b3ee6642ce" args="(const Image *image, const LayerMethod method, ExceptionInfo *exception)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -235,7 +235,7 @@
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">const <a class="el" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c">ImageLayerMethod</a>&nbsp;</td>
+          <td class="paramtype">const <a class="el" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c">LayerMethod</a>&nbsp;</td>
           <td class="paramname"> <em>method</em>, </td>
         </tr>
         <tr>
@@ -257,14 +257,14 @@
 
 </div>
 </div><p>
-<a class="anchor" name="a836ef452c121f3f136d5280b9c4b654"></a><!-- doxytag: member="layer.c::ComparePixels" ref="a836ef452c121f3f136d5280b9c4b654" args="(const ImageLayerMethod method, const MagickPixelPacket *p, const MagickPixelPacket *q)" -->
+<a class="anchor" name="a836ef452c121f3f136d5280b9c4b654"></a><!-- doxytag: member="layer.c::ComparePixels" ref="a836ef452c121f3f136d5280b9c4b654" args="(const LayerMethod method, const MagickPixelPacket *p, const MagickPixelPacket *q)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">static <a class="el" href="magick-type_8h.html#c740cbce6e8928a679ae3767b49428dd">MagickBooleanType</a> ComparePixels           </td>
           <td>(</td>
-          <td class="paramtype">const <a class="el" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c">ImageLayerMethod</a>&nbsp;</td>
+          <td class="paramtype">const <a class="el" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c">LayerMethod</a>&nbsp;</td>
           <td class="paramname"> <em>method</em>, </td>
         </tr>
         <tr>
@@ -491,7 +491,7 @@
 
 </div>
 </div><p>
-<a class="anchor" name="0eefac6979459b3f53f0ff3c9f6070a3"></a><!-- doxytag: member="layer.c::MergeImageLayers" ref="0eefac6979459b3f53f0ff3c9f6070a3" args="(const Image *image, const ImageLayerMethod method, ExceptionInfo *exception)" -->
+<a class="anchor" name="0eefac6979459b3f53f0ff3c9f6070a3"></a><!-- doxytag: member="layer.c::MergeImageLayers" ref="0eefac6979459b3f53f0ff3c9f6070a3" args="(const Image *image, const LayerMethod method, ExceptionInfo *exception)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -504,7 +504,7 @@
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">const <a class="el" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c">ImageLayerMethod</a>&nbsp;</td>
+          <td class="paramtype">const <a class="el" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c">LayerMethod</a>&nbsp;</td>
           <td class="paramname"> <em>method</em>, </td>
         </tr>
         <tr>
@@ -584,7 +584,7 @@
 
 </div>
 </div><p>
-<a class="anchor" name="fd1d49e98cd3e49d7e55bb51f67806f6"></a><!-- doxytag: member="layer.c::OptimizeLayerFrames" ref="fd1d49e98cd3e49d7e55bb51f67806f6" args="(const Image *image, const ImageLayerMethod method, ExceptionInfo *exception)" -->
+<a class="anchor" name="fd1d49e98cd3e49d7e55bb51f67806f6"></a><!-- doxytag: member="layer.c::OptimizeLayerFrames" ref="fd1d49e98cd3e49d7e55bb51f67806f6" args="(const Image *image, const LayerMethod method, ExceptionInfo *exception)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -597,7 +597,7 @@
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">const <a class="el" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c">ImageLayerMethod</a>&nbsp;</td>
+          <td class="paramtype">const <a class="el" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c">LayerMethod</a>&nbsp;</td>
           <td class="paramname"> <em>method</em>, </td>
         </tr>
         <tr>

diff --git a/www/api/MagickCore/layer_8h-source.html b/www/api/MagickCore/layer_8h-source.html
index e092398fd9910d416e4756f5c22d6fab9fba489b..16c84cdf115094356b8e8c2673e9ca9bf1fb8f1d 100644 (file)
--- a/www/api/MagickCore/layer_8h-source.html
+++ b/www/api/MagickCore/layer_8h-source.html
@@ -58,14 +58,14 @@
 <a name="l00049"></a><a class="code" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c3cf8cc1eab9015f12020f9bbde17c5f8">00049</a>   <a class="code" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c3cf8cc1eab9015f12020f9bbde17c5f8">MergeLayer</a>,
 <a name="l00050"></a><a class="code" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c1a286f9300add9ae4cdd1900ddc59d4c">00050</a>   <a class="code" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c1a286f9300add9ae4cdd1900ddc59d4c">FlattenLayer</a>,
 <a name="l00051"></a><a class="code" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2ceeb39b9af9878326eb0bc2ebcff3b871">00051</a>   <a class="code" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2ceeb39b9af9878326eb0bc2ebcff3b871">MosaicLayer</a>
-<a name="l00052"></a>00052 } <a class="code" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c">ImageLayerMethod</a>;
+<a name="l00052"></a>00052 } <a class="code" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c">LayerMethod</a>;
 <a name="l00053"></a>00053 
 <a name="l00054"></a>00054 <span class="keyword">extern</span> <a class="code" href="MagickCore_8h.html#487cee8f0dff0607e77f6b51d6403651">MagickExport</a> <a class="code" href="struct__Image.html">Image</a>
 <a name="l00055"></a>00055   *<a class="code" href="layer_8c.html#673dcc6c30b18003a326a455cd350030">CoalesceImages</a>(<span class="keyword">const</span> <a class="code" href="struct__Image.html">Image</a> *,<a class="code" href="struct__ExceptionInfo.html">ExceptionInfo</a> *),
 <a name="l00056"></a>00056   *<a class="code" href="layer_8c.html#74f7466674bbb340c0f9574be6f9be8d">DisposeImages</a>(<span class="keyword">const</span> <a class="code" href="struct__Image.html">Image</a> *,<a class="code" href="struct__ExceptionInfo.html">ExceptionInfo</a> *),
-<a name="l00057"></a>00057   *<a class="code" href="layer_8c.html#ed239bf00a874a3aa69067b3ee6642ce">CompareImageLayers</a>(<span class="keyword">const</span> <a class="code" href="struct__Image.html">Image</a> *,<span class="keyword">const</span> <a class="code" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c">ImageLayerMethod</a>,<a class="code" href="struct__ExceptionInfo.html">ExceptionInfo</a> *),
+<a name="l00057"></a>00057   *<a class="code" href="layer_8c.html#ed239bf00a874a3aa69067b3ee6642ce">CompareImageLayers</a>(<span class="keyword">const</span> <a class="code" href="struct__Image.html">Image</a> *,<span class="keyword">const</span> <a class="code" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c">LayerMethod</a>,<a class="code" href="struct__ExceptionInfo.html">ExceptionInfo</a> *),
 <a name="l00058"></a>00058   *<a class="code" href="layer_8c.html#92475ff255e437326149c0d3511b958e">DeconstructImages</a>(<span class="keyword">const</span> <a class="code" href="struct__Image.html">Image</a> *,<a class="code" href="struct__ExceptionInfo.html">ExceptionInfo</a> *),
-<a name="l00059"></a>00059   *<a class="code" href="layer_8c.html#0eefac6979459b3f53f0ff3c9f6070a3">MergeImageLayers</a>(<span class="keyword">const</span> <a class="code" href="struct__Image.html">Image</a> *,<span class="keyword">const</span> <a class="code" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c">ImageLayerMethod</a>,<a class="code" href="struct__ExceptionInfo.html">ExceptionInfo</a> *),
+<a name="l00059"></a>00059   *<a class="code" href="layer_8c.html#0eefac6979459b3f53f0ff3c9f6070a3">MergeImageLayers</a>(<span class="keyword">const</span> <a class="code" href="struct__Image.html">Image</a> *,<span class="keyword">const</span> <a class="code" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c">LayerMethod</a>,<a class="code" href="struct__ExceptionInfo.html">ExceptionInfo</a> *),
 <a name="l00060"></a>00060   *<a class="code" href="layer_8c.html#27a025b9176a87cf78f039d0daf7d339">OptimizeImageLayers</a>(<span class="keyword">const</span> <a class="code" href="struct__Image.html">Image</a> *,<a class="code" href="struct__ExceptionInfo.html">ExceptionInfo</a> *),
 <a name="l00061"></a>00061   *<a class="code" href="layer_8c.html#ba8abe715254179ac4f75a68a18e7775">OptimizePlusImageLayers</a>(<span class="keyword">const</span> <a class="code" href="struct__Image.html">Image</a> *,<a class="code" href="struct__ExceptionInfo.html">ExceptionInfo</a> *);
 <a name="l00062"></a>00062 

diff --git a/www/api/MagickCore/layer_8h.html b/www/api/MagickCore/layer_8h.html
index fb9b2ab9be7b21cf257e7409780772ddbd0e78a7..9168eb4f6b3671cd5974e2a76545b2af89d76814 100644 (file)
--- a/www/api/MagickCore/layer_8h.html
+++ b/www/api/MagickCore/layer_8h.html
@@ -24,7 +24,7 @@
 <br>
  }</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c">ImageLayerMethod</a> { <br>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c">LayerMethod</a> { <br>
 &nbsp;&nbsp;<a class="el" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c1edaa3a939da9639d737e109adc811b9">UndefinedLayer</a>, 
 <a class="el" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2caf349339023e451dc0f39108c3c9793f">CoalesceLayer</a>, 
 <a class="el" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c9d168491906cf28bb3e0b59adbb5d97b">CompareAnyLayer</a>, 
@@ -52,11 +52,11 @@
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">MagickExport <a class="el" href="struct__Image.html">Image</a> **&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="layer_8h.html#94bd65f4f9caf1e754406d693389918c">DisposeImages</a> (const <a class="el" href="struct__Image.html">Image</a> *, <a class="el" href="struct__ExceptionInfo.html">ExceptionInfo</a> *)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">MagickExport <a class="el" href="struct__Image.html">Image</a> ***&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="layer_8h.html#7d4f1c0c11805a29874bc3d6b6cb0814">CompareImageLayers</a> (const <a class="el" href="struct__Image.html">Image</a> *, const <a class="el" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c">ImageLayerMethod</a>, <a class="el" href="struct__ExceptionInfo.html">ExceptionInfo</a> *)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">MagickExport <a class="el" href="struct__Image.html">Image</a> ***&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="layer_8h.html#7d4f1c0c11805a29874bc3d6b6cb0814">CompareImageLayers</a> (const <a class="el" href="struct__Image.html">Image</a> *, const <a class="el" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c">LayerMethod</a>, <a class="el" href="struct__ExceptionInfo.html">ExceptionInfo</a> *)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">MagickExport <a class="el" href="struct__Image.html">Image</a> ****&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="layer_8h.html#c2a15d81316b28a4d047059d70b3ca89">DeconstructImages</a> (const <a class="el" href="struct__Image.html">Image</a> *, <a class="el" href="struct__ExceptionInfo.html">ExceptionInfo</a> *)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">MagickExport <a class="el" href="struct__Image.html">Image</a> *****&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="layer_8h.html#3a628792cd5e1014c4d3ac8c08237aef">MergeImageLayers</a> (const <a class="el" href="struct__Image.html">Image</a> *, const <a class="el" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c">ImageLayerMethod</a>, <a class="el" href="struct__ExceptionInfo.html">ExceptionInfo</a> *)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">MagickExport <a class="el" href="struct__Image.html">Image</a> *****&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="layer_8h.html#3a628792cd5e1014c4d3ac8c08237aef">MergeImageLayers</a> (const <a class="el" href="struct__Image.html">Image</a> *, const <a class="el" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c">LayerMethod</a>, <a class="el" href="struct__ExceptionInfo.html">ExceptionInfo</a> *)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">MagickExport <a class="el" href="struct__Image.html">Image</a> ******&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="layer_8h.html#59f5ade32c6a982a7de10af53f9e38bf">OptimizeImageLayers</a> (const <a class="el" href="struct__Image.html">Image</a> *, <a class="el" href="struct__ExceptionInfo.html">ExceptionInfo</a> *)</td></tr>
 
@@ -101,12 +101,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="e7490d9d158e1059dd4651b71755ac2c"></a><!-- doxytag: member="layer.h::ImageLayerMethod" ref="e7490d9d158e1059dd4651b71755ac2c" args="" -->
+<a class="anchor" name="e7490d9d158e1059dd4651b71755ac2c"></a><!-- doxytag: member="layer.h::LayerMethod" ref="e7490d9d158e1059dd4651b71755ac2c" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">enum <a class="el" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c">ImageLayerMethod</a>          </td>
+          <td class="memname">enum <a class="el" href="layer_8h.html#e7490d9d158e1059dd4651b71755ac2c">LayerMethod</a>          </td>
         </tr>
       </table>
 </div>
@@ -182,7 +182,7 @@
 
 </div>
 </div><p>
-<a class="anchor" name="7d4f1c0c11805a29874bc3d6b6cb0814"></a><!-- doxytag: member="layer.h::CompareImageLayers" ref="7d4f1c0c11805a29874bc3d6b6cb0814" args="(const Image *, const ImageLayerMethod, ExceptionInfo *)" -->
+<a class="anchor" name="7d4f1c0c11805a29874bc3d6b6cb0814"></a><!-- doxytag: member="layer.h::CompareImageLayers" ref="7d4f1c0c11805a29874bc3d6b6cb0814" args="(const Image *, const LayerMethod, ExceptionInfo *)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -196,7 +196,7 @@
           <td class="paramkey"></td>
           <td></td>
           <td class="paramtype">const &nbsp;</td>
-          <td class="paramname"> <em>ImageLayerMethod</em>, </td>
+          <td class="paramname"> <em>LayerMethod</em>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
@@ -328,7 +328,7 @@
 
 </div>
 </div><p>
-<a class="anchor" name="3a628792cd5e1014c4d3ac8c08237aef"></a><!-- doxytag: member="layer.h::MergeImageLayers" ref="3a628792cd5e1014c4d3ac8c08237aef" args="(const Image *, const ImageLayerMethod, ExceptionInfo *)" -->
+<a class="anchor" name="3a628792cd5e1014c4d3ac8c08237aef"></a><!-- doxytag: member="layer.h::MergeImageLayers" ref="3a628792cd5e1014c4d3ac8c08237aef" args="(const Image *, const LayerMethod, ExceptionInfo *)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -342,7 +342,7 @@
           <td class="paramkey"></td>
           <td></td>
           <td class="paramtype">const &nbsp;</td>
-          <td class="paramname"> <em>ImageLayerMethod</em>, </td>
+          <td class="paramname"> <em>LayerMethod</em>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>

diff --git a/www/api/MagickWand/magick-image_8c.html b/www/api/MagickWand/magick-image_8c.html
index 08c032a78906f3682da62a3e769aeefbb0e83b87..13f2128d16ccbe5837eb7847c20e0a0e9ee1f85c 100644 (file)
--- a/www/api/MagickWand/magick-image_8c.html
+++ b/www/api/MagickWand/magick-image_8c.html
@@ -85,7 +85,7 @@
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">WandExport <a class="el" href="struct__MagickWand.html">MagickWand</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="magick-image_8c.html#e8a28294fa83774622eb9d4295c1112a">MagickCompareImageChannels</a> (<a class="el" href="struct__MagickWand.html">MagickWand</a> *wand, const <a class="el" href="struct__MagickWand.html">MagickWand</a> *reference, const ChannelType channel, const MetricType metric, double *distortion)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">WandExport <a class="el" href="struct__MagickWand.html">MagickWand</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="magick-image_8c.html#ae00d88164e421a61c492b548c474aa3">MagickCompareImageLayers</a> (<a class="el" href="struct__MagickWand.html">MagickWand</a> *wand, const ImageLayerMethod method)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">WandExport <a class="el" href="struct__MagickWand.html">MagickWand</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="magick-image_8c.html#ae00d88164e421a61c492b548c474aa3">MagickCompareImageLayers</a> (<a class="el" href="struct__MagickWand.html">MagickWand</a> *wand, const LayerMethod method)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">WandExport <a class="el" href="struct__MagickWand.html">MagickWand</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="magick-image_8c.html#da04f13b46a524446a46741483dad269">MagickCompareImages</a> (<a class="el" href="struct__MagickWand.html">MagickWand</a> *wand, const <a class="el" href="struct__MagickWand.html">MagickWand</a> *reference, const MetricType metric, double *distortion)</td></tr>
 
@@ -289,7 +289,7 @@
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">WandExport MagickBooleanType&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="magick-image_8c.html#c6ffba134a272d6dcc3ba96b6c04a4bf">MagickMedianFilterImage</a> (<a class="el" href="struct__MagickWand.html">MagickWand</a> *wand, const double radius)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">WandExport <a class="el" href="struct__MagickWand.html">MagickWand</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="magick-image_8c.html#3c6a8f73359a822b07234dac32f29ee8">MagickMergeImageLayers</a> (<a class="el" href="struct__MagickWand.html">MagickWand</a> *wand, const ImageLayerMethod method)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">WandExport <a class="el" href="struct__MagickWand.html">MagickWand</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="magick-image_8c.html#3c6a8f73359a822b07234dac32f29ee8">MagickMergeImageLayers</a> (<a class="el" href="struct__MagickWand.html">MagickWand</a> *wand, const LayerMethod method)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">WandExport MagickBooleanType&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="magick-image_8c.html#657605bdec5e26f53925f520053acf9f">MagickMinifyImage</a> (<a class="el" href="struct__MagickWand.html">MagickWand</a> *wand)</td></tr>
 
@@ -1650,7 +1650,7 @@
 
 </div>
 </div><p>
-<a class="anchor" name="ae00d88164e421a61c492b548c474aa3"></a><!-- doxytag: member="magick-image.c::MagickCompareImageLayers" ref="ae00d88164e421a61c492b548c474aa3" args="(MagickWand *wand, const ImageLayerMethod method)" -->
+<a class="anchor" name="ae00d88164e421a61c492b548c474aa3"></a><!-- doxytag: member="magick-image.c::MagickCompareImageLayers" ref="ae00d88164e421a61c492b548c474aa3" args="(MagickWand *wand, const LayerMethod method)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1663,7 +1663,7 @@
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">const ImageLayerMethod&nbsp;</td>
+          <td class="paramtype">const LayerMethod&nbsp;</td>
           <td class="paramname"> <em>method</em></td><td>&nbsp;</td>
         </tr>
         <tr>
@@ -4761,7 +4761,7 @@
 
 </div>
 </div><p>
-<a class="anchor" name="3c6a8f73359a822b07234dac32f29ee8"></a><!-- doxytag: member="magick-image.c::MagickMergeImageLayers" ref="3c6a8f73359a822b07234dac32f29ee8" args="(MagickWand *wand, const ImageLayerMethod method)" -->
+<a class="anchor" name="3c6a8f73359a822b07234dac32f29ee8"></a><!-- doxytag: member="magick-image.c::MagickMergeImageLayers" ref="3c6a8f73359a822b07234dac32f29ee8" args="(MagickWand *wand, const LayerMethod method)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -4774,7 +4774,7 @@
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">const ImageLayerMethod&nbsp;</td>
+          <td class="paramtype">const LayerMethod&nbsp;</td>
           <td class="paramname"> <em>method</em></td><td>&nbsp;</td>
         </tr>
         <tr>

diff --git a/www/api/MagickWand/magick-image_8h-source.html b/www/api/MagickWand/magick-image_8h-source.html
index e15303b8badffe29782ff46f6c9b67fbe5eb7835..b3db319e1129159a22ff8277cdc71313aed7d202 100644 (file)
--- a/www/api/MagickWand/magick-image_8h-source.html
+++ b/www/api/MagickWand/magick-image_8h-source.html
@@ -335,7 +335,7 @@
 <a name="l00326"></a>00326     <span class="keyword">const</span> MetricType,<span class="keywordtype">double</span> *),
 <a name="l00327"></a>00327   *<a class="code" href="magick-image_8c.html#da04f13b46a524446a46741483dad269">MagickCompareImages</a>(<a class="code" href="struct__MagickWand.html">MagickWand</a> *,<span class="keyword">const</span> <a class="code" href="struct__MagickWand.html">MagickWand</a> *,<span class="keyword">const</span> MetricType,
 <a name="l00328"></a>00328     <span class="keywordtype">double</span> *),
-<a name="l00329"></a>00329   *<a class="code" href="magick-image_8c.html#ae00d88164e421a61c492b548c474aa3">MagickCompareImageLayers</a>(<a class="code" href="struct__MagickWand.html">MagickWand</a> *,<span class="keyword">const</span> ImageLayerMethod),
+<a name="l00329"></a>00329   *<a class="code" href="magick-image_8c.html#ae00d88164e421a61c492b548c474aa3">MagickCompareImageLayers</a>(<a class="code" href="struct__MagickWand.html">MagickWand</a> *,<span class="keyword">const</span> LayerMethod),
 <a name="l00330"></a>00330   *<a class="code" href="magick-image_8c.html#72c67101da57d65f5c03f6ee5ba1454e">MagickDeconstructImages</a>(<a class="code" href="struct__MagickWand.html">MagickWand</a> *),
 <a name="l00331"></a>00331   *<a class="code" href="magick-image_8c.html#0e768808a8b1263fa54c52663803c828">MagickFxImage</a>(<a class="code" href="struct__MagickWand.html">MagickWand</a> *,<span class="keyword">const</span> <span class="keywordtype">char</span> *),
 <a name="l00332"></a>00332   *<a class="code" href="magick-image_8c.html#19c72041ecde93fe1890fa0a0c0e6505">MagickFxImageChannel</a>(<a class="code" href="struct__MagickWand.html">MagickWand</a> *,<span class="keyword">const</span> ChannelType,<span class="keyword">const</span> <span class="keywordtype">char</span> *),
@@ -343,7 +343,7 @@
 <a name="l00334"></a>00334   *<a class="code" href="magick-image_8c.html#01e05f4aea87d3500c820d2c0c4fbecb">MagickGetImageClipMask</a>(<a class="code" href="struct__MagickWand.html">MagickWand</a> *),
 <a name="l00335"></a>00335   *<a class="code" href="magick-image_8c.html#14bd2fc5ff89f60d12199ab95f28b1fa">MagickGetImageRegion</a>(<a class="code" href="struct__MagickWand.html">MagickWand</a> *,<span class="keyword">const</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span>,<span class="keyword">const</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span>,
 <a name="l00336"></a>00336     <span class="keyword">const</span> <span class="keywordtype">long</span>,<span class="keyword">const</span> <span class="keywordtype">long</span>),
-<a name="l00337"></a>00337   *<a class="code" href="magick-image_8c.html#3c6a8f73359a822b07234dac32f29ee8">MagickMergeImageLayers</a>(<a class="code" href="struct__MagickWand.html">MagickWand</a> *,<span class="keyword">const</span> ImageLayerMethod),
+<a name="l00337"></a>00337   *<a class="code" href="magick-image_8c.html#3c6a8f73359a822b07234dac32f29ee8">MagickMergeImageLayers</a>(<a class="code" href="struct__MagickWand.html">MagickWand</a> *,<span class="keyword">const</span> LayerMethod),
 <a name="l00338"></a>00338   *<a class="code" href="magick-image_8c.html#35f0bd33eb6b50bad9fd2b0b8e4584f3">MagickMorphImages</a>(<a class="code" href="struct__MagickWand.html">MagickWand</a> *,<span class="keyword">const</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span>),
 <a name="l00339"></a>00339   *<a class="code" href="magick-image_8c.html#e4535c061ff57e9cfbb4581af15a1f4c">MagickMontageImage</a>(<a class="code" href="struct__MagickWand.html">MagickWand</a> *,<span class="keyword">const</span> <a class="code" href="struct__DrawingWand.html">DrawingWand</a> *,<span class="keyword">const</span> <span class="keywordtype">char</span> *,
 <a name="l00340"></a>00340     <span class="keyword">const</span> <span class="keywordtype">char</span> *,<span class="keyword">const</span> MontageMode,<span class="keyword">const</span> <span class="keywordtype">char</span> *),

diff --git a/www/api/MagickWand/magick-image_8h.html b/www/api/MagickWand/magick-image_8h.html
index 4ef2c44c54c3a886ce65b794ad354da7a3eb218f..c6162c059d32ecd22356b95f05ba695c8d52942f 100644 (file)
--- a/www/api/MagickWand/magick-image_8h.html
+++ b/www/api/MagickWand/magick-image_8h.html
@@ -454,7 +454,7 @@
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">WandExport <a class="el" href="struct__MagickWand.html">MagickWand</a> ******&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="magick-image_8h.html#398dade61970872fbe216698f72f7336">MagickCompareImages</a> (<a class="el" href="struct__MagickWand.html">MagickWand</a> *, const <a class="el" href="struct__MagickWand.html">MagickWand</a> *, const MetricType, double *)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">WandExport <a class="el" href="struct__MagickWand.html">MagickWand</a> *******&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="magick-image_8h.html#99f854462d974cab58a30bc61b74fd11">MagickCompareImageLayers</a> (<a class="el" href="struct__MagickWand.html">MagickWand</a> *, const ImageLayerMethod)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">WandExport <a class="el" href="struct__MagickWand.html">MagickWand</a> *******&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="magick-image_8h.html#99f854462d974cab58a30bc61b74fd11">MagickCompareImageLayers</a> (<a class="el" href="struct__MagickWand.html">MagickWand</a> *, const LayerMethod)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">WandExport <a class="el" href="struct__MagickWand.html">MagickWand</a> ********&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="magick-image_8h.html#3586d08254d0a7f44ff0c883798b26b0">MagickDeconstructImages</a> (<a class="el" href="struct__MagickWand.html">MagickWand</a> *)</td></tr>
 
@@ -468,7 +468,7 @@
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">WandExport <a class="el" href="struct__MagickWand.html">MagickWand</a> *************&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="magick-image_8h.html#fb9254d38444ba407dc25d0926ea7180">MagickGetImageRegion</a> (<a class="el" href="struct__MagickWand.html">MagickWand</a> *, const unsigned long, const unsigned long, const long, const long)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">WandExport <a class="el" href="struct__MagickWand.html">MagickWand</a> **************&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="magick-image_8h.html#58813a74264ad572b953c8461620af1c">MagickMergeImageLayers</a> (<a class="el" href="struct__MagickWand.html">MagickWand</a> *, const ImageLayerMethod)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">WandExport <a class="el" href="struct__MagickWand.html">MagickWand</a> **************&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="magick-image_8h.html#58813a74264ad572b953c8461620af1c">MagickMergeImageLayers</a> (<a class="el" href="struct__MagickWand.html">MagickWand</a> *, const LayerMethod)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">WandExport <a class="el" href="struct__MagickWand.html">MagickWand</a> ***************&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="magick-image_8h.html#1d314568f07a788878205dc2a48178a0">MagickMorphImages</a> (<a class="el" href="struct__MagickWand.html">MagickWand</a> *, const unsigned long)</td></tr>
 
@@ -1534,7 +1534,7 @@
 
 </div>
 </div><p>
-<a class="anchor" name="99f854462d974cab58a30bc61b74fd11"></a><!-- doxytag: member="magick-image.h::MagickCompareImageLayers" ref="99f854462d974cab58a30bc61b74fd11" args="(MagickWand *, const ImageLayerMethod)" -->
+<a class="anchor" name="99f854462d974cab58a30bc61b74fd11"></a><!-- doxytag: member="magick-image.h::MagickCompareImageLayers" ref="99f854462d974cab58a30bc61b74fd11" args="(MagickWand *, const LayerMethod)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1548,7 +1548,7 @@
           <td class="paramkey"></td>
           <td></td>
           <td class="paramtype">const &nbsp;</td>
-          <td class="paramname"> <em>ImageLayerMethod</em></td><td>&nbsp;</td>
+          <td class="paramname"> <em>LayerMethod</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
@@ -4598,7 +4598,7 @@
 
 </div>
 </div><p>
-<a class="anchor" name="58813a74264ad572b953c8461620af1c"></a><!-- doxytag: member="magick-image.h::MagickMergeImageLayers" ref="58813a74264ad572b953c8461620af1c" args="(MagickWand *, const ImageLayerMethod)" -->
+<a class="anchor" name="58813a74264ad572b953c8461620af1c"></a><!-- doxytag: member="magick-image.h::MagickMergeImageLayers" ref="58813a74264ad572b953c8461620af1c" args="(MagickWand *, const LayerMethod)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -4612,7 +4612,7 @@
           <td class="paramkey"></td>
           <td></td>
           <td class="paramtype">const &nbsp;</td>
-          <td class="paramname"> <em>ImageLayerMethod</em></td><td>&nbsp;</td>
+          <td class="paramname"> <em>LayerMethod</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>

diff --git a/www/api/layer.html b/www/api/layer.html
index 98af74e8da04603f4fc5a2fe36113938f4c052a0..1b1dddd98e843157bebe0913b72e8acdee43e024 100644 (file)
--- a/www/api/layer.html
+++ b/www/api/layer.html
@@ -282,7 +282,7 @@
 <h2><a href="http://www.imagemagick.org/api/MagickCore/layer_8c.html" id="CompareImageLayers">CompareImageLayers</a></h2>
 <div class="doc-section">
 
-<p>CompareImageLayers() compares each image with the next in a sequence and returns the minimum bounding region of all the pixel differences (of the ImageLayerMethod specified) it discovers.</p>
+<p>CompareImageLayers() compares each image with the next in a sequence and returns the minimum bounding region of all the pixel differences (of the LayerMethod specified) it discovers.</p>
 
 <p>Images do NOT have to be the same size, though it is best that all the images are 'coalesced' (images are all the same size, on a flattened canvas, so as to represent exactly how an specific frame should look).</p>
 
@@ -292,7 +292,7 @@
 
 <pre class="code">
   Image *CompareImageLayers(const Image *images,
-    const ImageLayerMethod method,ExceptionInfo *exception)
+    const LayerMethod method,ExceptionInfo *exception)
 </pre>
 
 <p>A description of each parameter follows:</p>
@@ -486,13 +486,13 @@
 
 <p>MergeImageLayers() composes all the image layers from the current given image onward to produce a single image of the merged layers.</p>
 
-<p>The inital canvas's size depends on the given ImageLayerMethod, and is initialized using the first images background color.  The images are then compositied onto that image in sequence using the given composition that has been assigned to each individual image.</p>
+<p>The inital canvas's size depends on the given LayerMethod, and is initialized using the first images background color.  The images are then compositied onto that image in sequence using the given composition that has been assigned to each individual image.</p>
 
 <p>The format of the MergeImageLayers is:</p>
 
 <pre class="text">
   Image *MergeImageLayers(const Image *image,
-    const ImageLayerMethod method, ExceptionInfo *exception)
+    const LayerMethod method, ExceptionInfo *exception)
 </pre>
 
 <p>A description of each parameter follows:</p>

diff --git a/www/api/magick-image.html b/www/api/magick-image.html
index 42cb4b4181d13be5fb4df426ac476670482ffc14..9e90e83448b08502a1c5ee0e8a93cd7b981f002a 100644 (file)
--- a/www/api/magick-image.html
+++ b/www/api/magick-image.html
@@ -1010,7 +1010,7 @@
 
 <pre class="code">
   MagickWand *MagickCompareImageLayers(MagickWand *wand,
-    const ImageLayerMethod method)
+    const LayerMethod method)
 </pre>
 
 <p>A description of each parameter follows:</p>
@@ -3399,13 +3399,13 @@
 
 <p>MagickMergeImageLayers() composes all the image layers from the current given image onward to produce a single image of the merged layers.</p>
 
-<p>The inital canvas's size depends on the given ImageLayerMethod, and is initialized using the first images background color.  The images are then compositied onto that image in sequence using the given composition that has been assigned to each individual image.</p>
+<p>The inital canvas's size depends on the given LayerMethod, and is initialized using the first images background color.  The images are then compositied onto that image in sequence using the given composition that has been assigned to each individual image.</p>
 
 <p>The format of the MagickMergeImageLayers method is:</p>
 
 <pre class="code">
   MagickWand *MagickMergeImageLayers(MagickWand *wand,
-    const ImageLayerMethod method)
+    const LayerMethod method)
 </pre>
 
 <p>A description of each parameter follows:</p>