# New: function imImageMergeAttributes.

1 files changed, 14 insertions, 1 deletions

diff --git a/src/lua5/imlua_image.c b/src/lua5/imlua_image.c
index b8bc1a8..057e757 100644
--- a/src/lua5/imlua_image.c
+++ b/src/lua5/imlua_image.c
@@ -2,7 +2,7 @@
  * \brief IM Lua 5 Binding
  *
  * See Copyright Notice in im_lib.h
- * $Id: imlua_image.c,v 1.13 2010/10/25 18:29:07 scuri Exp $
+ * $Id: imlua_image.c,v 1.14 2011/04/04 20:42:48 scuri Exp $
  */
 
 #include <string.h>
@@ -546,6 +546,18 @@ static int imluaImageCopyAttributes (lua_State *L)
 }
 
 /*****************************************************************************\
+ image:MergeAttributes(dst_image)
+\*****************************************************************************/
+static int imluaImageMergeAttributes (lua_State *L)
+{
+  imImage *src_image = imlua_checkimage(L, 1);
+  imImage *dst_image = imlua_checkimage(L, 2);
+
+  imImageMergeAttributes(src_image, dst_image);
+  return 0;
+}
+
+/*****************************************************************************\
  image:MatchSize(image2)
 \*****************************************************************************/
 static int imluaImageMatchSize (lua_State *L)
@@ -1056,6 +1068,7 @@ static const luaL_reg imimage_metalib[] = {
   {"SetPalette", imluaImageSetPalette},
   {"GetPalette", imluaImageGetPalette},
   {"CopyAttributes", imluaImageCopyAttributes},
+  {"MergeAttributes", imluaImageMergeAttributes},
   {"MatchSize", imluaImageMatchSize},
   {"MatchColor", imluaImageMatchColor},
   {"MatchDataType", imluaImageMatchDataType},