(no commit message)

[imagemagick] / magick / image.h

diff --git a/magick/image.h b/magick/image.h
index bc9fbef7b09c4c7ca28b4212ce86957a5c6a7ebe..9444ec2bb36d56353c722b3dee8e3fa1eab28d7f 100644 (file)
--- a/magick/image.h
+++ b/magick/image.h
@@ -1,5 +1,5 @@
 /*
-  Copyright 1999-2010 ImageMagick Studio LLC, a non-profit organization
+  Copyright 1999-2011 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.
@@ -30,8 +30,6 @@ extern "C" {
 typedef enum
 {
   UndefinedAlphaChannel,
-  AssociatedAlphaChannel,
-  UnassociatedAlphaChannel,
   ActivateAlphaChannel,
   BackgroundAlphaChannel,
   CopyAlphaChannel,
@@ -157,7 +155,7 @@ struct _Image
   CompressionType
     compression;
 
-  unsigned long
+  size_t
     quality;
 
   OrientationType
@@ -167,7 +165,7 @@ struct _Image
     taint,
     matte;
 
-  unsigned long
+  size_t
     columns,
     rows,
     depth,
@@ -199,7 +197,7 @@ struct _Image
     *directory,
     *geometry;
 
-  long
+  ssize_t
     offset;
 
   double
@@ -237,18 +235,18 @@ struct _Image
   struct _Image
     *clip_mask;
 
-  unsigned long
+  size_t
     scene,
     delay;
 
-  long
+  ssize_t
     ticks_per_second;
 
-  unsigned long
+  size_t
     iterations,
     total_colors;
 
-  long
+  ssize_t
     start_loop;
 
   ErrorInfo
@@ -276,7 +274,7 @@ struct _Image
     magick_filename[MaxTextExtent],
     magick[MaxTextExtent];
 
-  unsigned long
+  size_t
     magick_columns,
     magick_rows;
 
@@ -286,7 +284,7 @@ struct _Image
   MagickBooleanType
     debug;
 
-  volatile long
+  volatile ssize_t
     reference_count;
 
   SemaphoreInfo
@@ -297,10 +295,10 @@ struct _Image
     iptc_profile,
     *generic_profile;
 
-  unsigned long
+  size_t
     generic_profiles;  /* this & ProfileInfo is deprecated */
 
-  unsigned long
+  size_t
     signature;
 
   struct _Image
@@ -336,8 +334,8 @@ struct _Image
   MagickSizeType
     extent;
 
-  AlphaChannelType
-    alpha_channel;
+  MagickBooleanType
+    ping;
 };
 
 struct _ImageInfo
@@ -360,7 +358,7 @@ struct _ImageInfo
     *page,
     *scenes;
 
-  unsigned long
+  size_t
     scene,
     number_scenes,
     depth;
@@ -374,7 +372,7 @@ struct _ImageInfo
   ResolutionType
     units;
 
-  unsigned long
+  size_t
     quality;
 
   char
@@ -397,7 +395,7 @@ struct _ImageInfo
     dither,
     monochrome;
 
-  unsigned long
+  size_t
     colors;
 
   ColorspaceType
@@ -409,7 +407,7 @@ struct _ImageInfo
   PreviewType
     preview_type;
 
-  long
+  ssize_t
     group;
 
   MagickBooleanType
@@ -460,14 +458,14 @@ struct _ImageInfo
   char
     *tile;  /* deprecated */
 
-  unsigned long
+  size_t
     subimage,  /* deprecated */
     subrange;  /* deprecated */
 
   PixelPacket
     pen;  /* deprecated */
 
-  unsigned long
+  size_t
     signature;
 
   VirtualPixelMethod
@@ -492,13 +490,13 @@ extern MagickExport FILE
 extern MagickExport Image
   *AcquireImage(const ImageInfo *),
   *AppendImages(const Image *,const MagickBooleanType,ExceptionInfo *),
-  *CloneImage(const Image *,const unsigned long,const unsigned long,
-    const MagickBooleanType,ExceptionInfo *),
+  *CloneImage(const Image *,const size_t,const size_t,const MagickBooleanType,
+    ExceptionInfo *),
   *CombineImages(const Image *,const ChannelType,ExceptionInfo *),
   *DestroyImage(Image *),
   *GetImageClipMask(const Image *,ExceptionInfo *),
   *GetImageMask(const Image *,ExceptionInfo *),
-  *NewMagickImage(const ImageInfo *,const unsigned long,const unsigned long,
+  *NewMagickImage(const ImageInfo *,const size_t,const size_t,
     const MagickPixelPacket *),
   *ReferenceImage(Image *),
   *SeparateImages(const Image *,const ChannelType,ExceptionInfo *);
@@ -508,11 +506,7 @@ extern MagickExport ImageInfo
   *CloneImageInfo(const ImageInfo *),
   *DestroyImageInfo(ImageInfo *);
 
-extern MagickExport long
-  GetImageReferenceCount(Image *);
-
 extern MagickExport MagickBooleanType
-  AcquireImageColormap(Image *,const unsigned long),
   ClipImage(Image *),
   ClipImagePath(Image *,const char *,const MagickBooleanType),
   GetImageAlphaChannel(const Image *),
@@ -527,8 +521,9 @@ extern MagickExport MagickBooleanType
   SetImageAlphaChannel(Image *,const AlphaChannelType),
   SetImageBackgroundColor(Image *),
   SetImageClipMask(Image *,const Image *),
-  SetImageExtent(Image *,const unsigned long,const unsigned long),
-  SetImageInfo(ImageInfo *,const MagickBooleanType,ExceptionInfo *),
+  SetImageColor(Image *,const MagickPixelPacket *),
+  SetImageExtent(Image *,const size_t,const size_t),
+  SetImageInfo(ImageInfo *,const unsigned int,ExceptionInfo *),
   SetImageMask(Image *,const Image *),
   SetImageOpacity(Image *,const Quantum),
   SetImageStorageClass(Image *,const ClassType),
@@ -541,6 +536,9 @@ extern MagickExport MagickBooleanType
 extern MagickExport size_t
   InterpretImageFilename(const ImageInfo *,Image *,const char *,int,char *);
 
+extern MagickExport ssize_t
+  GetImageReferenceCount(Image *);
+
 extern MagickExport VirtualPixelMethod
   GetImageVirtualPixelMethod(const Image *),
   SetImageVirtualPixelMethod(const Image *,const VirtualPixelMethod);