(no commit message)

[imagemagick] / MagickCore / layer.h

diff --git a/MagickCore/layer.h b/MagickCore/layer.h
index 9da131c3eb5e72366eac154bcfc3f0253ba300a8..19dd7e4c3c50bb09bece99eb77574bfbf6f15c2f 100644 (file)
--- a/MagickCore/layer.h
+++ b/MagickCore/layer.h
@@ -1,5 +1,5 @@
 /*
-  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
+  Copyright 1999-2014 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.
@@ -18,12 +18,12 @@
 #ifndef _MAGICKCORE_LAYER_H
 #define _MAGICKCORE_LAYER_H
 
+#include "MagickCore/composite.h"
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
 
-#include <MagickCore/composite.h>
-
 typedef enum
 {
   UnrecognizedDispose,
@@ -52,13 +52,13 @@ typedef enum
   FlattenLayer,
   MosaicLayer,
   TrimBoundsLayer
-} ImageLayerMethod;
+} LayerMethod;
 
 extern MagickExport Image
   *CoalesceImages(const Image *,ExceptionInfo *),
   *DisposeImages(const Image *,ExceptionInfo *),
-  *CompareImageLayers(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 *);