From b2257ad3263f1eaf8dcf637edb480e0c8274fd73 Mon Sep 17 00:00:00 2001
From: scuri <scuri>
Date: Mon, 4 Apr 2011 20:42:46 +0000
Subject: # New: function imImageMergeAttributes.

---
 include/im_image.h | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'include/im_image.h')

diff --git a/include/im_image.h b/include/im_image.h
index 6c1a084..bd13c24 100644
--- a/include/im_image.h
+++ b/include/im_image.h
@@ -136,12 +136,20 @@ void imImageCopy(const imImage* src_image, imImage* dst_image);
 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.
+ * Includes the pallete if defined in both images.
  *
  * \verbatim image:CopyAttributes(dst_image: imImage) [in Lua 5] \endverbatim
  * \ingroup imgclass */
 void imImageCopyAttributes(const imImage* src_image, imImage* dst_image);
 
+/** Merges the image attributes from src to dst. \n
+ * Attributes that exist in dst are not replaced. 
+ * Doens NOT include the pallete.
+ *
+ * \verbatim image:MergeAttributes(dst_image: imImage) [in Lua 5] \endverbatim
+ * \ingroup imgclass */
+void imImageMergeAttributes(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.
  *
-- 
cgit v1.2.3