Upgrading im to 3.6

1 files changed, 21 insertions, 7 deletions

diff --git a/im/include/im_image.h b/im/include/im_image.h
index 12dbad8..6a325c1 100755
--- a/im/include/im_image.h
+++ b/im/include/im_image.h
@@ -103,12 +103,18 @@ imImage* imImageCreateBased(const imImage* image, int width, int height, int col
  * \ingroup imgclass */
 void imImageDestroy(imImage* image);
 
-/** Adds an alpha channel plane.
+/** Adds an alpha channel plane and sets its value to 0 (transparent).
  *
  * \verbatim image:AddAlpha() [in Lua 5] \endverbatim
  * \ingroup imgclass */
 void imImageAddAlpha(imImage* image);
 
+/** Sets the alpha channel plane to a constant.
+ *
+ * \verbatim image:SetAlpha() [in Lua 5] \endverbatim
+ * \ingroup imgclass */
+void imImageSetAlpha(imImage* image, float alpha);
+
 /** Changes the buffer size. Reallocate internal buffers if the new size is larger than the original.
  *
  * \verbatim image:Reshape(width: number, height: number) [in Lua 5] \endverbatim
@@ -129,6 +135,20 @@ void imImageCopy(const imImage* src_image, imImage* dst_image);
  * \ingroup imgclass */
 void imImageCopyData(const imImage* src_image, imImage* dst_image);
 
+/** Copies the image attributes from src to dst.
+ * Includes the pallete when a MAP or GRAY image.
+ *
+ * \verbatim image:CopyAttributes(dst_image: imImage) [in Lua 5] \endverbatim
+ * \ingroup imgclass */
+void imImageCopyAttributes(const imImage* src_image, imImage* dst_image);
+
+/** Copy one image plane fom one image to another. \n
+ * Images must have the same size and type.
+ *
+ * \verbatim image:CopyPlane(src_plane: number, dst_image: imImage, dst_plane: number) [in Lua 5] \endverbatim
+ * \ingroup imgclass */
+void imImageCopyPlane(const imImage* src_image, int src_plane, imImage* dst_image, int dst_plane);
+
 /** Creates a copy of the image.
  *
  * \verbatim image:Duplicate() -> new_image: imImage [in Lua 5] \endverbatim
@@ -190,12 +210,6 @@ int imImageIsBitmap(const imImage* image);
  * \ingroup imgclass */
 void imImageSetPalette(imImage* image, long* palette, int palette_count);
 
-/** Copies the image attributes from src to dst.
- *
- * \verbatim image:CopyAttributes(dst_image: imImage) [in Lua 5] \endverbatim
- * \ingroup imgclass */
-void imImageCopyAttributes(const imImage* src_image, imImage* dst_image);
-
 /** Returns 1 if the images match width and height. Returns 0 otherwise.
  *
  * \verbatim image:MatchSize(image2: imImage) -> match: boolean [in Lua 5] \endverbatim