Update web pages

[imagemagick] / MagickCore / channel.h

diff --git a/MagickCore/channel.h b/MagickCore/channel.h
index 46cb11b885b27c30530f62380548dae25c6c313e..6ed3e25bd5818736abab6640524b240a8c107587 100644 (file)
--- a/MagickCore/channel.h
+++ b/MagickCore/channel.h
@@ -1,5 +1,5 @@
 /*
-  Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization
+  Copyright 1999-2015 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,19 +18,21 @@
 #ifndef _MAGICKCORE_CHANNEL_H
 #define _MAGICKCORE_CHANNEL_H
 
+#include <MagickCore/image.h>
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
 
 extern MagickExport Image
   *ChannelFxImage(const Image *,const char *,ExceptionInfo *),
-  *CombineImages(const Image *,ExceptionInfo *),
+  *CombineImages(const Image *,const ColorspaceType,ExceptionInfo *),
   *SeparateImage(const Image *,const ChannelType,ExceptionInfo *),
   *SeparateImages(const Image *,ExceptionInfo *);
 
 extern MagickExport MagickBooleanType
   GetImageAlphaChannel(const Image *),
-  SetImageAlphaChannel(Image *,const AlphaChannelType,ExceptionInfo *);
+  SetImageAlphaChannel(Image *,const AlphaChannelOption,ExceptionInfo *);
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }