From 3f179891bb11a2eda51db63be3c6ee454df73589 Mon Sep 17 00:00:00 2001 From: 1 <1> Date: Tue, 17 Dec 2019 15:05:40 +0300 Subject: [PATCH] fix implement C-call MagickCompositeImage of libmagickwand, need 6 params, MagickBooleanType is missed --- magick/wand/image.lua | 2 +- magick/wand/image.moon | 2 +- magick/wand/lib.lua | 1 + magick/wand/lib.moon | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/magick/wand/image.lua b/magick/wand/image.lua index 21a1d19..d58da38 100644 --- a/magick/wand/image.lua +++ b/magick/wand/image.lua @@ -171,7 +171,7 @@ do blob = blob.wand end op = assert(composite_operators:to_int(op), "invalid operator type") - return handle_result(self, lib.MagickCompositeImage(self.wand, blob, op, x, y)) + return handle_result(self, lib.MagickCompositeImage(self.wand, blob, op, 1, x, y)) end, get_blob = function(self) local len = ffi.new("size_t[1]", 0) diff --git a/magick/wand/image.moon b/magick/wand/image.moon index f8fc2dd..d6f48eb 100644 --- a/magick/wand/image.moon +++ b/magick/wand/image.moon @@ -135,7 +135,7 @@ class Image extends require "magick.base_image" op = assert composite_operators\to_int(op), "invalid operator type" handle_result @, - lib.MagickCompositeImage @wand, blob, op, x, y + lib.MagickCompositeImage @wand, blob, op, 1, x, y get_blob: => len = ffi.new "size_t[1]", 0 diff --git a/magick/wand/lib.lua b/magick/wand/lib.lua index d5ab763..d1b5b29 100644 --- a/magick/wand/lib.lua +++ b/magick/wand/lib.lua @@ -61,6 +61,7 @@ ffi.cdef([[ typedef void MagickWand; MagickBooleanType MagickCompositeImage(MagickWand *wand, const MagickWand *source_wand,const CompositeOperator compose, + const MagickBooleanType, const ssize_t x,const ssize_t y); GravityType MagickGetImageGravity(MagickWand *wand); diff --git a/magick/wand/lib.moon b/magick/wand/lib.moon index 9f4cc48..da9f06b 100644 --- a/magick/wand/lib.moon +++ b/magick/wand/lib.moon @@ -65,6 +65,7 @@ ffi.cdef [[ MagickBooleanType MagickCompositeImage(MagickWand *wand, const MagickWand *source_wand,const CompositeOperator compose, + const MagickBooleanType, const ssize_t x,const ssize_t y); GravityType MagickGetImageGravity(MagickWand *wand);