(no commit message)

[imagemagick] / MagickCore / image.h

diff --git a/MagickCore/image.h b/MagickCore/image.h
index 558d2c5850e5f06be3b6417506e9a8fad60432f7..7054390893003cabe3ca4178bfd31a220be07303 100644 (file)
--- a/MagickCore/image.h
+++ b/MagickCore/image.h
@@ -280,17 +280,18 @@ struct _Image
     ping;
 
   size_t
-    pixel_channels,
+    number_channels,
+    number_meta_channels,
     metacontent_extent;
 
   MagickBooleanType
     sync;
 
-  size_t
-    map;  
+  ChannelType
+    channel_mask;  
 
-  PixelComponentMap
-    **component_map;
+  PixelChannelMap
+    *channel_map;
 
   void
     *cache;
@@ -489,14 +490,14 @@ extern MagickExport Image
   *AppendImages(const Image *,const MagickBooleanType,ExceptionInfo *),
   *CloneImage(const Image *,const size_t,const size_t,const MagickBooleanType,
     ExceptionInfo *),
-  *CombineImages(const Image *,const ChannelType,ExceptionInfo *),
+  *CombineImages(const Image *,ExceptionInfo *),
   *DestroyImage(Image *),
   *GetImageClipMask(const Image *,ExceptionInfo *),
   *GetImageMask(const Image *,ExceptionInfo *),
   *NewMagickImage(const ImageInfo *,const size_t,const size_t,
     const PixelInfo *),
   *ReferenceImage(Image *),
-  *SeparateImages(const Image *,const ChannelType,ExceptionInfo *),
+  *SeparateImages(const Image *,ExceptionInfo *),
   *SmushImages(const Image *,const MagickBooleanType,const ssize_t,
     ExceptionInfo *);
 
@@ -516,16 +517,16 @@ extern MagickExport MagickBooleanType
   ListMagickInfo(FILE *,ExceptionInfo *),
   ModifyImage(Image **,ExceptionInfo *),
   ResetImagePage(Image *,const char *),
-  SeparateImageChannel(Image *,const ChannelType),
-  SetImageAlphaChannel(Image *,const AlphaChannelType),
+  SeparateImage(Image *),
+  SetImageAlphaChannel(Image *,const AlphaChannelType,ExceptionInfo *),
   SetImageBackgroundColor(Image *),
   SetImageClipMask(Image *,const Image *),
   SetImageColor(Image *,const PixelInfo *),
-  SetImageExtent(Image *,const size_t,const size_t),
+  SetImageExtent(Image *,const size_t,const size_t,ExceptionInfo *),
   SetImageInfo(ImageInfo *,const unsigned int,ExceptionInfo *),
   SetImageMask(Image *,const Image *),
   SetImageOpacity(Image *,const Quantum),
-  SetImageStorageClass(Image *,const ClassType),
+  SetImageStorageClass(Image *,const ClassType,ExceptionInfo *),
   SetImageType(Image *,const ImageType),
   StripImage(Image *),
   SyncImage(Image *),