summaryrefslogtreecommitdiff
path: root/include/im_image.h
diff options
context:
space:
mode:
authorscuri <scuri>2011-04-04 20:42:46 +0000
committerscuri <scuri>2011-04-04 20:42:46 +0000
commitb2257ad3263f1eaf8dcf637edb480e0c8274fd73 (patch)
treea3838f5b4dccdc7c8bbae13a930e3e9d6738835b /include/im_image.h
parent128f620d057c076c445116d264947c993ea5187b (diff)
# New: function imImageMergeAttributes.
Diffstat (limited to 'include/im_image.h')
-rw-r--r--include/im_image.h10
1 files changed, 9 insertions, 1 deletions
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.
*