diff options
| -rw-r--r-- | 50.patch | 9538 | ||||
| -rw-r--r-- | skipif.inc | 12 |
2 files changed, 0 insertions, 9550 deletions
diff --git a/50.patch b/50.patch deleted file mode 100644 index a1aba71..0000000 --- a/50.patch +++ /dev/null @@ -1,9538 +0,0 @@ -From 991ef7898acc361044c647f65072b45f91840006 Mon Sep 17 00:00:00 2001 -From: Rasmus Lerdorf <rasmus@lerdorf.com> -Date: Sat, 23 Jan 2021 22:26:29 -0800 -Subject: [PATCH 1/6] Some work on PHP 8 support Still more to do because it - crashes on many tests unless I run with OMP_NUM_THREADS=1 This doesn't seem - to be a PHP 8 problem as I see the same with PHP 7.4, but not with 7.3 - ---- - gmagick.c | 39 +++++++++++++++++++++++--- - gmagick_methods.c | 4 --- - php_gmagick.h | 51 ++++++++++++++++++++++++++++++++++ - php_gmagick_macros.h | 66 ++++++++++++++++++++++++++++++++++++++++---- - 4 files changed, 146 insertions(+), 14 deletions(-) - -diff --git a/gmagick.c b/gmagick.c -index 27ec8cc..0e9a57a 100644 ---- a/gmagick.c -+++ b/gmagick.c -@@ -85,20 +85,37 @@ static zend_object *php_gmagick_object_new(zend_class_entry *class_type) - - /* {{{ static zend_object *php_gmagick_clone_gmagick_object(zval *this_ptr TSRMLS_DC) - */ -+#if PHP_MAJOR_VERSION < 8 - static zend_object *php_gmagick_clone_gmagick_object(zval *this_ptr TSRMLS_DC) - { - php_gmagick_object *old_obj = Z_GMAGICK_OBJ_P(this_ptr); - php_gmagick_object *new_obj = GMAGICK_FETCH_OBJECT(php_gmagick_object_new_ex(old_obj->zo.ce, 0)); -- -+ - zend_objects_clone_members(&new_obj->zo, &old_obj->zo); -- -+ - if (new_obj->magick_wand) { - DestroyMagickWand(new_obj->magick_wand); - } -- -+ - new_obj->magick_wand = CloneMagickWand(old_obj->magick_wand); - return &new_obj->zo; - } -+#else -+static zend_object *php_gmagick_clone_gmagick_object(zend_object *this_ptr) -+{ -+ php_gmagick_object *old_obj = GMAGICK_FETCH_OBJECT(this_ptr); -+ php_gmagick_object *new_obj = GMAGICK_FETCH_OBJECT(php_gmagick_object_new_ex(this_ptr->ce, 0)); -+ -+ zend_objects_clone_members(&new_obj->zo, &old_obj->zo); -+ -+ if (new_obj->magick_wand) { -+ DestroyMagickWand(new_obj->magick_wand); -+ } -+ -+ new_obj->magick_wand = CloneMagickWand(old_obj->magick_wand); -+ return &new_obj->zo; -+} -+#endif - /* }}} */ - - /* {{{ static void php_gmagickdraw_object_free_storage(zend_object *object) -@@ -203,6 +220,7 @@ static zend_object *php_gmagickpixel_object_new(zend_class_entry *class_type TSR - - /* {{{ static zend_object *php_gmagick_clone_gmagickpixel_object(zval *this_ptr) - */ -+#if PHP_MAJOR_VERSION < 8 - static zend_object *php_gmagick_clone_gmagickpixel_object(zval *this_ptr) - { - php_gmagickpixel_object *old_obj = Z_GMAGICKPIXEL_OBJ_P(this_ptr); -@@ -213,6 +231,19 @@ static zend_object *php_gmagick_clone_gmagickpixel_object(zval *this_ptr) - - return &new_obj->zo; - } -+#else -+static zend_object *php_gmagick_clone_gmagickpixel_object(zend_object *this_ptr) -+{ -+ php_gmagickpixel_object *old_obj = GMAGICKPIXEL_FETCH_OBJECT(this_ptr); -+ php_gmagickpixel_object *new_obj = GMAGICKPIXEL_FETCH_OBJECT(php_gmagickpixel_object_new_ex(old_obj->zo.ce, 0)); -+ -+ zend_objects_clone_members(&new_obj->zo, &old_obj->zo); -+ GMAGICK_CLONE_PIXELWAND(old_obj->pixel_wand, new_obj->pixel_wand); -+ -+ return &new_obj->zo; -+} -+ -+#endif - /* }}} */ - - ZEND_BEGIN_ARG_INFO_EX(gmagick_empty_args, 0, 0, 0) -@@ -1020,7 +1051,7 @@ static zend_function_entry php_gmagick_class_methods[] = - PHP_ME(gmagick, setimagewhitepoint, gmagick_setimagewhitepoint_args, ZEND_ACC_PUBLIC) - PHP_ME(gmagick, setsamplingfactors, gmagick_setsamplingfactors_args, ZEND_ACC_PUBLIC) - PHP_ME(gmagick, setsize, gmagick_setsize_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getversion, gmagick_empty_args, ZEND_ACC_PUBLIC) -+ PHP_ME(gmagick, getversion, gmagick_empty_args, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) - PHP_ME(gmagick, getimagegeometry, gmagick_empty_args, ZEND_ACC_PUBLIC) - PHP_ME(gmagick, getimage, gmagick_empty_args, ZEND_ACC_PUBLIC) - PHP_ME(gmagick, setimage, gmagick_setimage_args, ZEND_ACC_PUBLIC) -diff --git a/gmagick_methods.c b/gmagick_methods.c -index d2a0749..39c48a4 100644 ---- a/gmagick_methods.c -+++ b/gmagick_methods.c -@@ -3091,10 +3091,6 @@ PHP_METHOD(gmagick, getversion) - char *version_string; - unsigned long version_number; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -- - version_string = (char *)MagickGetVersion(&version_number); - array_init(return_value); - -diff --git a/php_gmagick.h b/php_gmagick.h -index 91baeda..f5e25ca 100644 ---- a/php_gmagick.h -+++ b/php_gmagick.h -@@ -57,6 +57,57 @@ typedef long ssize_t; - #include "ext/standard/info.h" - #include "ext/standard/php_filestat.h" - -+/* backward compat macros */ -+ -+#ifndef TSRMLS_CC -+#define TSRMLS_FETCH() -+#define TSRMLS_CC -+#define TSRMLS_DC -+#define TSRMLS_D -+#define TSRMLS_C -+#endif -+ -+#ifndef IS_MIXED -+# define IS_MIXED 0 -+#endif -+ -+#ifndef ZEND_ARG_INFO_WITH_DEFAULT_VALUE -+#define ZEND_ARG_INFO_WITH_DEFAULT_VALUE(pass_by_ref, name, default_value) \ -+ ZEND_ARG_INFO(pass_by_ref, name) -+#endif -+ -+#if PHP_VERSION_ID < 70200 -+#undef ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX -+#define ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, class_name, allow_null) \ -+ static const zend_internal_arg_info name[] = { \ -+ { (const char*)(zend_uintptr_t)(required_num_args), ( #class_name ), 0, return_reference, allow_null, 0 }, -+#endif -+ -+#ifndef ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX -+# define ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(name, return_reference, required_num_args, class_name, allow_null) \ -+ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, class_name, allow_null) -+#endif -+ -+#ifndef ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX -+# define ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(name, return_reference, num_args, type) \ -+ ZEND_BEGIN_ARG_INFO_EX(name, 0, return_reference, num_args) -+#endif -+ -+#ifndef ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX -+# define ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(name, return_reference, required_num_args, class_name, type) \ -+ ZEND_BEGIN_ARG_INFO_EX(name, 0, return_reference, required_num_args) -+#endif -+ -+#ifndef ZEND_ARG_TYPE_MASK -+# define ZEND_ARG_TYPE_MASK(pass_by_ref, name, type_mask, default_value) \ -+ ZEND_ARG_TYPE_INFO(pass_by_ref, name, 0, 0) -+#endif -+ -+#ifndef ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE -+# define ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(pass_by_ref, name, type_hint, allow_null, default_value) \ -+ ZEND_ARG_TYPE_INFO(pass_by_ref, name, type_hint, allow_null) -+#endif -+ - #if GMAGICK_LIB_MASK >= 1003018 - #define GMAGICK_HAVE_SET_IMAGE_PAGE 1 - #endif -diff --git a/php_gmagick_macros.h b/php_gmagick_macros.h -index f0e204f..71da42f 100644 ---- a/php_gmagick_macros.h -+++ b/php_gmagick_macros.h -@@ -31,7 +31,7 @@ - - #define GMAGICKPIXEL_FETCH_OBJECT(zv_p) (php_gmagickpixel_object *)((char*)(zv_p) - XtOffsetOf(php_gmagickpixel_object, zo)) - #define Z_GMAGICKPIXEL_OBJ_P(zv) GMAGICKPIXEL_FETCH_OBJECT(Z_OBJ_P((zv))) -- -+ - /* }}} */ - - /* Define a set of macros to throw exceptions */ -@@ -232,6 +232,7 @@ - #endif - - /* {{{ GMAGICK_CLONE_PIXELWAND(source, target) */ -+#if PHP_MAJOR_VERSION < 8 - #define GMAGICK_CAST_PARAMETER_TO_COLOR(param, internp, caller) \ - switch (Z_TYPE_P(param)) { \ - case IS_STRING: \ -@@ -257,7 +258,35 @@ - default: \ - GMAGICK_THROW_EXCEPTION_WITH_MESSAGE(caller, "Invalid parameter provided", (long)caller); \ - break; \ -- } \ -+ } -+#else -+#define GMAGICK_CAST_PARAMETER_TO_COLOR(param, internp, caller) \ -+ switch (Z_TYPE_P(param)) { \ -+ case IS_STRING: \ -+ { \ -+ zval object; \ -+ PixelWand *pixel_wand = NewPixelWand(); \ -+ if (!PixelSetColor(pixel_wand, Z_STRVAL_P(param))) { \ -+ GMAGICK_THROW_GMAGICKPIXEL_EXCEPTION(pixel_wand, "Unrecognized color string"); \ -+ return; \ -+ } \ -+ object_init_ex(&object, php_gmagickpixel_sc_entry); \ -+ internp = Z_GMAGICKPIXEL_OBJ_P(&object); \ -+ GMAGICKPIXEL_REPLACE_PIXELWAND(internp, pixel_wand); \ -+ } \ -+ break; \ -+ case IS_OBJECT: \ -+ if (Z_OBJCE_P(param) == php_gmagickpixel_sc_entry) { \ -+ internp = Z_GMAGICKPIXEL_OBJ_P(param); \ -+ } else { \ -+ GMAGICK_THROW_EXCEPTION_WITH_MESSAGE(caller, "The parameter must be an instance of GmagickPixel or a string", (long)caller); \ -+ } \ -+ break; \ -+ default: \ -+ GMAGICK_THROW_EXCEPTION_WITH_MESSAGE(caller, "Invalid parameter provided", (long)caller); \ -+ break; \ -+ } -+#endif - /* }}} */ - - /* {{{ GMAGICK_CLONE_PIXELWAND(source, target) */ -@@ -316,9 +345,9 @@ - }\ - RETURN_NULL();\ - break;\ -- } \ --/* }}} */ -+ } - -+#if PHP_MAJOR_VERSION < 7 - #define GMAGICK_CAST_PARAMETER_TO_OPACITY(param, internp, caller) \ - switch (Z_TYPE_P(param)) { \ - case IS_LONG: \ -@@ -342,8 +371,33 @@ - default: \ - GMAGICK_THROW_EXCEPTION_WITH_MESSAGE(caller, "Invalid parameter provided", (long)caller); \ - break; \ -- } \ --/* }}} */ -+ } -+#else -+#define GMAGICK_CAST_PARAMETER_TO_OPACITY(param, internp, caller) \ -+ switch (Z_TYPE_P(param)) { \ -+ case IS_LONG: \ -+ case IS_DOUBLE: \ -+ { \ -+ zval object; \ -+ PixelWand *pixel_wand = NewPixelWand(); \ -+ PixelSetOpacity(pixel_wand, Z_DVAL_P(param)); \ -+ object_init_ex(&object, php_gmagickpixel_sc_entry); \ -+ internp = Z_GMAGICKPIXEL_OBJ_P(&object); \ -+ GMAGICKPIXEL_REPLACE_PIXELWAND(internp, pixel_wand); \ -+ } \ -+ break; \ -+ case IS_OBJECT: \ -+ if (Z_OBJCE_P(param) == php_gmagickpixel_sc_entry) { \ -+ internp = Z_GMAGICKPIXEL_OBJ_P(param); \ -+ } else { \ -+ GMAGICK_THROW_EXCEPTION_WITH_MESSAGE(caller, "The parameter must be an instance of GmagickPixel or a string", (long)caller); \ -+ } \ -+ break; \ -+ default: \ -+ GMAGICK_THROW_EXCEPTION_WITH_MESSAGE(caller, "Invalid parameter provided", (long)caller); \ -+ break; \ -+ } -+#endif - - /* {{{ GMAGICK_SAFEMODE_OPENBASEDIR_CHECK(filename) */ - #if PHP_VERSION_ID > 50399 - -From 21176bc6be8639198ab5fe4ed5925f42ead2a156 Mon Sep 17 00:00:00 2001 -From: Rasmus Lerdorf <rasmus@lerdorf.com> -Date: Sun, 24 Jan 2021 21:44:28 -0800 -Subject: [PATCH 2/6] Add set_single_thread and shutdown_sleep_count ini - settings to match the imagick extension but also add an config check for - omp_pause_resource_all() and use that if available - ---- - config.m4 | 2 ++ - gmagick.c | 38 +++++++++++++++++++++++++++++++++++++- - php_gmagick.h | 19 +++++++++++++++++++ - 3 files changed, 58 insertions(+), 1 deletion(-) - -diff --git a/config.m4 b/config.m4 -index c7d7c9f..8bd545a 100644 ---- a/config.m4 -+++ b/config.m4 -@@ -30,6 +30,8 @@ if test $PHP_GMAGICK != "no"; then - AC_MSG_CHECKING(GraphicsMagick version mask) - AC_MSG_RESULT(found version $GRAPHICSMAGICK_VERSION_MASK) - -+ PHP_CHECK_FUNC(omp_pause_resource_all, gomp) -+ - LIB_DIR=$WAND_DIR/lib - # If "$LIB_DIR" == "/usr/lib" or possible /usr/$PHP_LIBDIR" then you're probably - # going to have a bad time. PHP m4 files seem to be hard-coded to not link properly against -diff --git a/gmagick.c b/gmagick.c -index 0e9a57a..67256ec 100644 ---- a/gmagick.c -+++ b/gmagick.c -@@ -21,6 +21,8 @@ - #include "php_gmagick_macros.h" - #include "php_gmagick_helpers.h" - -+ZEND_DECLARE_MODULE_GLOBALS(gmagick) -+ - /* handlers */ - static zend_object_handlers gmagick_object_handlers; - static zend_object_handlers gmagickdraw_object_handlers; -@@ -1690,6 +1692,18 @@ static zend_function_entry php_gmagickpixel_class_methods[] = - }; - /* }}} */ - -+PHP_INI_BEGIN() -+ STD_PHP_INI_ENTRY("gmagick.set_single_thread", "0", PHP_INI_SYSTEM, OnUpdateBool, set_single_thread, zend_gmagick_globals, gmagick_globals) -+ STD_PHP_INI_ENTRY("gmagick.shutdown_sleep_count", "10", PHP_INI_ALL, OnUpdateLong, shutdown_sleep_count, zend_gmagick_globals, gmagick_globals) -+PHP_INI_END() -+ -+static void php_gmagick_init_globals(zend_gmagick_globals *gmagick_globals) -+{ -+ gmagick_globals->set_single_thread = 0; -+ // 10 is magick number, that seems to be enough. -+ gmagick_globals->shutdown_sleep_count = 10; -+} -+ - /* {{{ PHP_MINIT_FUNCTION(gmagick) - */ - PHP_MINIT_FUNCTION(gmagick) -@@ -1698,6 +1712,8 @@ PHP_MINIT_FUNCTION(gmagick) - size_t cwd_len; - - zend_class_entry ce; -+ -+ ZEND_INIT_MODULE_GLOBALS(gmagick, php_gmagick_init_globals, NULL); - - /* Exception */ - INIT_CLASS_ENTRY(ce, "GmagickException", NULL); -@@ -1738,12 +1754,20 @@ PHP_MINIT_FUNCTION(gmagick) - - if (!cwd) - return FAILURE; -- -+ -+ - InitializeMagick(cwd); - efree(cwd); - - /* init constants */ - php_gmagick_initialize_constants(); -+ -+ REGISTER_INI_ENTRIES(); -+ -+ if (GMAGICK_G(set_single_thread)) { -+ MagickSetResourceLimit(ThreadsResource, 1); -+ } -+ - return SUCCESS; - } - /* }}} */ -@@ -1753,6 +1777,16 @@ PHP_MINIT_FUNCTION(gmagick) - PHP_MSHUTDOWN_FUNCTION(gmagick) - { - DestroyMagick(); -+#if HAVE_OMP_PAUSE_RESOURCE_ALL -+ // Note there is a patch to add omp_pause_resource_all to DestroyMagick() -+ // https://sourceforge.net/p/graphicsmagick/patches/63/ -+ // But it hasn't been accepted -+ omp_pause_resource_all(omp_pause_hard); -+#else -+ for (i = 0; i < 100 && i < GMAGICK_G(shutdown_sleep_count); i += 1) { -+ usleep(1000); -+ } -+#endif - return SUCCESS; - } - /* }}} */ -@@ -1771,6 +1805,8 @@ PHP_MINFO_FUNCTION(gmagick) - php_info_print_table_row(2, "gmagick version", PHP_GMAGICK_VERSION); - php_info_print_table_row(2, "GraphicsMagick version", version); - php_info_print_table_end(); -+ -+ DISPLAY_INI_ENTRIES(); - } - - /* {{{ zend_module_entry gmagick_module_entry -diff --git a/php_gmagick.h b/php_gmagick.h -index f5e25ca..25ddc56 100644 ---- a/php_gmagick.h -+++ b/php_gmagick.h -@@ -29,6 +29,7 @@ - /* Include GraphicsMagick header */ - #include <stdio.h> - #include <sys/types.h> -+ - #if defined(PHP_WIN32) && !defined(ssize_t) - /* XXX actually wand_api.h should be included after php.h, - ssize_t were there with much more probability. */ -@@ -57,6 +58,10 @@ typedef long ssize_t; - #include "ext/standard/info.h" - #include "ext/standard/php_filestat.h" - -+#if HAVE_OMP_PAUSE_RESOURCE_ALL -+#include <omp.h> -+#endif -+ - /* backward compat macros */ - - #ifndef TSRMLS_CC -@@ -134,6 +139,20 @@ typedef struct _php_gmagickpixel_object { - zend_object zo; - } php_gmagickpixel_object; - -+/* Globals, needed for the ini settings */ -+ZEND_BEGIN_MODULE_GLOBALS(gmagick) -+ zend_bool set_single_thread; -+ zend_long shutdown_sleep_count; -+ZEND_END_MODULE_GLOBALS(gmagick) -+ -+#ifdef ZTS -+# define GMAGICK_G(v) TSRMG(gmagick_globals_id, zend_gmagick_globals *, v) -+#else -+# define GMAGICK_G(v) (gmagick_globals.v) -+#endif -+ -+ZEND_EXTERN_MODULE_GLOBALS(gmagick) -+ - extern zend_module_entry gmagick_module_entry; - #define phpext_gmagick_ptr &gmagick_module_entry - - -From de1b5bc93bc2aeea61b10f5ef086268eab445a49 Mon Sep 17 00:00:00 2001 -From: Rasmus Lerdorf <rasmus@lerdorf.com> -Date: Mon, 25 Jan 2021 06:38:31 -0800 -Subject: [PATCH 3/6] Improve the `omp_pause_resource_all` check thanks to - @remicollet - -Drop `set_single_thread` ini entry idea since the crash problem is -mitigated by `omp_pause_resource_all()` on builds using a gcc-9+ and by -the `shutdown_sleep_count` usleep on older builds. -People can also call -`$gmagick->setResourceLimit(\GMAGICK::RESOURCETYPE_THREADS, 1)` -directly in their code to prevent omp from creating threads. ---- - config.m4 | 13 ++++++++++++- - gmagick.c | 6 ------ - php_gmagick.h | 1 - - 3 files changed, 12 insertions(+), 8 deletions(-) - -diff --git a/config.m4 b/config.m4 -index 8bd545a..62eeaf1 100644 ---- a/config.m4 -+++ b/config.m4 -@@ -30,7 +30,18 @@ if test $PHP_GMAGICK != "no"; then - AC_MSG_CHECKING(GraphicsMagick version mask) - AC_MSG_RESULT(found version $GRAPHICSMAGICK_VERSION_MASK) - -- PHP_CHECK_FUNC(omp_pause_resource_all, gomp) -+ AC_MSG_CHECKING(omp_pause_resource_all usability) -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -+ #include <omp.h> -+ ]],[[ -+ omp_pause_resource_all(omp_pause_hard); -+ ]])],[ -+ AC_MSG_RESULT(yes) -+ PHP_CHECK_FUNC(omp_pause_resource_all, gomp) -+ PHP_ADD_LIBRARY(gomp,, GMAGICK_SHARED_LIBADD) -+ ],[ -+ AC_MSG_RESULT(no) -+ ]) - - LIB_DIR=$WAND_DIR/lib - # If "$LIB_DIR" == "/usr/lib" or possible /usr/$PHP_LIBDIR" then you're probably -diff --git a/gmagick.c b/gmagick.c -index 67256ec..28cf259 100644 ---- a/gmagick.c -+++ b/gmagick.c -@@ -1693,13 +1693,11 @@ static zend_function_entry php_gmagickpixel_class_methods[] = - /* }}} */ - - PHP_INI_BEGIN() -- STD_PHP_INI_ENTRY("gmagick.set_single_thread", "0", PHP_INI_SYSTEM, OnUpdateBool, set_single_thread, zend_gmagick_globals, gmagick_globals) - STD_PHP_INI_ENTRY("gmagick.shutdown_sleep_count", "10", PHP_INI_ALL, OnUpdateLong, shutdown_sleep_count, zend_gmagick_globals, gmagick_globals) - PHP_INI_END() - - static void php_gmagick_init_globals(zend_gmagick_globals *gmagick_globals) - { -- gmagick_globals->set_single_thread = 0; - // 10 is magick number, that seems to be enough. - gmagick_globals->shutdown_sleep_count = 10; - } -@@ -1764,10 +1762,6 @@ PHP_MINIT_FUNCTION(gmagick) - - REGISTER_INI_ENTRIES(); - -- if (GMAGICK_G(set_single_thread)) { -- MagickSetResourceLimit(ThreadsResource, 1); -- } -- - return SUCCESS; - } - /* }}} */ -diff --git a/php_gmagick.h b/php_gmagick.h -index 25ddc56..ef903fc 100644 ---- a/php_gmagick.h -+++ b/php_gmagick.h -@@ -141,7 +141,6 @@ typedef struct _php_gmagickpixel_object { - - /* Globals, needed for the ini settings */ - ZEND_BEGIN_MODULE_GLOBALS(gmagick) -- zend_bool set_single_thread; - zend_long shutdown_sleep_count; - ZEND_END_MODULE_GLOBALS(gmagick) - - -From d844784fd4763bb1679630cca1f580e3547a05ee Mon Sep 17 00:00:00 2001 -From: Rasmus Lerdorf <rasmus@lerdorf.com> -Date: Tue, 26 Jan 2021 14:01:34 -0800 -Subject: [PATCH 4/6] Fixes from @remicollet and some minor cleanup - ---- - gmagick.c | 54 +++++++++++++++++++++++------------------- - gmagick_methods.c | 16 ++++++------- - gmagickpixel_methods.c | 6 ++--- - package.xml | 4 ++++ - 4 files changed, 44 insertions(+), 36 deletions(-) - -diff --git a/gmagick.c b/gmagick.c -index 28cf259..fbae482 100644 ---- a/gmagick.c -+++ b/gmagick.c -@@ -1,6 +1,6 @@ - /* - +----------------------------------------------------------------------+ -- | PHP Version 5 / Gmagick | -+ | PHP Version 5 / Gmagick | - +----------------------------------------------------------------------+ - | Copyright (c) 2009 Vito Chin, Mikko Koppanen | - +----------------------------------------------------------------------+ -@@ -13,7 +13,7 @@ - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Mikko Kopppanen <mkoppanen@php.net> | -- | Vito Chin <vito@php.net> | -+ | Vito Chin <vito@php.net> | - +----------------------------------------------------------------------+ - */ - -@@ -178,11 +178,11 @@ static void php_gmagickpixel_object_free_storage(zend_object *object) - if (!intern) { - return; - } -- -+ - if(intern->pixel_wand) { - DestroyPixelWand(intern->pixel_wand); - } -- -+ - zend_object_std_dtor(&intern->zo); - } - /* }}} */ -@@ -568,19 +568,19 @@ ZEND_BEGIN_ARG_INFO_EX(gmagick_motionblurimage_args, 0, 0, 3) - ZEND_ARG_INFO(0, angle) - ZEND_END_ARG_INFO() - -- -+ - ZEND_BEGIN_ARG_INFO_EX(gmagick_newimage_args, 0, 0, 3) - ZEND_ARG_INFO(0, columns) - ZEND_ARG_INFO(0, rows) - ZEND_ARG_INFO(0, background_color) - ZEND_ARG_INFO(0, format) --ZEND_END_ARG_INFO() -+ZEND_END_ARG_INFO() - - ZEND_BEGIN_ARG_INFO_EX(gmagick_newpseudoimage_args, 0, 0, 3) - ZEND_ARG_INFO(0, columns) - ZEND_ARG_INFO(0, rows) - ZEND_ARG_INFO(0, pseudoString) --ZEND_END_ARG_INFO() -+ZEND_END_ARG_INFO() - - ZEND_BEGIN_ARG_INFO_EX(gmagick_getresourcelimit_args, 0, 0, 1) - ZEND_ARG_INFO(0, resource_type) -@@ -939,16 +939,16 @@ static zend_function_entry php_gmagick_class_methods[] = - PHP_ME(gmagick, thumbnailimage, gmagick_thumbnailimage_args, ZEND_ACC_PUBLIC) - PHP_ME(gmagick, clear, gmagick_empty_args, ZEND_ACC_PUBLIC) - PHP_ME(gmagick, cropimage, gmagick_cropimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, coalesceimages, gmagick_empty_args, ZEND_ACC_PUBLIC) -+ PHP_ME(gmagick, coalesceimages, gmagick_empty_args, ZEND_ACC_PUBLIC) - PHP_ME(gmagick, compositeimage, gmagick_compositeimage_args, ZEND_ACC_PUBLIC) - PHP_ME(gmagick, drawimage, gmagick_drawimage_args, ZEND_ACC_PUBLIC) - PHP_ME(gmagick, annotateimage, gmagick_annotateimage_args, ZEND_ACC_PUBLIC) - PHP_ME(gmagick, blurimage, gmagick_blurimage_args, ZEND_ACC_PUBLIC) - PHP_ME(gmagick, addimage, gmagick_addimage_args, ZEND_ACC_PUBLIC) - PHP_ME(gmagick, addnoiseimage, gmagick_addnoiseimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, negateimage, gmagick_negateimage_args, ZEND_ACC_PUBLIC) -+ PHP_ME(gmagick, negateimage, gmagick_negateimage_args, ZEND_ACC_PUBLIC) - PHP_ME(gmagick, borderimage, gmagick_borderimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, thresholdimage, gmagick_thresholdimage_args, ZEND_ACC_PUBLIC) -+ PHP_ME(gmagick, thresholdimage, gmagick_thresholdimage_args, ZEND_ACC_PUBLIC) - PHP_ME(gmagick, charcoalimage, gmagick_charcoalimage_args, ZEND_ACC_PUBLIC) - PHP_ME(gmagick, chopimage, gmagick_chopimage_args, ZEND_ACC_PUBLIC) - PHP_ME(gmagick, commentimage, gmagick_commentimage_args, ZEND_ACC_PUBLIC) -@@ -980,7 +980,7 @@ static zend_function_entry php_gmagick_class_methods[] = - PHP_ME(gmagick, getimagesblob, gmagick_empty_args, ZEND_ACC_PUBLIC) - PHP_ME(gmagick, setimagechanneldepth, gmagick_setimagechanneldepth_args, ZEND_ACC_PUBLIC) - PHP_ME(gmagick, setimagecolorspace, gmagick_setimagecolorspace_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setinterlacescheme, gmagick_setinterlacescheme_args, ZEND_ACC_PUBLIC) -+ PHP_ME(gmagick, setinterlacescheme, gmagick_setinterlacescheme_args, ZEND_ACC_PUBLIC) - PHP_ME(gmagick, getimagecolorspace, gmagick_empty_args, ZEND_ACC_PUBLIC) - PHP_ME(gmagick, getimagecolors, gmagick_empty_args, ZEND_ACC_PUBLIC) - PHP_ME(gmagick, getimagecompose, gmagick_empty_args, ZEND_ACC_PUBLIC) -@@ -988,8 +988,8 @@ static zend_function_entry php_gmagick_class_methods[] = - PHP_ME(gmagick, getimagedepth, gmagick_empty_args, ZEND_ACC_PUBLIC) - PHP_ME(gmagick, getnumberimages, gmagick_empty_args, ZEND_ACC_PUBLIC) - PHP_ME(gmagick, setimagecompose, gmagick_setimagecompose_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setimagecompression, gmagick_setimagecompression_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimagecompression, gmagick_empty_args, ZEND_ACC_PUBLIC) -+ PHP_ME(gmagick, setimagecompression, gmagick_setimagecompression_args, ZEND_ACC_PUBLIC) -+ PHP_ME(gmagick, getimagecompression, gmagick_empty_args, ZEND_ACC_PUBLIC) - PHP_ME(gmagick, setimagedelay, gmagick_setimagedelay_args, ZEND_ACC_PUBLIC) - PHP_ME(gmagick, setimagedepth, gmagick_setimagedepth_args, ZEND_ACC_PUBLIC) - PHP_ME(gmagick, getimagedispose, gmagick_empty_args, ZEND_ACC_PUBLIC) -@@ -1000,9 +1000,9 @@ static zend_function_entry php_gmagick_class_methods[] = - PHP_ME(gmagick, setimagefilename, gmagick_setimagefilename_args, ZEND_ACC_PUBLIC) - PHP_ME(gmagick, getimageformat, gmagick_empty_args, ZEND_ACC_PUBLIC) - PHP_ME(gmagick, setimageformat, gmagick_setimageformat_args, ZEND_ACC_PUBLIC) --#if GMAGICK_LIB_MASK >= 1003007 -+#if GMAGICK_LIB_MASK >= 1003007 - PHP_ME(gmagick, setcompressionquality, gmagick_setcompressionquality_args, ZEND_ACC_PUBLIC) --#endif -+#endif - PHP_ME(gmagick, getimagegamma, gmagick_empty_args, ZEND_ACC_PUBLIC) - PHP_ME(gmagick, setimagegamma, gmagick_setimagegamma_args, ZEND_ACC_PUBLIC) - PHP_ME(gmagick, getimagegreenprimary, gmagick_empty_args, ZEND_ACC_PUBLIC) -@@ -1036,7 +1036,7 @@ static zend_function_entry php_gmagick_class_methods[] = - PHP_ME(gmagick, setresolution, gmagick_setresolution_args, ZEND_ACC_PUBLIC) - PHP_ME(gmagick, setimagescene, gmagick_setimagescene_args, ZEND_ACC_PUBLIC) - PHP_ME(gmagick, setimagetype, gmagick_setimagetype_args, ZEND_ACC_PUBLIC) --#ifdef GMAGICK_HAVE_SET_IMAGE_PAGE -+#ifdef GMAGICK_HAVE_SET_IMAGE_PAGE - PHP_ME(gmagick, setimagepage, gmagick_setimagepage_args, ZEND_ACC_PUBLIC) - #endif //GMAGICK_HAVE_SET_IMAGE_PAGE - PHP_ME(gmagick, getimageunits, gmagick_empty_args, ZEND_ACC_PUBLIC) -@@ -1305,7 +1305,7 @@ ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setstrokemiterlimit_args, 0, 0, 1) - ZEND_ARG_INFO(0, miterLimit) - ZEND_END_ARG_INFO() - --#if GMAGICK_LIB_MASK >= 1003000 -+#if GMAGICK_LIB_MASK >= 1003000 - ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setstrokedasharray_args, 0, 0, 1) - ZEND_ARG_INFO(0, dashArray) - ZEND_END_ARG_INFO() -@@ -1572,7 +1572,7 @@ static zend_function_entry php_gmagickdraw_class_methods[] = - PHP_ME(gmagickdraw, getstrokelinecap, gmagick_empty_args, ZEND_ACC_PUBLIC) - PHP_ME(gmagickdraw, getstrokelinejoin, gmagick_empty_args, ZEND_ACC_PUBLIC) - PHP_ME(gmagickdraw, getstrokemiterlimit, gmagick_empty_args, ZEND_ACC_PUBLIC) --#if GMAGICK_LIB_MASK >= 1003000 -+#if GMAGICK_LIB_MASK >= 1003000 - PHP_ME(gmagickdraw, getstrokedasharray, gmagick_empty_args, ZEND_ACC_PUBLIC) - PHP_ME(gmagickdraw, setstrokedasharray, gmagickdraw_setstrokedasharray_args, ZEND_ACC_PUBLIC) - #endif -@@ -1708,11 +1708,11 @@ PHP_MINIT_FUNCTION(gmagick) - { - char *cwd; - size_t cwd_len; -- -+ - zend_class_entry ce; - - ZEND_INIT_MODULE_GLOBALS(gmagick, php_gmagick_init_globals, NULL); -- -+ - /* Exception */ - INIT_CLASS_ENTRY(ce, "GmagickException", NULL); - php_gmagick_exception_class_entry = zend_register_internal_class_ex(&ce, zend_exception_get_default()); -@@ -1738,7 +1738,7 @@ PHP_MINIT_FUNCTION(gmagick) - gmagickdraw_object_handlers.offset = XtOffsetOf(php_gmagickdraw_object, zo); - gmagickdraw_object_handlers.free_obj = php_gmagickdraw_object_free_storage; - gmagickdraw_object_handlers.clone_obj = NULL; -- -+ - INIT_CLASS_ENTRY(ce, "GmagickPixel", php_gmagickpixel_class_methods); - php_gmagickpixel_sc_entry = zend_register_internal_class(&ce); - php_gmagickpixel_sc_entry->create_object = php_gmagickpixel_object_new; -@@ -1749,7 +1749,7 @@ PHP_MINIT_FUNCTION(gmagick) - - /* Initialize GraphicsMagick environment */ - cwd = virtual_getcwd_ex(&cwd_len); -- -+ - if (!cwd) - return FAILURE; - -@@ -1766,10 +1766,14 @@ PHP_MINIT_FUNCTION(gmagick) - } - /* }}} */ - --/* {{{ PHP_MSHUTDOWN_FUNCTION(gmagick) -+/* {{{ PHP_MSHUTDOWN_FUNCTION(gmagick) - */ - PHP_MSHUTDOWN_FUNCTION(gmagick) - { -+#ifndef HAVE_OMP_PAUSE_RESOURCE_ALL -+ int i; -+#endif -+ - DestroyMagick(); - #if HAVE_OMP_PAUSE_RESOURCE_ALL - // Note there is a patch to add omp_pause_resource_all to DestroyMagick() -@@ -1791,9 +1795,9 @@ PHP_MINFO_FUNCTION(gmagick) - { - const char *version; - unsigned long version_number; -- -+ - version = MagickGetVersion(&version_number); -- -+ - php_info_print_table_start(); - php_info_print_table_header(2, "gmagick module", "enabled"); - php_info_print_table_row(2, "gmagick version", PHP_GMAGICK_VERSION); -diff --git a/gmagick_methods.c b/gmagick_methods.c -index 39c48a4..4e0329c 100644 ---- a/gmagick_methods.c -+++ b/gmagick_methods.c -@@ -1,6 +1,6 @@ - /* - +----------------------------------------------------------------------+ -- | PHP Version 5 / Gmagick | -+ | PHP Version 5 / Gmagick | - +----------------------------------------------------------------------+ - | Copyright (c) 2009 Vito Chin, Mikko Koppanen | - +----------------------------------------------------------------------+ -@@ -13,27 +13,27 @@ - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Mikko Kopppanen <mkoppanen@php.net> | -- | Vito Chin <vito@php.net> | -+ | Vito Chin <vito@php.net> | - +----------------------------------------------------------------------+ - */ - - #include "php_gmagick.h" - #include "php_gmagick_macros.h" - #include "php_gmagick_helpers.h" -- --#if GMAGICK_LIB_MASK >= 1004000 -+ -+#if GMAGICK_LIB_MASK >= 1004000 - #if PHP_VERSION_ID < 50399 - static MagickBool SafeModeMonitor(const ConfirmAccessMode mode, - const char *path, - ExceptionInfo *exception) - { - ARG_NOT_USED(exception); --#if defined(CHECKUID_CHECK_FILE_AND_DIR) -+#if defined(CHECKUID_CHECK_FILE_AND_DIR) - if (PG(safe_mode) && (!php_checkuid_ex(path, NULL, CHECKUID_CHECK_FILE_AND_DIR, CHECKUID_NO_ERRORS))) { -- exception = "SafeModeFail"; -+ exception = "SafeModeFail"; - return MagickFail; - } --#endif -+#endif - return MagickPass; - } - -@@ -4546,7 +4546,7 @@ PHP_METHOD(gmagick, unsharpmaskimage) - if (php_gmagick_ensure_not_empty (intern->magick_wand) == 0) - return; - -- status = MagickUnsharpMaskImage(intern->magick_wand, radius, sigma, amount, threshold); -+ status = MagickUnsharpMaskImage(intern->magick_wand, radius, sigma, amount, threshold); - - if (status == MagickFalse) { - GMAGICK_THROW_GMAGICK_EXCEPTION(intern->magick_wand, "Unable to unsharp mask image"); -diff --git a/gmagickpixel_methods.c b/gmagickpixel_methods.c -index 88d8fb2..121a8fb 100644 ---- a/gmagickpixel_methods.c -+++ b/gmagickpixel_methods.c -@@ -330,7 +330,7 @@ PHP_METHOD(gmagickpixel, getcolorvaluequantum) - break; - - default: -- zend_throw_exception_ex(php_gmagickpixel_exception_class_entry, 2 TSRMLS_CC, "Unknown color type: %d", color_quantum); -+ zend_throw_exception_ex(php_gmagickpixel_exception_class_entry, 2 TSRMLS_CC, "Unknown color type: " ZEND_LONG_FMT, color_quantum); - RETURN_NULL(); - } - RETVAL_LONG(color_value_quantum); -@@ -391,10 +391,10 @@ PHP_METHOD(gmagickpixel, setcolorvaluequantum) - break; - - default: -- zend_throw_exception_ex(php_gmagickpixel_exception_class_entry, 2 TSRMLS_CC, "Unknown color type: %d", color_quantum); -+ zend_throw_exception_ex(php_gmagickpixel_exception_class_entry, 2 TSRMLS_CC, "Unknown color type: " ZEND_LONG_FMT, color_quantum); - RETURN_NULL(); - } - - GMAGICK_CHAIN_METHOD; - } --/* }}} */ -\ No newline at end of file -+/* }}} */ -From 0eaa4e2f191c0f6c92a24371a72948cb40343da1 Mon Sep 17 00:00:00 2001 -From: Rasmus Lerdorf <rasmus@lerdorf.com> -Date: Tue, 26 Jan 2021 14:40:25 -0800 -Subject: [PATCH 5/6] ZEND_PARSE_PARAMETERS_NONE(); cleanup - ---- - gmagick_methods.c | 498 +++++++++++++++++----------------------------- - php_gmagick.h | 26 ++- - 2 files changed, 194 insertions(+), 330 deletions(-) - -diff --git a/gmagick_methods.c b/gmagick_methods.c -index 4e0329c..d18633c 100644 ---- a/gmagick_methods.c -+++ b/gmagick_methods.c -@@ -262,7 +262,7 @@ PHP_METHOD(gmagick, resizeimage) - } - - intern = Z_GMAGICK_OBJ_P(getThis()); -- -+ - if (!php_gmagick_thumbnail_dimensions(intern->magick_wand, fit, width, height, &new_width, &new_height, legacy)) { - GMAGICK_THROW_GMAGICK_EXCEPTION(intern->magick_wand, "Unable to calculate image dimensions"); - } -@@ -286,9 +286,7 @@ PHP_METHOD(gmagick, clear) - int i, image_count; - zend_bool failure = 0; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - image_count = MagickGetNumberImages(intern->magick_wand); -@@ -298,11 +296,11 @@ PHP_METHOD(gmagick, clear) - failure = 1; - } - } -- -+ - if (failure) { - GMAGICK_THROW_GMAGICK_EXCEPTION(intern->magick_wand, "Failed to remove all images"); - } -- -+ - GMAGICK_CHAIN_METHOD; - } - /* }}} */ -@@ -315,22 +313,20 @@ PHP_METHOD(gmagick, cropimage) - php_gmagick_object *intern; - long x, y, width, height; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "llll", &width, &height, &x, &y) == FAILURE) { -- return; -- } -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); -- -+ - if (MagickCropImage(intern->magick_wand, width, height, x, y) == MagickFalse) { - GMAGICK_THROW_GMAGICK_EXCEPTION(intern->magick_wand, "Failed to crop the image"); - } -- -+ - GMAGICK_CHAIN_METHOD; - } - /* }}} */ - - /* {{{ proto Gmagick Gmagick::cropthumbnailimage(int columns, int rows[, bool legacy]) -- Creates a crop thumbnail. If legacy is true, uses the -+ Creates a crop thumbnail. If legacy is true, uses the - incorrect behaviour that was present until Gmagick 2.0.1. If false (default) it uses the correct - behaviour. - */ -@@ -357,9 +353,9 @@ PHP_METHOD(gmagick, cropthumbnailimage) - /* }}} */ - - /* {{{ proto Gmagick Gmagick::coalesceImages() -- Composites a set of images while respecting any page offsets and disposal methods. -- GIF, MIFF, and MNG animation sequences typically start with an image background and -- each subsequent image varies in size and offset. returns a new sequence where each image in the -+ Composites a set of images while respecting any page offsets and disposal methods. -+ GIF, MIFF, and MNG animation sequences typically start with an image background and -+ each subsequent image varies in size and offset. returns a new sequence where each image in the - sequence is the same size as the first and composited with the next image in the sequence. - */ - PHP_METHOD(gmagick, coalesceimages) -@@ -367,9 +363,7 @@ PHP_METHOD(gmagick, coalesceimages) - MagickWand *tmp_wand; - php_gmagick_object *intern, *intern_return; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -405,7 +399,7 @@ PHP_METHOD(gmagick, compositeimage) - source = Z_GMAGICK_OBJ_P(source_obj); - - /* -- Causes a bug with some GraphicsMagick versions where the exception is -+ Causes a bug with some GraphicsMagick versions where the exception is - not cleared. This would cause all subsequent operations to fail. - if (MagickGetNumberImages(source->magick_wand) == 0) { - GMAGICK_THROW_GMAGICK_EXCEPTION(intern->magick_wand, "The source object must contain an image"); -@@ -414,7 +408,7 @@ PHP_METHOD(gmagick, compositeimage) - if (MagickCompositeImage(intern->magick_wand, source->magick_wand, compose, x, y) == MagickFalse) { - GMAGICK_THROW_GMAGICK_EXCEPTION(intern->magick_wand, "Failed to composite the image"); - } -- -+ - GMAGICK_CHAIN_METHOD; - } - /* }}} */ -@@ -432,7 +426,7 @@ PHP_METHOD(gmagick, drawimage) - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &objvar, php_gmagickdraw_sc_entry) == FAILURE) { - return; - } -- -+ - intern = Z_GMAGICK_OBJ_P(getThis()); - - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -697,10 +691,8 @@ PHP_METHOD(gmagick, deconstructimages) - { - MagickWand *tmp_wand; - php_gmagick_object *intern, *intern_return; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -726,10 +718,8 @@ PHP_METHOD(gmagick, despeckleimage) - { - php_gmagick_object *intern; - MagickBool status; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -751,10 +741,8 @@ PHP_METHOD(gmagick, despeckleimage) - PHP_METHOD(gmagick, destroy) - { - php_gmagick_object *intern; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - -@@ -834,10 +822,8 @@ PHP_METHOD(gmagick, enhanceimage) - { - php_gmagick_object *intern; - MagickBool status; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -860,10 +846,8 @@ PHP_METHOD(gmagick, equalizeimage) - { - php_gmagick_object *intern; - MagickBool status; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -886,10 +870,8 @@ PHP_METHOD(gmagick, flipimage) - { - php_gmagick_object *intern; - MagickBool status; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -911,10 +893,8 @@ PHP_METHOD(gmagick, flopimage) - { - php_gmagick_object *intern; - MagickBool status; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -995,10 +975,8 @@ PHP_METHOD(gmagick, gammaimage) - PHP_METHOD(gmagick, getcopyright) - { - char *copyright; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - copyright = (char *)MagickGetCopyright(); - ZVAL_STRING(return_value, copyright); -@@ -1015,10 +993,8 @@ PHP_METHOD(gmagick, getfilename) - { - php_gmagick_object *intern; - char *filename; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - filename = (char *)MagickGetFilename(intern->magick_wand); -@@ -1038,12 +1014,10 @@ PHP_METHOD(gmagick, getimagebackgroundcolor) - { - php_gmagick_object *intern; - php_gmagickpixel_object *internp; -- MagickBool status; -+ MagickBool status; - PixelWand *tmp_wand; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -1076,9 +1050,7 @@ PHP_METHOD(gmagick, getimageblob) - size_t image_size; - char *buffer; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - -@@ -1095,7 +1067,7 @@ PHP_METHOD(gmagick, getimageblob) - GMAGICK_FREE_MEMORY(unsigned char *, image_contents); - return; - } --/* }}} */ -+/* }}} */ - - /* {{{ proto string Gmagick::getImagesBlob() - Returns all image sequences as a string -@@ -1109,10 +1081,8 @@ PHP_METHOD(gmagick, getimagesblob) - size_t current; - MagickBool status; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -- -+ ZEND_PARSE_PARAMETERS_NONE(); -+ - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); - -@@ -1154,7 +1124,7 @@ PHP_METHOD(gmagick, setimagebackgroundcolor) - php_gmagick_object *intern; - php_gmagickpixel_object *internp; - MagickBool status; -- -+ - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", ¶m) == FAILURE) { - return; - } -@@ -1183,10 +1153,8 @@ PHP_METHOD(gmagick, getimageblueprimary) - php_gmagick_object *intern; - MagickBool status; - double x, y; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -1214,10 +1182,8 @@ PHP_METHOD(gmagick, getimagebordercolor) - php_gmagickpixel_object *internp; - MagickBool status; - PixelWand *tmp_wand; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -1404,10 +1370,8 @@ PHP_METHOD(gmagick, getimagecolorspace) - { - php_gmagick_object *intern; - long colorSpace; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -1424,9 +1388,7 @@ PHP_METHOD(gmagick, getimagecolors) - { - php_gmagick_object *intern; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -1443,10 +1405,8 @@ PHP_METHOD(gmagick, getimagecompose) - { - php_gmagick_object *intern; - long composite; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -1463,10 +1423,8 @@ PHP_METHOD(gmagick, getimagedelay) - { - php_gmagick_object *intern; - long delay; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -1483,10 +1441,8 @@ PHP_METHOD(gmagick, getimagedepth) - { - php_gmagick_object *intern; - long depth; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -1504,10 +1460,8 @@ PHP_METHOD(gmagick, getnumberimages) - php_gmagick_object *intern; - unsigned long num_images; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -- -+ ZEND_PARSE_PARAMETERS_NONE(); -+ - intern = Z_GMAGICK_OBJ_P(getThis()); - - num_images = MagickGetNumberImages(intern->magick_wand); -@@ -1580,9 +1534,7 @@ PHP_METHOD(gmagick, getimagecompression) - { - php_gmagick_object *intern; - -- if (zend_parse_parameters_none() == FAILURE) { -- return; -- } -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - RETVAL_LONG(MagickGetImageCompression(intern->magick_wand)); -@@ -1650,11 +1602,9 @@ PHP_METHOD(gmagick, getimagedispose) - { - php_gmagick_object *intern; - long dispose; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -- -+ -+ ZEND_PARSE_PARAMETERS_NONE(); -+ - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); - -@@ -1725,10 +1675,8 @@ PHP_METHOD(gmagick, getimage) - MagickWand *tmp_wand; - php_gmagick_object *intern, *intern_return; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -- -+ ZEND_PARSE_PARAMETERS_NONE(); -+ - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); - -@@ -1785,10 +1733,8 @@ PHP_METHOD(gmagick, getimageextrema) - php_gmagick_object *intern; - unsigned long min, max; - MagickBool status; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -1815,10 +1761,8 @@ PHP_METHOD(gmagick, getimagefilename) - { - php_gmagick_object *intern; - char *filename; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -1871,10 +1815,8 @@ PHP_METHOD(gmagick, getimageformat) - { - php_gmagick_object *intern; - char *format; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - -@@ -1956,10 +1898,8 @@ PHP_METHOD(gmagick, getimagegamma) - { - php_gmagick_object *intern; - double gamma; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -2004,10 +1944,8 @@ PHP_METHOD(gmagick, getimagegreenprimary) - php_gmagick_object *intern; - double x, y; - MagickBool status; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -2061,10 +1999,8 @@ PHP_METHOD(gmagick, getimageheight) - { - php_gmagick_object *intern; - long height; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -2085,10 +2021,8 @@ PHP_METHOD(gmagick, getimagehistogram) - unsigned long colors = 0; - unsigned long i; - zval tmp_pixelwand; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -2115,10 +2049,8 @@ PHP_METHOD(gmagick, getimageindex) - { - MagickBool status; - php_gmagick_object *intern; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - -@@ -2163,10 +2095,8 @@ PHP_METHOD(gmagick, getimageinterlacescheme) - { - php_gmagick_object *intern; - long interlace; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -2199,7 +2129,7 @@ PHP_METHOD(gmagick, setimageinterlacescheme) - if (status == MagickFalse) { - GMAGICK_THROW_GMAGICK_EXCEPTION(intern->magick_wand, "Unable to set image interlace scheme"); - } -- -+ - GMAGICK_CHAIN_METHOD; - } - /* }}} */ -@@ -2211,10 +2141,8 @@ PHP_METHOD(gmagick, getimageiterations) - { - php_gmagick_object *intern; - long iterations; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -2232,10 +2160,8 @@ PHP_METHOD(gmagick, getimagegeometry) - long width,height; - php_gmagick_object *intern; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -- -+ ZEND_PARSE_PARAMETERS_NONE(); -+ - intern = Z_GMAGICK_OBJ_P(getThis()); - - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -2261,9 +2187,7 @@ PHP_METHOD(gmagick, getimagemattecolor) - MagickBool status; - PixelWand *tmp_wand; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -2296,15 +2220,13 @@ PHP_METHOD(gmagick, getimagematte) - { - php_gmagick_object *intern; - long matte; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); - -- matte = MagickGetImageMatte(intern->magick_wand); -+ matte = MagickGetImageMatte(intern->magick_wand); - - RETVAL_LONG(matte); - } -@@ -2322,9 +2244,7 @@ PHP_METHOD(gmagick, getimagepage) - unsigned long width, height; - long x, y; - -- if (zend_parse_parameters_none() == FAILURE) { -- return; -- } -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - if (php_gmagick_ensure_not_empty (intern->magick_wand) == 0) -@@ -2387,10 +2307,8 @@ PHP_METHOD(gmagick, getimageredprimary) - php_gmagick_object *intern; - MagickBool status; - double x, y; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -2416,10 +2334,8 @@ PHP_METHOD(gmagick, getimagerenderingintent) - { - php_gmagick_object *intern; - long renderingIntent; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -2439,9 +2355,7 @@ PHP_METHOD(gmagick, getimageresolution) - MagickBool status; - double x, y; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -2467,10 +2381,8 @@ PHP_METHOD(gmagick, getimagescene) - { - php_gmagick_object *intern; - unsigned long scene; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -2488,9 +2400,7 @@ PHP_METHOD(gmagick, getimagesignature) - php_gmagick_object *intern; - char *signature; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -2509,10 +2419,8 @@ PHP_METHOD(gmagick, getimagetype) - { - php_gmagick_object *intern; - long imageType; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -2750,10 +2658,8 @@ PHP_METHOD(gmagick, getimageunits) - { - php_gmagick_object *intern; - long resolutionType; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -2771,10 +2677,8 @@ PHP_METHOD(gmagick, getimagewhitepoint) - php_gmagick_object *intern; - MagickBool status; - double x, y; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -2800,10 +2704,8 @@ PHP_METHOD(gmagick, getimagewidth) - { - php_gmagick_object *intern; - unsigned long width; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -2819,10 +2721,8 @@ PHP_METHOD(gmagick, getimagewidth) - PHP_METHOD(gmagick, getpackagename) - { - char *package_name; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - package_name = (char *)MagickGetPackageName(); - ZVAL_STRING(return_value, package_name); -@@ -2839,10 +2739,8 @@ PHP_METHOD(gmagick, getquantumdepth) - { - char *quantum_depth; - unsigned long depth; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - quantum_depth = (char *)MagickGetQuantumDepth(&depth); - -@@ -2860,10 +2758,8 @@ PHP_METHOD(gmagick, getquantumdepth) - PHP_METHOD(gmagick, getreleasedate) - { - char *release_date; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - release_date = (char *)MagickGetReleaseDate(); - ZVAL_STRING(return_value, release_date); -@@ -2896,10 +2792,8 @@ PHP_METHOD(gmagick, getsamplingfactors) - php_gmagick_object *intern; - double *sampling_factors; - unsigned long number_factors = 0, i; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - -@@ -2923,10 +2817,8 @@ PHP_METHOD(gmagick, getsize) - php_gmagick_object *intern; - unsigned long columns, rows; - MagickBool status; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - status = MagickGetSize(intern->magick_wand, &columns, &rows); -@@ -3047,7 +2939,7 @@ PHP_METHOD(gmagick, setresourcelimit) - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ll", &type, &limit) == FAILURE) { - return; - } -- -+ - status = MagickSetResourceLimit(type, limit); - - /* No magick is going to happen */ -@@ -3109,10 +3001,8 @@ PHP_METHOD(gmagick, hasnextimage) - { - php_gmagick_object *intern; - MagickBool status; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - status = MagickHasNextImage(intern->magick_wand); -@@ -3134,9 +3024,7 @@ PHP_METHOD(gmagick, haspreviousimage) - php_gmagick_object *intern; - MagickBool status; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - status = MagickHasPreviousImage(intern->magick_wand); -@@ -3246,10 +3134,8 @@ PHP_METHOD(gmagick, magnifyimage) - { - php_gmagick_object *intern; - MagickBool status; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -3355,10 +3241,8 @@ PHP_METHOD(gmagick, minifyimage) - { - php_gmagick_object *intern; - MagickBool status; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -3438,9 +3322,7 @@ PHP_METHOD(gmagick, nextimage) - php_gmagick_object *intern; - MagickBool status; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - status = MagickNextImage(intern->magick_wand); -@@ -3468,12 +3350,12 @@ PHP_METHOD(gmagick, newimage) - size_t format_len = 0; - char xc_str[MAX_BUFFER_SIZE]; - -- /* Parse parameters given to function */ -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lls|s", &columns, &rows, ¶m, ¶m_len, &format, &format_len) == FAILURE) { -- return; -+ /* Parse parameters given to function */ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lls|s", &columns, &rows, ¶m, ¶m_len, &format, &format_len) == FAILURE) { -+ return; - } -- intern = Z_GMAGICK_OBJ_P(getThis()); -- -+ intern = Z_GMAGICK_OBJ_P(getThis()); -+ - if (!param_len) { - GMAGICK_THROW_EXCEPTION_WITH_MESSAGE(GMAGICK_CLASS, "The color must not be empty", 1); - } -@@ -3493,7 +3375,7 @@ PHP_METHOD(gmagick, newimage) - } - GMAGICK_CHAIN_METHOD; - } --/* }}} */ -+/* }}} */ - - /* {{{ proto Gmagick Gmagick::normalizeImage([int channel]) - Enhances the contrast of a color image by adjusting the pixels color to span the entire range of colors available -@@ -3557,10 +3439,8 @@ PHP_METHOD(gmagick, previousimage) - { - php_gmagick_object *intern; - MagickBool status; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - status = MagickPreviousImage(intern->magick_wand); -@@ -3782,9 +3662,9 @@ PHP_METHOD(gmagick, radialblurimage) - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -- // MagickRadialBlurImageChannel still not available in 1.4 -+ // MagickRadialBlurImageChannel still not available in 1.4 - #if GMAGICK_LIB_MASK >= 1005000 -- status = MagickRadialBlurImageChannel(intern->magick_wand, channel, angle); -+ status = MagickRadialBlurImageChannel(intern->magick_wand, channel, angle); - #else - status = MagickRadialBlurImage(intern->magick_wand, angle); - #endif -@@ -3938,6 +3818,8 @@ PHP_METHOD(gmagick, removeimage) - MagickBool status; - php_gmagick_object *intern; - -+ ZEND_PARSE_PARAMETERS_NONE(); -+ - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); - -@@ -4069,7 +3951,7 @@ PHP_METHOD(gmagick, rotateimage) - - /* {{{ proto Gmagick Gmagick::scaleImage(int cols, int rows[, bool fit[, bool legacy = false]] ) - Scales the size of an image to the given dimensions. Passing zero as either of -- the arguments will preserve dimension while scaling. If legacy is true, uses the -+ the arguments will preserve dimension while scaling. If legacy is true, uses the - incorrect behaviour that was present until Gmagick 2.0.1. If false (default) it uses the correct - behaviour. - */ -@@ -4089,7 +3971,7 @@ PHP_METHOD(gmagick, scaleimage) - intern = Z_GMAGICK_OBJ_P(getThis()); - - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -- -+ - if (!php_gmagick_thumbnail_dimensions(intern->magick_wand, fit, x, y, &width, &height, legacy)) { - GMAGICK_THROW_GMAGICK_EXCEPTION(intern->magick_wand, "Unable to calculate image dimensions"); - } -@@ -4145,14 +4027,14 @@ PHP_METHOD(gmagick, sharpenimage) - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "dd", &radius, &sigma) == FAILURE) { - return; - } -- -+ - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); - - status = MagickSharpenImage(intern->magick_wand, radius, sigma); -- -+ - /* No magick is going to happen */ -- if (status == MagickFalse) { -+ if (status == MagickFalse) { - GMAGICK_THROW_GMAGICK_EXCEPTION(intern->magick_wand, "Unable to sharpen image"); - } - GMAGICK_CHAIN_METHOD; -@@ -4253,10 +4135,8 @@ PHP_METHOD(gmagick, stripimage) - { - php_gmagick_object *intern; - MagickBool status; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -4371,10 +4251,8 @@ PHP_METHOD(gmagick, __tostring) - unsigned char *image; - char *buffer; - size_t image_size; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - -@@ -4408,10 +4286,8 @@ PHP_METHOD(gmagick, flattenimages) - php_gmagick_object *intern, *intern_return; - MagickWand *tmp_wand; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -- -+ ZEND_PARSE_PARAMETERS_NONE(); -+ - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); - -@@ -4433,7 +4309,7 @@ PHP_METHOD(gmagick, flattenimages) - /* {{{ proto Gmagick Gmagick::sampleImage(int cols, int rows[, bool fit[, bool legacy = false]] ) - Sample the size of an image to the given dimensions. Passing zero as either of - the arguments will preserve dimension while scaling. -- If legacy is true, uses the -+ If legacy is true, uses the - incorrect behaviour that was present until Gmagick 2.0.1. If false (default) it uses the correct - behaviour. - */ -@@ -4477,10 +4353,8 @@ PHP_METHOD(gmagick, cloneimage) - MagickWand *tmp_wand; - php_gmagick_object *intern, *intern_return; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -- -+ ZEND_PARSE_PARAMETERS_NONE(); -+ - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); - -@@ -4507,10 +4381,8 @@ PHP_METHOD(gmagick, appendimages) - zend_bool stack = 0; - php_gmagick_object *intern, *intern_return; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -- -+ ZEND_PARSE_PARAMETERS_NONE(); -+ - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); - -@@ -4549,7 +4421,7 @@ PHP_METHOD(gmagick, unsharpmaskimage) - status = MagickUnsharpMaskImage(intern->magick_wand, radius, sigma, amount, threshold); - - if (status == MagickFalse) { -- GMAGICK_THROW_GMAGICK_EXCEPTION(intern->magick_wand, "Unable to unsharp mask image"); -+ GMAGICK_THROW_GMAGICK_EXCEPTION(intern->magick_wand, "Unable to unsharp mask image"); - return; - } - RETURN_TRUE; -@@ -4561,23 +4433,23 @@ PHP_METHOD(gmagick, unsharpmaskimage) - */ - PHP_METHOD(gmagick, setresolution) - { -- php_gmagick_object *intern; -- MagickBool status; -- double x_resolution, y_resolution; -+ php_gmagick_object *intern; -+ MagickBool status; -+ double x_resolution, y_resolution; - -- /* Parse parameters given to function */ -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "dd", &x_resolution, &y_resolution) == FAILURE) { -- return; -- } -+ /* Parse parameters given to function */ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "dd", &x_resolution, &y_resolution) == FAILURE) { -+ return; -+ } - - intern = Z_GMAGICK_OBJ_P(getThis()); -- status = MagickSetResolution(intern->magick_wand, x_resolution, y_resolution); -+ status = MagickSetResolution(intern->magick_wand, x_resolution, y_resolution); - -- if (status == MagickFalse) { -- GMAGICK_THROW_GMAGICK_EXCEPTION(intern->magick_wand, "Unable to set resolution"); -- return; -- } -- RETURN_TRUE; -+ if (status == MagickFalse) { -+ GMAGICK_THROW_GMAGICK_EXCEPTION(intern->magick_wand, "Unable to set resolution"); -+ return; -+ } -+ RETURN_TRUE; - } - /* }}} */ - -@@ -4648,9 +4520,7 @@ PHP_METHOD(gmagick, averageimages) - MagickWand *tmp_wand; - php_gmagick_object *intern, *intern_return; - -- if (zend_parse_parameters_none() == FAILURE) { -- return; -- } -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -4740,9 +4610,7 @@ PHP_METHOD(gmagick, clipimage) - php_gmagick_object *intern; - unsigned int status; - -- if (zend_parse_parameters_none() == FAILURE) { -- return; -- } -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - -@@ -4827,9 +4695,9 @@ PHP_METHOD(gmagick, colorfloodfillimage) - - - /* {{{ proto bool Gmagick::colorizeImage(GmagickPixel colorize, GmagickPixel opacity) -- Blends the fill color with each pixel in the image. The 'opacity' color is a -+ Blends the fill color with each pixel in the image. The 'opacity' color is a - per channel strength factor for how strongly the color should be applied. If -- legacy is true, the behaviour of this function is incorrect, but consistent -+ legacy is true, the behaviour of this function is incorrect, but consistent - with how it behaved before Gmagick version 3.4.0 - */ - PHP_METHOD(gmagick, colorizeimage) -@@ -5212,9 +5080,7 @@ PHP_METHOD(gmagick, getimagegravity) - { - php_gmagick_object *intern; - -- if (zend_parse_parameters_none() == FAILURE) { -- return; -- } -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -5232,9 +5098,7 @@ PHP_METHOD(gmagick, getimagevirtualpixelmethod) - php_gmagick_object *intern; - long pixelMethod; - -- if (zend_parse_parameters_none() == FAILURE) { -- return; -- } -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -5396,9 +5260,7 @@ PHP_METHOD(gmagick, mosaicimages) - MagickWand *tmp_wand = NULL; - php_gmagick_object *intern, *intern_return; - -- if (zend_parse_parameters_none() == FAILURE) { -- return; -- } -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -5799,9 +5661,7 @@ PHP_METHOD(gmagick, getimagefuzz) - php_gmagick_object *intern; - double fuzz; - -- if (zend_parse_parameters_none() == FAILURE) { -- return; -- } -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -5821,9 +5681,7 @@ PHP_METHOD(gmagick, getimagesavedtype) - php_gmagick_object *intern; - ImageType type; - -- if (zend_parse_parameters_none() == FAILURE) { -- return; -- } -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -5894,7 +5752,7 @@ PHP_METHOD(gmagick, setimagefuzz) - - /* {{{ proto bool Gmagick::setimageoption(string format, string key, string value) - MagickSetImageOption() associates one or options with a particular image format (.e.g MagickSetImageOption(wand,"jpeg","preserve-settings","true"). -- -+ - "jpeg","preserve-settings","true"). - */ - PHP_METHOD(gmagick, setimageoption) -@@ -5905,7 +5763,7 @@ PHP_METHOD(gmagick, setimageoption) - unsigned int status; - - /* Parse parameters given to function */ -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sss", -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sss", - &format, &format_len, - &key, &key_len, - &value, &value_len) == FAILURE) { -diff --git a/php_gmagick.h b/php_gmagick.h -index ef903fc..7ad64a1 100644 ---- a/php_gmagick.h -+++ b/php_gmagick.h -@@ -13,7 +13,7 @@ - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Mikko Kopppanen <mkoppanen@php.net> | -- | Vito Chin <vito@php.net> | -+ | Vito Chin <vito@php.net> | - +----------------------------------------------------------------------+ - */ - -@@ -35,7 +35,7 @@ - ssize_t were there with much more probability. */ - # ifdef _WIN64 - typedef __int64 ssize_t; --# else -+# else - typedef long ssize_t; - # endif - #endif -@@ -76,41 +76,47 @@ typedef long ssize_t; - # define IS_MIXED 0 - #endif - -+#ifndef ZEND_PARSE_PARAMETERS_NONE -+#define ZEND_PARSE_PARAMETERS_NONE() \ -+ ZEND_PARSE_PARAMETERS_START(0, 0) \ -+ ZEND_PARSE_PARAMETERS_END() -+#endif -+ - #ifndef ZEND_ARG_INFO_WITH_DEFAULT_VALUE - #define ZEND_ARG_INFO_WITH_DEFAULT_VALUE(pass_by_ref, name, default_value) \ -- ZEND_ARG_INFO(pass_by_ref, name) -+ ZEND_ARG_INFO(pass_by_ref, name) - #endif - - #if PHP_VERSION_ID < 70200 - #undef ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX - #define ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, class_name, allow_null) \ -- static const zend_internal_arg_info name[] = { \ -- { (const char*)(zend_uintptr_t)(required_num_args), ( #class_name ), 0, return_reference, allow_null, 0 }, -+ static const zend_internal_arg_info name[] = { \ -+ { (const char*)(zend_uintptr_t)(required_num_args), ( #class_name ), 0, return_reference, allow_null, 0 }, - #endif - - #ifndef ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX - # define ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(name, return_reference, required_num_args, class_name, allow_null) \ -- ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, class_name, allow_null) -+ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, class_name, allow_null) - #endif - - #ifndef ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX - # define ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(name, return_reference, num_args, type) \ -- ZEND_BEGIN_ARG_INFO_EX(name, 0, return_reference, num_args) -+ ZEND_BEGIN_ARG_INFO_EX(name, 0, return_reference, num_args) - #endif - - #ifndef ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX - # define ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(name, return_reference, required_num_args, class_name, type) \ -- ZEND_BEGIN_ARG_INFO_EX(name, 0, return_reference, required_num_args) -+ ZEND_BEGIN_ARG_INFO_EX(name, 0, return_reference, required_num_args) - #endif - - #ifndef ZEND_ARG_TYPE_MASK - # define ZEND_ARG_TYPE_MASK(pass_by_ref, name, type_mask, default_value) \ -- ZEND_ARG_TYPE_INFO(pass_by_ref, name, 0, 0) -+ ZEND_ARG_TYPE_INFO(pass_by_ref, name, 0, 0) - #endif - - #ifndef ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE - # define ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(pass_by_ref, name, type_hint, allow_null, default_value) \ -- ZEND_ARG_TYPE_INFO(pass_by_ref, name, type_hint, allow_null) -+ ZEND_ARG_TYPE_INFO(pass_by_ref, name, type_hint, allow_null) - #endif - - #if GMAGICK_LIB_MASK >= 1003018 - -From fa15893f53c8be98476d120e7aa0bb627aa7fa00 Mon Sep 17 00:00:00 2001 -From: Rasmus Lerdorf <rasmus@lerdorf.com> -Date: Tue, 26 Jan 2021 23:29:27 -0800 -Subject: [PATCH 6/6] Add proper generated PHP 8 arginfo tested backwards - commpatible back to 7.0 - ---- - config.m4 | 14 +- - gmagick.c | 1453 +------------------------------ - gmagick.stub.php | 377 ++++++++ - gmagick_arginfo.h | 1859 ++++++++++++++++++++++++++++++++++++++++ - gmagick_methods.c | 466 +++++----- - gmagickdraw_methods.c | 379 ++++---- - gmagickpixel_methods.c | 52 +- - php_gmagick.h | 5 + - 8 files changed, 2688 insertions(+), 1917 deletions(-) - create mode 100644 gmagick.stub.php - create mode 100644 gmagick_arginfo.h - -diff --git a/config.m4 b/config.m4 -index 62eeaf1..aabef60 100644 ---- a/config.m4 -+++ b/config.m4 -@@ -4,18 +4,18 @@ PHP_ARG_WITH(gmagick, whether to enable the gmagick extension, - if test $PHP_GMAGICK != "no"; then - - AC_MSG_CHECKING(GraphicsMagick configuration program) -- -+ - for i in $PHP_GMAGICK /usr/local /usr; - do - test -r $i/bin/GraphicsMagick-config && WAND_BINARY=$i/bin/GraphicsMagick-config && break -- done -- -+ done -+ - if test -z "$WAND_BINARY"; then - AC_MSG_ERROR(not found. Please provide a path to GraphicsMagick-config program.) - fi -- -+ - AC_MSG_RESULT(found in $WAND_BINARY) -- -+ - AC_MSG_CHECKING(GraphicsMagick version) - WAND_DIR=`$WAND_BINARY --prefix` - -@@ -52,9 +52,9 @@ if test $PHP_GMAGICK != "no"; then - PHP_ADD_LIBRARY_WITH_PATH(GraphicsMagickWand, $LIB_DIR, GMAGICK_SHARED_LIBADD) - PHP_ADD_INCLUDE($WAND_DIR/include/GraphicsMagick) - -- PHP_NEW_EXTENSION(gmagick, gmagick_helpers.c gmagick_methods.c gmagick.c gmagickdraw_methods.c gmagickpixel_methods.c, $ext_shared) -+ PHP_NEW_EXTENSION(gmagick, gmagick_helpers.c gmagick_methods.c gmagick.c gmagickdraw_methods.c gmagickpixel_methods.c, $ext_shared) - -- PHP_SUBST(GMAGICK_SHARED_LIBADD) -+ PHP_SUBST(GMAGICK_SHARED_LIBADD) - AC_DEFINE(HAVE_GMAGICK,1,[ ]) - AC_DEFINE_UNQUOTED(GMAGICK_LIB_MASK,$GRAPHICSMAGICK_VERSION_MASK,[Version mask for comparisons]) - fi -diff --git a/gmagick.c b/gmagick.c -index fbae482..5102a42 100644 ---- a/gmagick.c -+++ b/gmagick.c -@@ -20,6 +20,7 @@ - #include "php_gmagick.h" - #include "php_gmagick_macros.h" - #include "php_gmagick_helpers.h" -+#include "gmagick_arginfo.h" - - ZEND_DECLARE_MODULE_GLOBALS(gmagick) - -@@ -248,1450 +249,6 @@ static zend_object *php_gmagick_clone_gmagickpixel_object(zend_object *this_ptr) - #endif - /* }}} */ - --ZEND_BEGIN_ARG_INFO_EX(gmagick_empty_args, 0, 0, 0) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_constructor_args, 0, 0, 0) -- ZEND_ARG_INFO(0, filename) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_addimage_args, 0, 0, 1) -- ZEND_ARG_OBJ_INFO(0, Gmagick, Gmagick, 0) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_addnoiseimage_args, 0, 0, 1) -- ZEND_ARG_INFO(0, NOISE) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_annotateimage_args, 0, 0, 5) -- ZEND_ARG_OBJ_INFO(0, GmagickDraw, GmagickDraw, 0) -- ZEND_ARG_INFO(0, x) -- ZEND_ARG_INFO(0, y) -- ZEND_ARG_INFO(0, angle) -- ZEND_ARG_INFO(0, text) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_blurimage_args, 0, 0, 2) -- ZEND_ARG_INFO(0, radius) -- ZEND_ARG_INFO(0, sigma) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_borderimage_args, 0, 0, 3) -- ZEND_ARG_INFO(0, color) -- ZEND_ARG_INFO(0, width) -- ZEND_ARG_INFO(0, height) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_thresholdimage_args, 0, 0, 1) -- ZEND_ARG_INFO(0, threshold) -- ZEND_ARG_INFO(0, CHANNELTYPE) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_charcoalimage_args, 0, 0, 2) -- ZEND_ARG_INFO(0, radius) -- ZEND_ARG_INFO(0, sigma) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_chopimage_args, 0, 0, 4) -- ZEND_ARG_INFO(0, width) -- ZEND_ARG_INFO(0, height) -- ZEND_ARG_INFO(0, x) -- ZEND_ARG_INFO(0, y) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_commentimage_args, 0, 0, 1) -- ZEND_ARG_INFO(0, comment) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_cropthumbnailimage_args, 0, 0, 2) -- ZEND_ARG_INFO(0, width) -- ZEND_ARG_INFO(0, height) -- ZEND_ARG_INFO(0, fit) -- ZEND_ARG_INFO(0, legacy) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_cyclecolormapimage_args, 0, 0, 1) -- ZEND_ARG_INFO(0, displace) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_readimage_args, 0, 0, 1) -- ZEND_ARG_INFO(0, filename) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_writeimage_args, 0, 0, 1) -- ZEND_ARG_INFO(0, filename) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_resizeimage_args, 0, 0, 5) -- ZEND_ARG_INFO(0, width) -- ZEND_ARG_INFO(0, height) -- ZEND_ARG_INFO(0, filter) -- ZEND_ARG_INFO(0, blur) -- ZEND_ARG_INFO(0, fit) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_thumbnailimage_args, 0, 0, 2) -- ZEND_ARG_INFO(0, width) -- ZEND_ARG_INFO(0, height) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_cropimage_args, 0, 0, 4) -- ZEND_ARG_INFO(0, x) -- ZEND_ARG_INFO(0, y) -- ZEND_ARG_INFO(0, width) -- ZEND_ARG_INFO(0, height) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_compositeimage_args, 0, 0, 4) -- ZEND_ARG_OBJ_INFO(0, source, Gmagick, 0) -- ZEND_ARG_INFO(0, COMPOSE) -- ZEND_ARG_INFO(0, x) -- ZEND_ARG_INFO(0, y) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_drawimage_args, 0, 0, 1) -- ZEND_ARG_OBJ_INFO(0, GmagickDraw, GmagickDraw, 0) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_edgeimage_args, 0, 0, 1) -- ZEND_ARG_INFO(0, radius) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_embossimage_args, 0, 0, 2) -- ZEND_ARG_INFO(0, radius) -- ZEND_ARG_INFO(0, sigma) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_frameimage_args, 0, 0, 5) -- ZEND_ARG_INFO(0, color) -- ZEND_ARG_INFO(0, width) -- ZEND_ARG_INFO(0, height) -- ZEND_ARG_INFO(0, inner_bevel) -- ZEND_ARG_INFO(0, outer_bevel) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_gammaimage_args, 0, 0, 1) -- ZEND_ARG_INFO(0, gamma) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setimage_args, 0, 0, 1) -- ZEND_ARG_OBJ_INFO(0, Gmagick, Gmagick, 0) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setimagebackgroundcolor_args, 0, 0, 1) -- ZEND_ARG_INFO(0, color) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setimageblueprimary_args, 0, 0, 2) -- ZEND_ARG_INFO(0, x) -- ZEND_ARG_INFO(0, y) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setimagebordercolor_args, 0, 0, 1) -- ZEND_ARG_INFO(0, color) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setimagechanneldepth_args, 0, 0, 2) -- ZEND_ARG_INFO(0, CHANNEL) -- ZEND_ARG_INFO(0, depth) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setimagecolormapcolor_args, 0, 0, 2) -- ZEND_ARG_INFO(0, index) -- ZEND_ARG_INFO(0, color) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setimagecolorspace_args, 0, 0, 1) -- ZEND_ARG_INFO(0, COLORSPACE) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setinterlacescheme_args, 0, 0, 1) -- ZEND_ARG_INFO(0, INTERLACE) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setimagecompose_args, 0, 0, 1) -- ZEND_ARG_INFO(0, COMPOSITE) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setimagecompression_args, 0, 0, 1) -- ZEND_ARG_INFO(0, COMPRESSION) -- ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setimagedelay_args, 0, 0, 1) -- ZEND_ARG_INFO(0, delay) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setimagedepth_args, 0, 0, 1) -- ZEND_ARG_INFO(0, depth) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setimagedispose_args, 0, 0, 1) -- ZEND_ARG_INFO(0, DISPOSETYPE) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setfilename_args, 0, 0, 1) -- ZEND_ARG_INFO(0, filename) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setimagefilename_args, 0, 0, 1) -- ZEND_ARG_INFO(0, filename) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setimageformat_args, 0, 0, 1) -- ZEND_ARG_INFO(0, imageFormat) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setcompressionquality_args, 0, 0, 1) -- ZEND_ARG_INFO(0, quality) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setimagegamma_args, 0, 0, 1) -- ZEND_ARG_INFO(0, gamma) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setimagegreenprimary_args, 0, 0, 2) -- ZEND_ARG_INFO(0, x) -- ZEND_ARG_INFO(0, y) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setimageindex_args, 0, 0, 1) -- ZEND_ARG_INFO(0, index) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setimageinterlacescheme_args, 0, 0, 1) -- ZEND_ARG_INFO(0, INTERLACE) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setimageiterations_args, 0, 0, 1) -- ZEND_ARG_INFO(0, iterations) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setimageprofile_args, 0, 0, 2) -- ZEND_ARG_INFO(0, name) -- ZEND_ARG_INFO(0, profile) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setimageredprimary_args, 0, 0, 2) -- ZEND_ARG_INFO(0, x) -- ZEND_ARG_INFO(0, y) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setimagerenderingintent_args, 0, 0, 1) -- ZEND_ARG_INFO(0, RENDERINGINTENT) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setimageresolution_args, 0, 0, 2) -- ZEND_ARG_INFO(0, xResolution) -- ZEND_ARG_INFO(0, yResolution) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setresolution_args, 0, 0, 2) -- ZEND_ARG_INFO(0, xResolution) -- ZEND_ARG_INFO(0, yResolution) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setimagescene_args, 0, 0, 1) -- ZEND_ARG_INFO(0, scene) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setimagetype_args, 0, 0, 1) -- ZEND_ARG_INFO(0, IMGTYPE) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setimagepage_args, 0, 0, 4) -- ZEND_ARG_INFO(0, width) -- ZEND_ARG_INFO(0, height) -- ZEND_ARG_INFO(0, x) -- ZEND_ARG_INFO(0, y) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setimageunits_args, 0, 0, 1) -- ZEND_ARG_INFO(0, RESOLUTION) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setimagewhitepoint_args, 0, 0, 2) -- ZEND_ARG_INFO(0, x) -- ZEND_ARG_INFO(0, y) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setsamplingfactors_args, 0, 0, 1) -- ZEND_ARG_INFO(0, factors) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setsize_args, 0, 0, 2) -- ZEND_ARG_INFO(0, columns) -- ZEND_ARG_INFO(0, rows) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_getimagetotalinkdensity_args, 0, 0, 1) -- ZEND_ARG_INFO(0, radius) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_labelimage_args, 0, 0, 1) -- ZEND_ARG_INFO(0, label) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_levelimage_args, 0, 0, 3) -- ZEND_ARG_INFO(0, blackPoint) -- ZEND_ARG_INFO(0, gamma) -- ZEND_ARG_INFO(0, whitePoint) -- ZEND_ARG_INFO(0, CHANNEL) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_mapimage_args, 0, 0, 2) -- ZEND_ARG_OBJ_INFO(0, gmagick, gmagick, 0) -- ZEND_ARG_INFO(0, dither) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_medianfilterimage_args, 0, 0, 1) -- ZEND_ARG_INFO(0, radius) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_negateimage_args, 0, 0, 1) -- ZEND_ARG_INFO(0, gray) -- ZEND_ARG_INFO(0, CHANNEL) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_modulateimage_args, 0, 0, 3) -- ZEND_ARG_INFO(0, brightness) -- ZEND_ARG_INFO(0, saturation) -- ZEND_ARG_INFO(0, hue) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_morphimages_args, 0, 0, 1) -- ZEND_ARG_INFO(0, frames) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_motionblurimage_args, 0, 0, 3) -- ZEND_ARG_INFO(0, radius) -- ZEND_ARG_INFO(0, sigma) -- ZEND_ARG_INFO(0, angle) --ZEND_END_ARG_INFO() -- -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_newimage_args, 0, 0, 3) -- ZEND_ARG_INFO(0, columns) -- ZEND_ARG_INFO(0, rows) -- ZEND_ARG_INFO(0, background_color) -- ZEND_ARG_INFO(0, format) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_newpseudoimage_args, 0, 0, 3) -- ZEND_ARG_INFO(0, columns) -- ZEND_ARG_INFO(0, rows) -- ZEND_ARG_INFO(0, pseudoString) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_getresourcelimit_args, 0, 0, 1) -- ZEND_ARG_INFO(0, resource_type) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setresourcelimit_args, 0, 0, 2) -- ZEND_ARG_INFO(0, RESOURCETYPE) -- ZEND_ARG_INFO(0, limit) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_normalizeimage_args, 0, 0, 0) -- ZEND_ARG_INFO(0, CHANNEL) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_oilpaintimage_args, 0, 0, 1) -- ZEND_ARG_INFO(0, radius) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_previewimages_args, 0, 0, 1) -- ZEND_ARG_INFO(0, PREVIEW) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_profileimage_args, 0, 0, 2) -- ZEND_ARG_INFO(0, name) -- ZEND_ARG_INFO(0, profile) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_quantizeimage_args, 0, 0, 5) -- ZEND_ARG_INFO(0, numColors) -- ZEND_ARG_INFO(0, COLORSPACE) -- ZEND_ARG_INFO(0, treeDepth) -- ZEND_ARG_INFO(0, dither) -- ZEND_ARG_INFO(0, measureError) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_quantizeimages_args, 0, 0, 5) -- ZEND_ARG_INFO(0, numColors) -- ZEND_ARG_INFO(0, COLORSPACE) -- ZEND_ARG_INFO(0, treeDepth) -- ZEND_ARG_INFO(0, dither) -- ZEND_ARG_INFO(0, measureError) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_queryfonts_args, 0, 0, 1) -- ZEND_ARG_INFO(0, pattern) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_queryfontmetrics_args, 0, 0, 2) -- ZEND_ARG_OBJ_INFO(0, GmagickDraw, GmagickDraw, 0) -- ZEND_ARG_INFO(0, text) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_queryformats_args, 0, 0, 1) -- ZEND_ARG_INFO(0, pattern) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_radialblurimage_args, 0, 0, 1) -- ZEND_ARG_INFO(0, angle) -- ZEND_ARG_INFO(0, CHANNEL) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_raiseimage_args, 0, 0, 5) -- ZEND_ARG_INFO(0, width) -- ZEND_ARG_INFO(0, height) -- ZEND_ARG_INFO(0, x) -- ZEND_ARG_INFO(0, y) -- ZEND_ARG_INFO(0, raise) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_readimageblob_args, 0, 0, 1) -- ZEND_ARG_INFO(0, imageContents) -- ZEND_ARG_INFO(0, filename) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_readimagefile_args, 0, 0, 1) -- ZEND_ARG_INFO(0, fp) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_reducenoiseimage_args, 0, 0, 1) -- ZEND_ARG_INFO(0, radius) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_removeimageprofile_args, 0, 0, 1) -- ZEND_ARG_INFO(0, name) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_resampleimage_args, 0, 0, 4) -- ZEND_ARG_INFO(0, xResolution) -- ZEND_ARG_INFO(0, yResolution) -- ZEND_ARG_INFO(0, FILTER) -- ZEND_ARG_INFO(0, blur) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_rollimage_args, 0, 0, 2) -- ZEND_ARG_INFO(0, x) -- ZEND_ARG_INFO(0, y) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_rotateimage_args, 0, 0, 2) -- ZEND_ARG_INFO(0, color) -- ZEND_ARG_INFO(0, degrees) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_scaleimage_args, 0, 0, 2) -- ZEND_ARG_INFO(0, width) -- ZEND_ARG_INFO(0, height) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_separateimagechannel_args, 0, 0, 1) -- ZEND_ARG_INFO(0, CHANNEL) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_sharpenimage_args, 0, 0, 2) -- ZEND_ARG_INFO(0, radius) -- ZEND_ARG_INFO(0, sigma) -- ZEND_ARG_INFO(0, CHANNEL) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_shearimage_args, 0, 0, 3) -- ZEND_ARG_INFO(0, color) -- ZEND_ARG_INFO(0, xShear) -- ZEND_ARG_INFO(0, yShear) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_solarizeimage_args, 0, 0, 1) -- ZEND_ARG_INFO(0, threshold) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_spreadimage_args, 0, 0, 1) -- ZEND_ARG_INFO(0, radius) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_swirlimage_args, 0, 0, 1) -- ZEND_ARG_INFO(0, degrees) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_trimimage_args, 0, 0, 1) -- ZEND_ARG_INFO(0, fuzz) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_whitethresholdimage_args, 0, 0, 1) -- ZEND_ARG_INFO(0, color) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_writeimages_args, 0, 0, 2) -- ZEND_ARG_INFO(0, filename) -- ZEND_ARG_INFO(0, adjoin) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_sampleimage_args, 0, 0, 2) -- ZEND_ARG_INFO(0, columns) -- ZEND_ARG_INFO(0, rows) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_appendimages_args, 0, 0, 1) -- ZEND_ARG_INFO(0, stack) --ZEND_END_ARG_INFO() -- -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_unsharpmaskimage_args, 0, 0, 4) -- ZEND_ARG_INFO(0, radius) -- ZEND_ARG_INFO(0, sigma) -- ZEND_ARG_INFO(0, amount) -- ZEND_ARG_INFO(0, threshold) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_adaptivethresholdimage_args, 0, 0, 3) -- ZEND_ARG_INFO(0, width) -- ZEND_ARG_INFO(0, height) -- ZEND_ARG_INFO(0, offset) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_affinetransformimage_args, 0, 0, 1) -- ZEND_ARG_OBJ_INFO(0, GmagickDraw, GmagickDraw, 0) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_blackthresholdimage_args, 0, 0, 1) -- ZEND_ARG_INFO(0, color) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_colordecisionlist_args, 0, 0, 1) -- ZEND_ARG_INFO(0, antialias) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_clippathimage_args, 0, 0, 2) -- ZEND_ARG_INFO(0, pathname) -- ZEND_ARG_INFO(0, inside) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_colorfloodfillimage_args, 0, 0, 5) -- ZEND_ARG_INFO(0, fill_color) -- ZEND_ARG_INFO(0, fuzz) -- ZEND_ARG_INFO(0, border_color) -- ZEND_ARG_INFO(0, y) -- ZEND_ARG_INFO(0, x) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_colorizeimage_args, 0, 0, 2) -- ZEND_ARG_INFO(0, colorize_color) -- ZEND_ARG_INFO(0, opacity) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_compareimagechannels_args, 0, 0, 3) -- ZEND_ARG_OBJ_INFO(0, Gmagick, Gmagick, 0) -- ZEND_ARG_INFO(0, channel) -- ZEND_ARG_INFO(0, metric) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_compareimages_args, 0, 0, 2) -- ZEND_ARG_OBJ_INFO(0, Gmagick, Gmagick, 0) -- ZEND_ARG_INFO(0, metric) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_contrastimage_args, 0, 0, 1) -- ZEND_ARG_INFO(0, sharpen) --ZEND_END_ARG_INFO() --ZEND_BEGIN_ARG_INFO_EX(gmagick_convolveimage_args, 0, 0, 1) -- ZEND_ARG_INFO(0, kernel) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_extentimage_args, 0, 0, 4) -- ZEND_ARG_INFO(0, width) -- ZEND_ARG_INFO(0, height) -- ZEND_ARG_INFO(0, x) -- ZEND_ARG_INFO(0, y) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_getimageattribute_args, 0, 0, 1) -- ZEND_ARG_INFO(0, key) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_getimagechannelextrema_args, 0, 0, 1) -- ZEND_ARG_INFO(0, channel) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_getimagechannelmean_args, 0, 0, 1) -- ZEND_ARG_INFO(0, channel) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_getimagecolormapcolor_args, 0, 0, 1) -- ZEND_ARG_INFO(0, index) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_haldclutimage_args, 0, 0, 1) -- ZEND_ARG_OBJ_INFO(0, Gmagick, Gmagick, 0) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_mattefloodfillimage_args, 0, 0, 5) -- ZEND_ARG_INFO(0, alpha) -- ZEND_ARG_INFO(0, fuzz) -- ZEND_ARG_INFO(0, color) -- ZEND_ARG_INFO(0, x) -- ZEND_ARG_INFO(0, y) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_montageimage_args, 0, 0, 5) -- ZEND_ARG_OBJ_INFO(0, GmagickDraw, GmagickDraw, 0) -- ZEND_ARG_INFO(0, tile_geometry) -- ZEND_ARG_INFO(0, thumbnail_geometry) -- ZEND_ARG_INFO(0, montageMode) -- ZEND_ARG_INFO(0, frame) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setimageattribute_args, 0, 0, 2) -- ZEND_ARG_INFO(0, key) -- ZEND_ARG_INFO(0, value) --ZEND_END_ARG_INFO() -- --#ifdef HAVE_GMAGICK_SET_IMAGE_GRAVITY --ZEND_BEGIN_ARG_INFO_EX(gmagick_setimagegravity_args, 0, 0, 1) -- ZEND_ARG_INFO(0, gravity) --ZEND_END_ARG_INFO() --#endif //HAVE_GMAGICK_SET_IMAGE_GRAVITY -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setimagemattecolor_args, 0, 0, 1) -- ZEND_ARG_INFO(0, color) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setimagevirtualpixelmethod_args, 0, 0, 1) -- ZEND_ARG_INFO(0, virtual_pixel_method) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_shaveimage_args, 0, 0, 2) -- ZEND_ARG_INFO(0, columns) -- ZEND_ARG_INFO(0, rows) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_steganoimage_args, 0, 0, 2) -- ZEND_ARG_OBJ_INFO(0, Gmagick, Gmagick, 0) -- ZEND_ARG_INFO(0, offset) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_stereoimage_args, 0, 0, 1) -- ZEND_ARG_OBJ_INFO(0, Gmagick, Gmagick, 0) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_waveimage_args, 0, 0, 2) -- ZEND_ARG_INFO(0, amplitude) -- ZEND_ARG_INFO(0, waveLength) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_getimageboundingbox_args, 0, 0, 1) -- ZEND_ARG_INFO(0, fuzz) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setdepth_args, 0, 0, 1) -- ZEND_ARG_INFO(0, depth) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setformat_args, 0, 0, 1) -- ZEND_ARG_INFO(0, format) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setimagefuzz_args, 0, 0, 1) -- ZEND_ARG_INFO(0, fuzz) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setimageoption_args, 0, 0, 3) -- ZEND_ARG_INFO(0, format) -- ZEND_ARG_INFO(0, key) -- ZEND_ARG_INFO(0, value) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_setimagesavedtype_args, 0, 0, 1) -- ZEND_ARG_INFO(0, type) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setresolutionunits_args, 0, 0, 2) -- ZEND_ARG_INFO(0, x_resolution) -- ZEND_ARG_INFO(0, y_resolution) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagick_writeimagefile_args, 0, 0, 1) -- ZEND_ARG_INFO(0, handle) -- ZEND_ARG_INFO(0, format) --ZEND_END_ARG_INFO() -- -- --/* {{{ static zend_function_entry php_gmagick_functions[] --*/ --static zend_function_entry php_gmagick_functions[] = --{ -- { NULL, NULL, NULL } --}; --/* }}} */ -- --/* {{{ static zend_function_entry php_gmagick_functions[] --*/ --static zend_function_entry php_gmagick_class_methods[] = --{ -- PHP_ME(gmagick, __construct, gmagick_constructor_args, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) -- PHP_ME(gmagick, __tostring, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, readimage, gmagick_readimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, writeimage, gmagick_writeimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, resizeimage, gmagick_resizeimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, thumbnailimage, gmagick_thumbnailimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, clear, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, cropimage, gmagick_cropimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, coalesceimages, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, compositeimage, gmagick_compositeimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, drawimage, gmagick_drawimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, annotateimage, gmagick_annotateimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, blurimage, gmagick_blurimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, addimage, gmagick_addimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, addnoiseimage, gmagick_addnoiseimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, negateimage, gmagick_negateimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, borderimage, gmagick_borderimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, thresholdimage, gmagick_thresholdimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, charcoalimage, gmagick_charcoalimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, chopimage, gmagick_chopimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, commentimage, gmagick_commentimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, current, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, cropthumbnailimage, gmagick_cropthumbnailimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, cyclecolormapimage, gmagick_cyclecolormapimage_args,ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, deconstructimages, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, despeckleimage, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, destroy, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, edgeimage, gmagick_edgeimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, embossimage, gmagick_embossimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, enhanceimage, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, equalizeimage, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, flattenimages, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, flipimage, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, flopimage, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, frameimage, gmagick_frameimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, gammaimage, gmagick_gammaimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getcopyright, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getfilename, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimagebackgroundcolor, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setimagebackgroundcolor, gmagick_setimagebackgroundcolor_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimageblueprimary, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimagebordercolor, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimagechanneldepth, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setimageblueprimary, gmagick_setimageblueprimary_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setimagebordercolor, gmagick_setimagebordercolor_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimageblob, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimagesblob, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setimagechanneldepth, gmagick_setimagechanneldepth_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setimagecolorspace, gmagick_setimagecolorspace_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setinterlacescheme, gmagick_setinterlacescheme_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimagecolorspace, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimagecolors, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimagecompose, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimagedelay, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimagedepth, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getnumberimages, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setimagecompose, gmagick_setimagecompose_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setimagecompression, gmagick_setimagecompression_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimagecompression, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setimagedelay, gmagick_setimagedelay_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setimagedepth, gmagick_setimagedepth_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimagedispose, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setimagedispose, gmagick_setimagedispose_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setfilename, gmagick_setfilename_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimageextrema, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimagefilename, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setimagefilename, gmagick_setimagefilename_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimageformat, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setimageformat, gmagick_setimageformat_args, ZEND_ACC_PUBLIC) --#if GMAGICK_LIB_MASK >= 1003007 -- PHP_ME(gmagick, setcompressionquality, gmagick_setcompressionquality_args, ZEND_ACC_PUBLIC) --#endif -- PHP_ME(gmagick, getimagegamma, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setimagegamma, gmagick_setimagegamma_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimagegreenprimary, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setimagegreenprimary, gmagick_setimagegreenprimary_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimageheight, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimagehistogram, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimageindex, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setimageindex, gmagick_setimageindex_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimageinterlacescheme,gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setimageinterlacescheme,gmagick_setimageinterlacescheme_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimageiterations, gmagick_empty_args, ZEND_ACC_PUBLIC) --#if GMAGICK_LIB_MASK >= 1005000 -- PHP_ME(gmagick, getimagematte, gmagick_empty_args, ZEND_ACC_PUBLIC) --#endif -- PHP_ME(gmagick, getimagemattecolor, gmagick_empty_args, ZEND_ACC_PUBLIC) --#ifdef GMAGICK_HAVE_SET_IMAGE_PAGE -- PHP_ME(gmagick, getimagepage, gmagick_empty_args, ZEND_ACC_PUBLIC) --#endif // GMAGICK_HAVE_SET_IMAGE_PAGE -- PHP_ME(gmagick, getimageprofile, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimageredprimary, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimagerenderingintent,gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimageresolution, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimagescene, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimagesignature, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimagetype, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setimageiterations, gmagick_setimageiterations_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setimageprofile, gmagick_setimageprofile_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setimageredprimary, gmagick_setimageredprimary_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setimagerenderingintent,gmagick_setimagerenderingintent_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setimageresolution, gmagick_setimageresolution_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setresolution, gmagick_setresolution_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setimagescene, gmagick_setimagescene_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setimagetype, gmagick_setimagetype_args, ZEND_ACC_PUBLIC) --#ifdef GMAGICK_HAVE_SET_IMAGE_PAGE -- PHP_ME(gmagick, setimagepage, gmagick_setimagepage_args, ZEND_ACC_PUBLIC) --#endif //GMAGICK_HAVE_SET_IMAGE_PAGE -- PHP_ME(gmagick, getimageunits, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimagewhitepoint, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimagewidth, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getpackagename, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getquantumdepth, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getreleasedate, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getresourcelimit, gmagick_getresourcelimit_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setresourcelimit, gmagick_setresourcelimit_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getsamplingfactors, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getsize, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setimageunits, gmagick_setimageunits_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setimagewhitepoint, gmagick_setimagewhitepoint_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setsamplingfactors, gmagick_setsamplingfactors_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setsize, gmagick_setsize_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getversion, gmagick_empty_args, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) -- PHP_ME(gmagick, getimagegeometry, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimage, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setimage, gmagick_setimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, hasnextimage, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, haspreviousimage, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, implodeimage, gmagick_getimagetotalinkdensity_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, labelimage, gmagick_labelimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, levelimage, gmagick_levelimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, magnifyimage, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, mapimage, gmagick_mapimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, medianfilterimage, gmagick_medianfilterimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, minifyimage, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, modulateimage, gmagick_modulateimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, motionblurimage, gmagick_motionblurimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, nextimage, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, newimage, gmagick_newimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, normalizeimage, gmagick_normalizeimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, oilpaintimage, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, previousimage, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, profileimage, gmagick_profileimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, quantizeimage, gmagick_quantizeimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, quantizeimages, gmagick_quantizeimages_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, queryfonts, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, queryfontmetrics, gmagick_queryfontmetrics_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, queryformats, gmagick_queryformats_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, radialblurimage, gmagick_radialblurimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, raiseimage, gmagick_raiseimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, readimageblob, gmagick_readimageblob_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, readimagefile, gmagick_readimagefile_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, reducenoiseimage, gmagick_reducenoiseimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, removeimage, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, removeimageprofile, gmagick_removeimageprofile_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, resampleimage, gmagick_resampleimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, rollimage, gmagick_rollimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, rotateimage, gmagick_rotateimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, scaleimage, gmagick_scaleimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, separateimagechannel, gmagick_separateimagechannel_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, sharpenimage, gmagick_sharpenimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, shearimage, gmagick_shearimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, solarizeimage, gmagick_solarizeimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, spreadimage, gmagick_spreadimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, stripimage, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, swirlimage, gmagick_swirlimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, trimimage, gmagick_trimimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, sampleimage, gmagick_sampleimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, cloneimage, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, appendimages, gmagick_appendimages_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, unsharpmaskimage, gmagick_unsharpmaskimage_args, ZEND_ACC_PUBLIC) -- PHP_MALIAS(gmagick, read, readimage, gmagick_readimage_args, ZEND_ACC_PUBLIC) -- PHP_MALIAS(gmagick, write, writeimage, gmagick_writeimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, adaptivethresholdimage, gmagick_adaptivethresholdimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, affinetransformimage, gmagick_affinetransformimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, averageimages, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, blackthresholdimage, gmagick_blackthresholdimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, colordecisionlist, gmagick_colordecisionlist_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, clipimage, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, clippathimage, gmagick_clippathimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, colorfloodfillimage, gmagick_colorfloodfillimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, colorizeimage, gmagick_colorizeimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, compareimagechannels, gmagick_compareimagechannels_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, compareimages, gmagick_compareimages_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, contrastimage, gmagick_contrastimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, convolveimage, gmagick_convolveimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, extentimage, gmagick_extentimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimageattribute, gmagick_getimageattribute_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimagechannelextrema, gmagick_getimagechannelextrema_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimagechannelmean, gmagick_getimagechannelmean_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimagecolormapcolor, gmagick_getimagecolormapcolor_args, ZEND_ACC_PUBLIC) --#ifdef HAVE_GMAGICK_SET_IMAGE_GRAVITY -- PHP_ME(gmagick, getimagegravity, gmagick_empty_args, ZEND_ACC_PUBLIC) --#endif // HAVE_GMAGICK_SET_IMAGE_GRAVITY -- PHP_ME(gmagick, getimagevirtualpixelmethod, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, haldclutimage, gmagick_haldclutimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, mattefloodfillimage, gmagick_mattefloodfillimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, montageimage, gmagick_montageimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, morphimages, gmagick_morphimages_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, mosaicimages, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setimageattribute, gmagick_setimageattribute_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setimagecolormapcolor, gmagick_setimagecolormapcolor_args, ZEND_ACC_PUBLIC) --#ifdef HAVE_GMAGICK_SET_IMAGE_GRAVITY -- PHP_ME(gmagick, setimagegravity, gmagick_setimagegravity_args, ZEND_ACC_PUBLIC) --#endif //#ifdef HAVE_GMAGICK_SET_IMAGE_GRAVITY -- PHP_ME(gmagick, setimagemattecolor, gmagick_setimagemattecolor_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setimagevirtualpixelmethod, gmagick_setimagevirtualpixelmethod_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, shaveimage, gmagick_shaveimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, steganoimage, gmagick_steganoimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, stereoimage, gmagick_stereoimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, waveimage, gmagick_waveimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, whitethresholdimage, gmagick_whitethresholdimage_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimageboundingbox, gmagick_getimageboundingbox_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimagefuzz, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, getimagesavedtype, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setdepth, gmagick_setdepth_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setformat, gmagick_setformat_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setimagefuzz, gmagick_setimagefuzz_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setimageoption, gmagick_setimageoption_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setimagesavedtype, gmagick_setimagesavedtype_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, setresolutionunits, gmagickdraw_setresolutionunits_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagick, writeimagefile, gmagick_writeimagefile_args, ZEND_ACC_PUBLIC) -- { NULL, NULL, NULL } --}; --/* }}} */ -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_zero_args, 0, 0, 0) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setstrokecolor_args, 0, 0, 1) -- ZEND_ARG_INFO(0, color) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setstrokewidth_args, 0, 0, 1) -- ZEND_ARG_INFO(0, width) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setfillcolor_args, 0, 0, 1) -- ZEND_ARG_INFO(0, color) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setgravity_args, 0, 0, 1) -- ZEND_ARG_INFO(0, gravity) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_ellipse_args, 0, 0, 6) -- ZEND_ARG_INFO(0, ox) -- ZEND_ARG_INFO(0, oy) -- ZEND_ARG_INFO(0, px) -- ZEND_ARG_INFO(0, py) -- ZEND_ARG_INFO(0, start) -- ZEND_ARG_INFO(0, end) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_affine_args, 0, 0, 1) -- ZEND_ARG_INFO(0, affineMatrix) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_annotate_args, 0, 0, 3) -- ZEND_ARG_INFO(0, x) -- ZEND_ARG_INFO(0, y) -- ZEND_ARG_INFO(0, text) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_arc_args, 0, 0, 6) -- ZEND_ARG_INFO(0, sx) -- ZEND_ARG_INFO(0, sy) -- ZEND_ARG_INFO(0, ex) -- ZEND_ARG_INFO(0, ey) -- ZEND_ARG_INFO(0, sd) -- ZEND_ARG_INFO(0, ed) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_bezier_args, 0, 0, 1) -- ZEND_ARG_INFO(0, coordinate_array) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_line_args, 0, 0, 4) -- ZEND_ARG_INFO(0, sx) -- ZEND_ARG_INFO(0, sy) -- ZEND_ARG_INFO(0, ex) -- ZEND_ARG_INFO(0, ey) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_point_args, 0, 0, 2) -- ZEND_ARG_INFO(0, x) -- ZEND_ARG_INFO(0, y) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_polygon_args, 0, 0, 1) -- ZEND_ARG_INFO(0, coordinates) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_polyline_args, 0, 0, 1) -- ZEND_ARG_INFO(0, coordinate_array) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_rectangle_args, 0, 0, 4) -- ZEND_ARG_INFO(0, x1) -- ZEND_ARG_INFO(0, y1) -- ZEND_ARG_INFO(0, x2) -- ZEND_ARG_INFO(0, y2) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_rotate_args, 0, 0, 1) -- ZEND_ARG_INFO(0, degrees) --ZEND_END_ARG_INFO() -- -- ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_roundrectangle_args, 0, 0, 6) -- ZEND_ARG_INFO(0, x1) -- ZEND_ARG_INFO(0, y1) -- ZEND_ARG_INFO(0, x2) -- ZEND_ARG_INFO(0, y2) -- ZEND_ARG_INFO(0, rx) -- ZEND_ARG_INFO(0, ry) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_scale_args, 0, 0, 2) -- ZEND_ARG_INFO(0, x) -- ZEND_ARG_INFO(0, y) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setfillopacity_args, 0, 0, 1) -- ZEND_ARG_INFO(0, fill_opacity) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setfont_args, 0, 0, 1) -- ZEND_ARG_INFO(0, font) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setfontsize_args, 0, 0, 1) -- ZEND_ARG_INFO(0, pointsize) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setfontstyle_args, 0, 0, 1) -- ZEND_ARG_INFO(0, STYLE) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setfontweight_args, 0, 0, 1) -- ZEND_ARG_INFO(0, weight) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setstrokeopacity_args, 0, 0, 1) -- ZEND_ARG_INFO(0, stroke_opacity) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_settextdecoration_args, 0, 0, 1) -- ZEND_ARG_INFO(0, DECORATION) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_settextencoding_args, 0, 0, 1) -- ZEND_ARG_INFO(0, encoding) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setstrokeantialias_args, 0, 0, 1) -- ZEND_ARG_INFO(0, antialias) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setstrokedashoffset_args, 0, 0, 1) -- ZEND_ARG_INFO(0, offset) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setstrokelinecap_args, 0, 0, 1) -- ZEND_ARG_INFO(0, LINECAP) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setstrokelinejoin_args, 0, 0, 1) -- ZEND_ARG_INFO(0, LINEJOIN) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setstrokemiterlimit_args, 0, 0, 1) -- ZEND_ARG_INFO(0, miterLimit) --ZEND_END_ARG_INFO() -- --#if GMAGICK_LIB_MASK >= 1003000 --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setstrokedasharray_args, 0, 0, 1) -- ZEND_ARG_INFO(0, dashArray) --ZEND_END_ARG_INFO() --#endif -- -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_circle_args, 0, 0, 4) -- ZEND_ARG_INFO(0, ox) -- ZEND_ARG_INFO(0, oy) -- ZEND_ARG_INFO(0, px) -- ZEND_ARG_INFO(0, py) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setclippath_args, 0, 0, 1) -- ZEND_ARG_INFO(0, clipMask) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setcliprule_args, 0, 0, 1) -- ZEND_ARG_INFO(0, FILLRULE) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setclipunits_args, 0, 0, 1) -- ZEND_ARG_INFO(0, PATHUNITS) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_color_args, 0, 0, 3) -- ZEND_ARG_INFO(0, x) -- ZEND_ARG_INFO(0, y) -- ZEND_ARG_INFO(0, PAINTMETHOD) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_comment_args, 0, 0, 1) -- ZEND_ARG_INFO(0, comment) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setfillpatternurl_args, 0, 0, 1) -- ZEND_ARG_INFO(0, url) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setfillrule_args, 0, 0, 1) -- ZEND_ARG_INFO(0, FILLRULE) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setfontfamily_args, 0, 0, 1) -- ZEND_ARG_INFO(0, fontfamily) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setfontstretch_args, 0, 0, 1) -- ZEND_ARG_INFO(0, STRETCH) --ZEND_END_ARG_INFO() -- --//ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_composite_args, 0, 0, 6) --// ZEND_ARG_INFO(0, COMPOSE) --// ZEND_ARG_INFO(0, x) --// ZEND_ARG_INFO(0, y) --// ZEND_ARG_INFO(0, width) --// ZEND_ARG_INFO(0, height) --// ZEND_ARG_OBJ_INFO(0, Gmagick, Gmagick, 0) --//ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pathcurvetoabsolute_args, 0, 0, 6) -- ZEND_ARG_INFO(0, x1) -- ZEND_ARG_INFO(0, y1) -- ZEND_ARG_INFO(0, x2) -- ZEND_ARG_INFO(0, y2) -- ZEND_ARG_INFO(0, x) -- ZEND_ARG_INFO(0, y) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pathcurvetorelative_args, 0, 0, 6) -- ZEND_ARG_INFO(0, x1) -- ZEND_ARG_INFO(0, y1) -- ZEND_ARG_INFO(0, x2) -- ZEND_ARG_INFO(0, y2) -- ZEND_ARG_INFO(0, x) -- ZEND_ARG_INFO(0, y) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pathcurvetoquadraticbezierabsolute_args, 0, 0, 4) -- ZEND_ARG_INFO(0, x1) -- ZEND_ARG_INFO(0, y1) -- ZEND_ARG_INFO(0, x) -- ZEND_ARG_INFO(0, y) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pathcurvetoquadraticbezierrelative_args, 0, 0, 4) -- ZEND_ARG_INFO(0, x1) -- ZEND_ARG_INFO(0, y1) -- ZEND_ARG_INFO(0, x) -- ZEND_ARG_INFO(0, y) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pathcurvetoquadraticbeziersmoothabsolute_args, 0, 0, 2) -- ZEND_ARG_INFO(0, x) -- ZEND_ARG_INFO(0, y) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pathcurvetoquadraticbeziersmoothrelative_args, 0, 0, 2) -- ZEND_ARG_INFO(0, x) -- ZEND_ARG_INFO(0, y) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pathcurvetosmoothabsolute_args, 0, 0, 4) -- ZEND_ARG_INFO(0, x1) -- ZEND_ARG_INFO(0, y1) -- ZEND_ARG_INFO(0, x) -- ZEND_ARG_INFO(0, y) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pathcurvetosmoothrelative_args, 0, 0, 4) -- ZEND_ARG_INFO(0, x1) -- ZEND_ARG_INFO(0, y1) -- ZEND_ARG_INFO(0, x) -- ZEND_ARG_INFO(0, y) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pathellipticarcabsolute_args, 0, 0, 7) -- ZEND_ARG_INFO(0, rx) -- ZEND_ARG_INFO(0, ry) -- ZEND_ARG_INFO(0, xAxisRotation) -- ZEND_ARG_INFO(0, largeArc) -- ZEND_ARG_INFO(0, sweep) -- ZEND_ARG_INFO(0, x) -- ZEND_ARG_INFO(0, y) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pathellipticarcrelative_args, 0, 0, 7) -- ZEND_ARG_INFO(0, rx) -- ZEND_ARG_INFO(0, ry) -- ZEND_ARG_INFO(0, xAxisRotation) -- ZEND_ARG_INFO(0, largeArc) -- ZEND_ARG_INFO(0, sweep) -- ZEND_ARG_INFO(0, x) -- ZEND_ARG_INFO(0, y) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pathlinetoabsolute_args, 0, 0, 2) -- ZEND_ARG_INFO(0, x) -- ZEND_ARG_INFO(0, y) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pathlinetorelative_args, 0, 0, 2) -- ZEND_ARG_INFO(0, x) -- ZEND_ARG_INFO(0, y) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pathlinetohorizontalabsolute_args, 0, 0, 1) -- ZEND_ARG_INFO(0, y) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pathlinetohorizontalrelative_args, 0, 0, 1) -- ZEND_ARG_INFO(0, x) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pathlinetoverticalabsolute_args, 0, 0, 1) -- ZEND_ARG_INFO(0, y) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pathlinetoverticalrelative_args, 0, 0, 1) -- ZEND_ARG_INFO(0, x) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pathmovetoabsolute_args, 0, 0, 2) -- ZEND_ARG_INFO(0, x) -- ZEND_ARG_INFO(0, y) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pathmovetorelative_args, 0, 0, 2) -- ZEND_ARG_INFO(0, x) -- ZEND_ARG_INFO(0, y) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pushclippath_args, 0, 0, 1) -- ZEND_ARG_INFO(0, clipMask) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pushpattern_args, 0, 0, 5) -- ZEND_ARG_INFO(0, pattern_id) -- ZEND_ARG_INFO(0, x) -- ZEND_ARG_INFO(0, y) -- ZEND_ARG_INFO(0, width) -- ZEND_ARG_INFO(0, height) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_skewx_args, 0, 0, 1) -- ZEND_ARG_INFO(0, degrees) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_skewy_args, 0, 0, 1) -- ZEND_ARG_INFO(0, degrees) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setstrokepatternurl_args, 0, 0, 1) -- ZEND_ARG_INFO(0, url) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_settextantialias_args, 0, 0, 1) -- ZEND_ARG_INFO(0, antialias) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_settextundercolor_args, 0, 0, 1) -- ZEND_ARG_INFO(0, color) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_translate_args, 0, 0, 2) -- ZEND_ARG_INFO(0, x) -- ZEND_ARG_INFO(0, y) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setviewbox_args, 0, 0, 4) -- ZEND_ARG_INFO(0, sx) -- ZEND_ARG_INFO(0, sy) -- ZEND_ARG_INFO(0, ex) -- ZEND_ARG_INFO(0, ey) --ZEND_END_ARG_INFO() -- -- --static zend_function_entry php_gmagickdraw_class_methods[] = --{ -- PHP_ME(gmagickdraw, setstrokecolor, gmagickdraw_setstrokecolor_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, setstrokewidth, gmagickdraw_setstrokewidth_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, setfillcolor, gmagickdraw_setfillcolor_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, setgravity, gmagickdraw_setgravity_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, ellipse, gmagickdraw_ellipse_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, affine, gmagickdraw_affine_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, annotate, gmagickdraw_annotate_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, arc, gmagickdraw_arc_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, bezier, gmagickdraw_bezier_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, getfillcolor, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, getgravity, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, getfillopacity, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, getfont, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, getfontsize, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, getfontstyle, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, getfontweight, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, getstrokeopacity, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, getstrokecolor, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, getstrokewidth, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, gettextdecoration, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, gettextencoding, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, line, gmagickdraw_line_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, point, gmagickdraw_point_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, polygon, gmagickdraw_polygon_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, polyline, gmagickdraw_polyline_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, rectangle, gmagickdraw_rectangle_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, rotate, gmagickdraw_rotate_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, roundrectangle, gmagickdraw_roundrectangle_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, scale, gmagickdraw_scale_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, setfillopacity, gmagickdraw_setfillopacity_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, setfont, gmagickdraw_setfont_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, setfontsize, gmagickdraw_setfontsize_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, setfontstyle, gmagickdraw_setfontstyle_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, setfontweight, gmagickdraw_setfontweight_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, setstrokeopacity, gmagickdraw_setstrokeopacity_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, settextdecoration, gmagickdraw_settextdecoration_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, settextencoding, gmagickdraw_settextencoding_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, setstrokeantialias, gmagickdraw_setstrokeantialias_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, setstrokedashoffset, gmagickdraw_setstrokedashoffset_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, setstrokelinecap, gmagickdraw_setstrokelinecap_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, setstrokelinejoin, gmagickdraw_setstrokelinejoin_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, setstrokemiterlimit, gmagickdraw_setstrokemiterlimit_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, getstrokeantialias, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, getstrokedashoffset, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, getstrokelinecap, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, getstrokelinejoin, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, getstrokemiterlimit, gmagick_empty_args, ZEND_ACC_PUBLIC) --#if GMAGICK_LIB_MASK >= 1003000 -- PHP_ME(gmagickdraw, getstrokedasharray, gmagick_empty_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, setstrokedasharray, gmagickdraw_setstrokedasharray_args, ZEND_ACC_PUBLIC) --#endif -- -- PHP_ME(gmagickdraw, circle, gmagickdraw_circle_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, getclippath, gmagickdraw_zero_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, setclippath, gmagickdraw_setclippath_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, getcliprule, gmagickdraw_zero_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, setcliprule, gmagickdraw_setcliprule_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, getclipunits, gmagickdraw_zero_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, setclipunits, gmagickdraw_setclipunits_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, color, gmagickdraw_color_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, comment, gmagickdraw_comment_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, setfillpatternurl, gmagickdraw_setfillpatternurl_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, getfillrule, gmagickdraw_zero_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, setfillrule, gmagickdraw_setfillrule_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, getfontfamily, gmagickdraw_zero_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, setfontfamily, gmagickdraw_setfontfamily_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, getfontstretch, gmagickdraw_zero_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, setfontstretch, gmagickdraw_setfontstretch_args, ZEND_ACC_PUBLIC) --// PHP_ME(gmagickdraw, composite, gmagickdraw_composite_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, pathclose, gmagickdraw_zero_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, pathcurvetoabsolute, gmagickdraw_pathcurvetoabsolute_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, pathcurvetorelative, gmagickdraw_pathcurvetorelative_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, pathcurvetoquadraticbezierabsolute, gmagickdraw_pathcurvetoquadraticbezierabsolute_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, pathcurvetoquadraticbezierrelative, gmagickdraw_pathcurvetoquadraticbezierrelative_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, pathcurvetoquadraticbeziersmoothabsolute, gmagickdraw_pathcurvetoquadraticbeziersmoothabsolute_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, pathcurvetoquadraticbeziersmoothrelative, gmagickdraw_pathcurvetoquadraticbeziersmoothrelative_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, pathcurvetosmoothabsolute, gmagickdraw_pathcurvetosmoothabsolute_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, pathcurvetosmoothrelative, gmagickdraw_pathcurvetosmoothrelative_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, pathellipticarcabsolute, gmagickdraw_pathellipticarcabsolute_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, pathellipticarcrelative, gmagickdraw_pathellipticarcrelative_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, pathfinish, gmagickdraw_zero_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, pathlinetoabsolute, gmagickdraw_pathlinetoabsolute_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, pathlinetorelative, gmagickdraw_pathlinetorelative_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, pathlinetohorizontalabsolute, gmagickdraw_pathlinetohorizontalabsolute_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, pathlinetohorizontalrelative, gmagickdraw_pathlinetohorizontalrelative_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, pathlinetoverticalabsolute, gmagickdraw_pathlinetoverticalabsolute_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, pathlinetoverticalrelative, gmagickdraw_pathlinetoverticalrelative_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, pathmovetoabsolute, gmagickdraw_pathmovetoabsolute_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, pathmovetorelative, gmagickdraw_pathmovetorelative_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, pathstart, gmagickdraw_zero_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, popclippath, gmagickdraw_zero_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, popdefs, gmagickdraw_zero_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, poppattern, gmagickdraw_zero_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, pushclippath, gmagickdraw_pushclippath_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, pushdefs, gmagickdraw_zero_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, pushpattern, gmagickdraw_pushpattern_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, skewx, gmagickdraw_skewx_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, skewy, gmagickdraw_skewy_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, setstrokepatternurl, gmagickdraw_setstrokepatternurl_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, gettextantialias, gmagickdraw_zero_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, settextantialias, gmagickdraw_settextantialias_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, gettextundercolor, gmagickdraw_zero_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, settextundercolor, gmagickdraw_settextundercolor_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, translate, gmagickdraw_translate_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, setviewbox, gmagickdraw_setviewbox_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, popGraphicContext, gmagickdraw_zero_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickdraw, pushGraphicContext, gmagickdraw_zero_args, ZEND_ACC_PUBLIC) -- -- { NULL, NULL, NULL } --}; --/* }}} */ -- --ZEND_BEGIN_ARG_INFO_EX(gmagickpixel_constructor_args, 0, 0, 0) -- ZEND_ARG_INFO(0, color) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickpixel_zero_args, 0, 0, 0) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickpixel_getcolor_args, 0, 0, 0) -- ZEND_ARG_INFO(0, as_array) -- ZEND_ARG_INFO(0, normalize_array) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickpixel_getcolorvalue_args, 0, 0, 1) -- ZEND_ARG_INFO(0, color) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickpixel_getcolorvaluequantum_args, 0, 0, 1) -- ZEND_ARG_INFO(0, color) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickpixel_setcolor_args, 0, 0, 1) -- ZEND_ARG_INFO(0, color) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickpixel_setcolorcount_args, 0, 0, 1) -- ZEND_ARG_INFO(0, color_count) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickpixel_setcolorvalue_args, 0, 0, 2) -- ZEND_ARG_INFO(0, color) -- ZEND_ARG_INFO(0, value) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO_EX(gmagickpixel_setcolorvaluequantum_args, 0, 0, 2) -- ZEND_ARG_INFO(0, color) -- ZEND_ARG_INFO(0, value) --ZEND_END_ARG_INFO() -- --/* {{{ static zend_function_entry php_gmagickpixel_functions[] --*/ --static zend_function_entry php_gmagickpixel_class_methods[] = --{ -- PHP_ME(gmagickpixel, __construct, gmagickpixel_constructor_args, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) -- PHP_ME(gmagickpixel, setcolor, gmagickpixel_setcolor_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickpixel, getcolor, gmagickpixel_getcolor_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickpixel, getcolorcount, gmagickpixel_zero_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickpixel, setcolorcount, gmagickpixel_setcolorcount_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickpixel, getcolorvalue, gmagickpixel_getcolorvalue_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickpixel, setcolorvalue, gmagickpixel_setcolorvalue_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickpixel, getcolorvaluequantum, gmagickpixel_getcolorvaluequantum_args, ZEND_ACC_PUBLIC) -- PHP_ME(gmagickpixel, setcolorvaluequantum, gmagickpixel_setcolorvaluequantum_args, ZEND_ACC_PUBLIC) -- { NULL, NULL, NULL } --}; --/* }}} */ -- - PHP_INI_BEGIN() - STD_PHP_INI_ENTRY("gmagick.shutdown_sleep_count", "10", PHP_INI_ALL, OnUpdateLong, shutdown_sleep_count, zend_gmagick_globals, gmagick_globals) - PHP_INI_END() -@@ -1723,7 +280,7 @@ PHP_MINIT_FUNCTION(gmagick) - php_gmagickpixel_exception_class_entry->ce_flags |= ZEND_ACC_FINAL; - - /* Class entry */ -- INIT_CLASS_ENTRY(ce, "Gmagick", php_gmagick_class_methods); -+ INIT_CLASS_ENTRY(ce, "Gmagick", class_Gmagick_methods); - php_gmagick_sc_entry = zend_register_internal_class(&ce); - php_gmagick_sc_entry->create_object = php_gmagick_object_new; - memcpy(&gmagick_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); -@@ -1731,7 +288,7 @@ PHP_MINIT_FUNCTION(gmagick) - gmagick_object_handlers.free_obj = php_gmagick_object_free_storage; - gmagick_object_handlers.clone_obj = php_gmagick_clone_gmagick_object; - -- INIT_CLASS_ENTRY(ce, "GmagickDraw", php_gmagickdraw_class_methods); -+ INIT_CLASS_ENTRY(ce, "GmagickDraw", class_GmagickDraw_methods); - php_gmagickdraw_sc_entry = zend_register_internal_class(&ce); - php_gmagickdraw_sc_entry->create_object = php_gmagickdraw_object_new; - memcpy(&gmagickdraw_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); -@@ -1739,7 +296,7 @@ PHP_MINIT_FUNCTION(gmagick) - gmagickdraw_object_handlers.free_obj = php_gmagickdraw_object_free_storage; - gmagickdraw_object_handlers.clone_obj = NULL; - -- INIT_CLASS_ENTRY(ce, "GmagickPixel", php_gmagickpixel_class_methods); -+ INIT_CLASS_ENTRY(ce, "GmagickPixel", class_GmagickPixel_methods); - php_gmagickpixel_sc_entry = zend_register_internal_class(&ce); - php_gmagickpixel_sc_entry->create_object = php_gmagickpixel_object_new; - memcpy(&gmagickpixel_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); -@@ -1813,7 +370,7 @@ zend_module_entry gmagick_module_entry = - { - STANDARD_MODULE_HEADER, /* Standard module header */ - "gmagick", /* Extension name */ -- php_gmagick_functions, /* Functions */ -+ NULL, /* Functions */ - PHP_MINIT(gmagick), /* MINIT */ - PHP_MSHUTDOWN(gmagick), /* MSHUTDOWN */ - NULL, /* RINIT */ -diff --git a/gmagick.stub.php b/gmagick.stub.php -new file mode 100644 -index 0000000..0a13698 ---- /dev/null -+++ b/gmagick.stub.php -@@ -0,0 +1,377 @@ -+<?php -+/** @generate-function-entries */ -+/** @generate-legacy-arginfo */ -+/** @generate-class-entries */ -+ -+class Gmagick { -+ public function __construct(?string $filename = null) {} -+ public function __tostring(): string {} -+ -+ public function readimage(string $filename): Gmagick {} -+ /** @alias Gmagick::readimage */ -+ public function read(string $filename): Gmagick {} -+ /** -+ * @param resource $filehandle -+ */ -+ public function readimagefile($filehandle, ?string $filename = null): Gmagick {} -+ public function writeimage(string $filename, bool $all_frames = false): Gmagick {} -+ /** @alias Gmagick::writeimage */ -+ public function write(string $filename, bool $all_frames = false): Gmagick {} -+ /** -+ * @param resource $filehandle -+ */ -+ public function writeimagefile($filehandle, ?string $format = null): Gmagick {} -+ public static function getversion(): array {} -+ public function annotateimage(GmagickDraw $drawing_wand, float $x, float $y, float $angle, string $text): Gmagick {} -+ public function blurimage(float $radius, float $sigma): Gmagick {} -+#if GMAGICK_LIB_MASK >= 1003007 -+ public function setcompressionquality(int $quality): Gmagick {} -+#endif -+#if GMAGICK_LIB_MASK >= 1005000 -+ public function getimagematte(): int {} -+#endif -+#ifdef GMAGICK_HAVE_SET_IMAGE_PAGE -+ public function setimagepage(int $width, int $height, int $x, int $y): bool {} -+ public function getimagepage(): array {} -+#endif -+ public function thumbnailimage(int $width, int $height, bool $fit = false, bool $legacy = false): Gmagick {} -+ public function resizeimage(int $width, int $height, int $filter, float $blur, bool $fit = false, bool $legacy = false): Gmagick {} -+ public function clear(): Gmagick {} -+ public function cropimage(int $width, int $height, int $x, int $y): Gmagick {} -+ public function cropthumbnailimage(int $width, int $height): Gmagick {} -+ public function coalesceimages(): Gmagick {} -+ public function compositeimage(Gmagick $source, int $COMPOSE, int $x, int $y): Gmagick {} -+ public function addimage(Gmagick $source): Gmagick {} -+ public function addnoiseimage(int $noise_type): Gmagick {} -+ public function borderimage(GmagickPixel|string $color, int $width, int $height): Gmagick {} -+ public function thresholdimage(float $threshold, int $channel = CHANNEL_DEFAULT): bool {} -+ public function charcoalimage(float $radius, float $sigma): Gmagick {} -+ public function chopimage(int $width, int $height, int $x, int $y): Gmagick {} -+ public function commentimage(string $comment): Gmagick {} -+ public function current(): Gmagick {} -+ public function cyclecolormapimage(int $displace): Gmagick {} -+ public function deconstructimages(): Gmagick {} -+ public function despeckleimage(): Gmagick {} -+ public function destroy(): bool {} -+ public function drawimage(GmagickDraw $drawing_wand): Gmagick {} -+ public function edgeimage(float $radius): Gmagick {} -+ public function embossimage(float $radius, float $sigma): Gmagick {} -+ public function enhanceimage(): Gmagick {} -+ public function equalizeimage(): Gmagick {} -+ public function flipimage(): Gmagick {} -+ public function flopimage(): Gmagick {} -+ public function frameimage(GmagickPixel|string $color, int $width, int $height, int $inner_bevel, int $outer_bevel): Gmagick {} -+ public function gammaimage(float $gamma): Gmagick {} -+ public function getcopyright(): string {} -+ public function getfilename(): string {} -+ public function getimage(): Gmagick {} -+ public function setimage(Gmagick $replace): bool {} -+ public function getimagebackgroundcolor(): GmagickPixel {} -+ public function getimageblob(): string {} -+ public function getimagesblob(): string {} -+ public function getimageblueprimary(): array {} -+ public function getimagebordercolor(): GmagickPixel {} -+ public function getimagechanneldepth(int $channel_type): int {} -+ public function getimagecolors(): int {} -+ public function getimagecolorspace(): int {} -+ public function getimagecompose(): int {} -+ public function getimagedelay(): int {} -+ public function getimagedepth(): int {} -+ public function getnumberimages(): int {} -+ public function getimagedispose(): int {} -+ public function getimageextrema(): array {} -+ public function getimagefilename(): string {} -+ public function getimagegamma(): float {} -+ public function getimagegreenprimary(): array {} -+ public function getimageheight(): int {} -+ public function getimagehistogram(): array {} -+ public function getimageindex(): int {} -+ public function getimageinterlacescheme(): int {} -+ public function getimageiterations(): int {} -+ public function getimagemattecolor(): GmagickPixel {} -+ public function getimageprofile(string $name): string {} -+ public function getimageredprimary(): array {} -+ public function getimagerenderingintent(): int {} -+ public function getimageresolution(): array {} -+ public function getimagescene(): int {} -+ public function getimagesignature(): string {} -+ public function getimagetype(): int {} -+ public function getimageunits(): int {} -+ public function getimagewhitepoint(): array {} -+ public function getimagewidth(): int {} -+ public function getpackagename(): string {} -+ public function getquantumdepth(): array {} -+ public function getreleasedate(): string {} -+ public function getsamplingfactors(): array {} -+ public function getsize(): array {} -+ public function setinterlacescheme(int $interlace_scheme): Gmagick {} -+ public function hasnextimage(): Gmagick {} -+ public function haspreviousimage(): Gmagick {} -+ public function implodeimage(float $radius): Gmagick {} -+ public function labelimage(string $label): Gmagick {} -+ public function levelimage(float $blackPoint, float $gamma, float $whitePoint, int $channel = Gmagick::CHANNEL_DEFAULT): Gmagick {} -+ public function magnifyimage(): Gmagick {} -+ public function mapimage(gmagick $gmagick, bool $dither): Gmagick {} -+ public function medianfilterimage(float $radius): void {} -+ public function minifyimage(): Gmagick {} -+ public function modulateimage(float $brightness, float $saturation, float $hue): Gmagick {} -+ public function motionblurimage(float $radius, float $sigma, float $angle): Gmagick {} -+ public function newimage(int $width, int $height, string $background, ?string $format = null): Gmagick {} -+ public function nextimage(): bool {} -+ public function normalizeimage(): Gmagick {} -+ public function oilpaintimage(float $radius): Gmagick {} -+ public function previousimage(): bool {} -+ public function profileimage(string $name, string $profile): Gmagick {} -+ public function quantizeimage(int $numColors, int $colorspace, int $treeDepth, bool $dither, bool $measureError): Gmagick {} -+ public function quantizeimages(int $numColors, int $colorspace, int $treeDepth, bool $dither, bool $measureError): Gmagick {} -+ public function queryfontmetrics(GmagickDraw $draw, string $text): array {} -+ public function queryfonts(string $pattern = "*"): array {} -+ public function queryformats(string $pattern = "*"): array {} -+ public function radialblurimage(float $angle, int $channel = Gmagick::CHANNEL_DEFAULT): Gmagick {} -+ public function raiseimage(int $width, int $height, int $x, int $y, bool $raise): Gmagick {} -+ public function readimageblob(string $imageContents, ?string $filename = null): Gmagick {} -+ public function reducenoiseimage(float $radius): Gmagick {} -+ public function removeimage(): Gmagick {} -+ public function removeimageprofile(string $name): string {} -+ public function resampleimage(float $xResolution, float $yResolution, int $filter, float $blur): Gmagick {} -+ public function rollimage(int $x, int $y): Gmagick {} -+ public function rotateimage(GmagickPixel|string $background, float $degrees): Gmagick {} -+ public function scaleimage(int $width, int $height, bool $fit = false): Gmagick {} -+ public function separateimagechannel(int $channel): Gmagick {} -+ public function setfilename(string $filename): Gmagick {} -+ public function setimagebackgroundcolor(GmagickPixel|string $color): Gmagick {} -+ public function setimageblueprimary(float $x, float $y): Gmagick {} -+ public function setimagebordercolor(GmagickPixel|string $color): Gmagick {} -+ public function setimagechanneldepth(int $channel, int $depth): Gmagick {} -+ public function setimagecolorspace(int $colorspace): Gmagick {} -+ public function setimagecompose(int $composite): Gmagick {} -+ public function getimagecompression(): int {} -+ public function setimagecompression(int $compression): Gmagick {} -+ public function setimagedelay(int $delay): Gmagick {} -+ public function setimagedepth(int $depth): Gmagick {} -+ public function setimagedispose(int $disposeType): Gmagick {} -+ public function setimagefilename(string $filename): Gmagick {} -+ public function getimageformat(): string {} -+ public function setimageformat(string $imageFormat): Gmagick {} -+ public function setimagegamma(float $gamma): Gmagick {} -+ public function setimagegreenprimary(float $x, float $y): Gmagick {} -+ public function setimageindex(int $index): Gmagick {} -+ public function setimageinterlacescheme(int $interlace): Gmagick {} -+ public function setimageiterations(int $iterations): Gmagick {} -+ public function setimageprofile(string $name, string $profile): Gmagick {} -+ public function setimageredprimary(float $x, float $y): Gmagick {} -+ public function setimagerenderingintent(int $rendering_intent): Gmagick {} -+ public function setimageresolution(float $xResolution, float $yResolution): Gmagick {} -+ public function setimagescene(int $scene): Gmagick {} -+ public function setimagetype(int $imgType): Gmagick {} -+ public function setimageunits(int $resolution): Gmagick {} -+ public function setimagewhitepoint(float $x, float $y): Gmagick {} -+ public function setsamplingfactors(array $factors): Gmagick {} -+ public function setsize(int $columns, int $rows): Gmagick {} -+ public function shearimage(GmagickPixel|string $background, float $xShear, float $yShear): Gmagick {} -+ public function solarizeimage(int $threshold): Gmagick {} -+ public function spreadimage(float $radius): Gmagick {} -+ public function stripimage(): Gmagick {} -+ public function swirlimage(float $degrees): Gmagick {} -+ public function trimimage(float $fuzz): Gmagick {} -+ public function blackthresholdimage(GmagickPixel|string $threshold): bool {} -+ public function whitethresholdimage(GmagickPixel|string $threshold): bool {} -+ public function colordecisionlist(string $color_correction_collection): bool {} -+ public function clipimage(): bool {} -+ public function clippathimage(string $pathname, bool $inside): bool {} -+ /** -+ * @param GmagickPixel|string $fill -+ * @param float $fuzz -+ * @param GmagickPixel|string $bordercolor -+ * @param int $x -+ * @param int $y -+ */ -+ public function colorfloodfillimage($fill, float $fuzz, GmagickPixel|string $bordercolor, int $x, int $y): bool {} -+ /** @param GmagickPixel|string $colorize */ -+ public function colorizeimage($colorize, GmagickPixel|string $opacity): bool {} -+ public function compareimagechannels(Gmagick $reference, int $channel, int $metric): array {} -+ public function compareimages(Gmagick $reference, int $metric): array {} -+ public function contrastimage(bool $sharpen): bool {} -+ public function convolveimage(array $kernel): bool {} -+ public function extentimage(int $width, int $height, int $x, int $y): bool {} -+ public function getimageboundingbox(float $fuzz): array {} -+ public function getimageattribute(string $key): string {} -+ public function setimageattribute(string $key, string $attribute): bool {} -+ public function getimagechannelextrema(int $channel): array {} -+ public function getimagechannelmean(int $channel): array {} -+ public function getimagecolormapcolor(int $index): GmagickPixel {} -+ /** -+ * @param int $index -+ * @param GmagickPixel|string $color -+ **/ -+ public function setimagecolormapcolor(int $index, $color): bool {} -+ public function getimagegravity(): int {} -+#ifdef HAVE_GMAGICK_SET_IMAGE_GRAVITY -+ public function setimagegravity(int $gravity): bool {} -+#endif -+ /** @param GmagickPixel|string $color */ -+ public function setimagemattecolor($color): bool {} -+ public function getimagevirtualpixelmethod(): int {} -+ public function setimagevirtualpixelmethod(int $method): bool {} -+ public function haldclutimage(Gmagick $hald): bool {} -+ /** -+ * @param float $alpha -+ * @param float $fuzz -+ * @param GmagickPixel|string $bordercolor -+ * @param int $x -+ * @param int $y -+ */ -+ public function mattefloodfillimage(float $alpha, float $fuzz, $bordercolor, int $x, int $y): bool {} -+ public function montageimage(GmagickDraw $drawing_wand, string $tile_geometry, string $thumbnail_geometry, int $mode, string $frame): Gmagick {} -+ public function morphimages(int $frames): Gmagick {} -+ public function mosaicimages(): Gmagick {} -+ public function shaveimage(int $columns, int $rows): bool {} -+ public function steganoimage(Gmagick $watermark_wand, int $offset): Gmagick {} -+ public function stereoimage(Gmagick $object_wand): Gmagick {} -+ public function transformimage(string $crop, string $geometry): Gmagick {} -+ public function waveimage(float $amplitude, float $length): bool {} -+ public function getimagefuzz(): float {} -+ public function setimagefuzz(float $fuzz): Gmagick {} -+ public function getimagesavedtype(): int {} -+ public function setdepth(int $depth): Gmagick {} -+ public function setimageoption(string $format, string $key, string $value): bool {} -+ public function setimagesavedtype(int $type): bool {} -+ public function setformat(string $format): bool {} -+ public function setresolutionunits(int $resolution_type): bool {} -+ public function getimagegeometry(): array {} -+ public function getresourcelimit(int $type): int {} -+ public function setresourcelimit(int $type, int $limit): bool {} -+ public function negateimage(bool $gray, int $channel = CHANNEL_DEFAULT): bool {} -+ public function sharpenimage(float $radius, float $sigma): bool {} -+ public function textureimage(Gmagick $texture_wand): Gmagick {} -+ public function flattenimages(): Gmagick {} -+ public function sampleimage(int $cols, int $rows, bool $fit = false, bool $legacy = false): Gmagick {} -+ public function cloneimage(): Gmagick {} -+ public function appendimages(): Gmagick {} -+ public function unsharpmaskimage(float $radius, float $sigma, float $amount, float $threshold): Gmagick {} -+ public function setresolution(float $x_resolution, float $y_resolution, float $amount, float $threshold): bool {} -+ public function adaptivethresholdimage(int $width, int $height, int $offset): bool {} -+ public function affinetransformimage(GmagickDraw $drawing_wand): bool {} -+ public function averageimages(): Gmagick {} -+} -+ -+class GmagickPixel { -+ public function __construct(?string $color = null) {} -+ public function getcolor(bool $as_array = false, bool $normalize_array = false): string|array {} -+ public function setcolor(string $color): GmagickPixel {} -+ public function getcolorcount(): int {} -+ public function setcolorcount(int $color_count): GmagickPixel {} -+ public function getcolorvalue(int $color): float {} -+ public function setcolorvalue(int $color, float $value): GmagickPixel {} -+ public function getcolorvaluequantum(int $color): int {} -+ public function setcolorvaluequantum(int $color, float $value): GmagickPixel {} -+} -+ -+class GmagickDraw { -+ public function setstrokecolor(GmagickPixel|string $color): GmagickDraw {} -+ public function setstrokewidth(float $width): GmagickDraw {} -+ public function ellipse(float $ox, float $oy, float $rx, float $ry, float $start, float $end): GmagickDraw {} -+ public function annotate(float $x, float $y, string $text): GmagickDraw {} -+ public function affine(array $affine): bool {} -+ public function arc(float $sx, float $sy, float $ex, float $ey, float $sd, float $ed): GmagickDraw {} -+ public function bezier(array $coordinates): GmagickDraw {} -+ public function getfillcolor(): GmagickPixel {} -+ public function getfillopacity(): float {} -+ public function getfont(): string|false {} -+ public function getfontfamily(): string|false {} -+ public function setfontfamily(string $font_family): GmagickDraw {} -+ public function getfontsize(): float {} -+ public function getfontstyle(): int {} -+ public function getfontweight(): int {} -+ public function getstrokeopacity(): float {} -+ public function getstrokecolor(): GmagickPixel {} -+ public function getstrokewidth(): float {} -+ public function gettextdecoration(): int {} -+ public function gettextencoding(): string|false {} -+ public function line(float $sx, float $sy, float $ex, float $ey): GmagickDraw {} -+ public function point(float $x, float $y): GmagickDraw {} -+ public function polygon(array $coordinates): GmagickDraw {} -+ public function polyline(array $coordinates): GmagickDraw {} -+ public function rectangle(float $x1, float $y1, float $x2, float $y2): GmagickDraw {} -+ public function rotate(float $degrees): GmagickDraw {} -+ public function roundrectangle(float $x1, float $y1, float $x2, float $y2, float $rx, float $ry): GmagickDraw {} -+ public function scale(float $x, float $y): GmagickDraw {} -+ public function setfillcolor(GmagickPixel|string $color): GmagickDraw {} -+ public function setfillopacity(float $fill_opacity): GmagickDraw {} -+ public function setfont(string $font): GmagickDraw {} -+ public function setfontsize(float $pointsize): GmagickDraw {} -+ public function setfontstyle(int $style): GmagickDraw {} -+ public function setfontweight(int $weight): GmagickDraw {} -+ public function setstrokeopacity(float $stroke_opacity): GmagickDraw {} -+ public function settextdecoration(int $decoration): GmagickDraw {} -+ public function settextencoding(string $encoding): GmagickDraw {} -+ public function getgravity(): int {} -+ public function setgravity(int $gravity): GmagickDraw {} -+ public function getstrokeantialias(): bool {} -+ public function setstrokeantialias(bool $antialias): GmagickDraw {} -+ public function getstrokedashoffset(): float {} -+ public function setstrokedashoffset(float $offset): GmagickDraw {} -+ public function getstrokelinecap(): int {} -+ public function setstrokelinecap(int $linecap): GmagickDraw {} -+ public function getstrokelinejoin(): int {} -+ public function setstrokelinejoin(int $linejoin): GmagickDraw {} -+ public function getstrokemiterlimit(): int {} -+ public function setstrokemiterlimit(int $miterlimit): GmagickDraw {} -+#if GMAGICK_LIB_MASK >= 1003000 -+ public function getstrokedasharray(): array {} -+ public function setstrokedasharray(array $dash_array): GmagickDraw {} -+#endif -+ public function circle(float $ox, float $oy, float $px, float $py): GmagickDraw {} -+ public function getclippath(): string|false {} -+ public function setclippath(string $clip_mask): GmagickDraw {} -+ public function getcliprule(): int {} -+ public function setcliprule(int $fill_rule): GmagickDraw {} -+ public function getclipunits(): int {} -+ public function setclipunits(int $clip_units): GmagickDraw {} -+ public function color(float $x, float $y, int $paint_method): GmagickDraw {} -+ public function comment(string $comment): GmagickDraw {} -+ public function setfillpatternurl(string $fill_url): GmagickDraw {} -+ public function getfillrule(): int {} -+ public function setfillrule(string $fill_rule): GmagickDraw {} -+ public function getfontstretch(): int {} -+ public function setfontstretch(int $font_stretch): bool {} -+ public function pathclose(): GmagickDraw {} -+ public function pathcurvetoabsolute(float $x1, float $y1, float $x2, float $y2, float $x, float $y): GmagickDraw {} -+ public function pathcurvetorelative(float $x1, float $y1, float $x2, float $y2, float $x, float $y): GmagickDraw {} -+ public function pathcurvetoquadraticbezierabsolute(float $x1, float $y1, float $x, float $y): GmagickDraw {} -+ public function pathcurvetoquadraticbezierrelative(float $x1, float $y1, float $x, float $y): GmagickDraw {} -+ public function pathcurvetoquadraticbeziersmoothabsolute(float $x, float $y): GmagickDraw {} -+ public function pathcurvetoquadraticbeziersmoothrelative(float $x, float $y): GmagickDraw {} -+ public function pathcurvetosmoothabsolute(float $x1, float $y1, float $x, float $y): GmagickDraw {} -+ public function pathcurvetosmoothrelative(float $x1, float $y1, float $x, float $y): GmagickDraw {} -+ public function pathellipticarcabsolute(float $rx, float $ry, float $x_axis_rotation, bool $large_arc_flag, bool $sweep_flag, float $x, float $y): GmagickDraw {} -+ public function pathellipticarcrelative(float $rx, float $ry, float $x_axis_rotation, bool $large_arc_flag, bool $sweep_flag, float $x, float $y): GmagickDraw {} -+ public function pathmovetoabsolute(float $x, float $y): GmagickDraw {} -+ public function pathmovetorelative(float $x, float $y): GmagickDraw {} -+ public function pathlinetoabsolute(float $x, float $y): GmagickDraw {} -+ public function pathlinetorelative(float $x, float $y): GmagickDraw {} -+ public function pathlinetohorizontalabsolute(float $x): GmagickDraw {} -+ public function pathlinetohorizontalrelative(float $x): GmagickDraw {} -+ public function pathlinetoverticalabsolute(float $y): GmagickDraw {} -+ public function pathlinetoverticalrelative(float $y): GmagickDraw {} -+ public function pathstart(): GmagickDraw {} -+ public function pathfinish(): GmagickDraw {} -+ public function popclippath(): GmagickDraw {} -+ public function popdefs(): GmagickDraw {} -+ public function pushdefs(): GmagickDraw {} -+ public function poppattern(): GmagickDraw {} -+ public function pushpattern(string $pattern_id, float $x, float $y, float $width, float $height): GmagickDraw {} -+ public function pushclippath(string $clip_mask_id): GmagickDraw {} -+ public function skewx(float $degrees): GmagickDraw {} -+ public function skewy(float $degrees): GmagickDraw {} -+ public function setstrokepatternurl(string $stroke_url): GmagickDraw {} -+ public function gettextantialias(): bool {} -+ public function settextantialias(bool $anti_alias): bool {} -+ public function gettextundercolor(): GmagickPixel {} -+ public function settextundercolor(GmagickPixel|string $color): GmagickDraw {} -+ public function translate(float $x, float $y): GmagickDraw {} -+ public function setviewbox(float $x1, float $y1, float $x2, float $y2): GmagickDraw {} -+ public function popGraphicContext(): GmagickDraw {} -+ public function pushGraphicContext(): GmagickDraw {} -+} -+ -diff --git a/gmagick_arginfo.h b/gmagick_arginfo.h -new file mode 100644 -index 0000000..dedc476 ---- /dev/null -+++ b/gmagick_arginfo.h -@@ -0,0 +1,1859 @@ -+/* This is a generated file, edit the .stub.php file instead. -+ * Stub hash: acb0515dcece6de92a056f9d795e0f168fd9c6da */ -+ -+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Gmagick___construct, 0, 0, 0) -+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, filename, IS_STRING, 1, "null") -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick___tostring, 0, 0, IS_STRING, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_readimage, 0, 1, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_read arginfo_class_Gmagick_readimage -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_readimagefile, 0, 1, Gmagick, 0) -+ ZEND_ARG_INFO(0, filehandle) -+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, filename, IS_STRING, 1, "null") -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_writeimage, 0, 1, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0) -+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, all_frames, _IS_BOOL, 0, "false") -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_write arginfo_class_Gmagick_writeimage -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_writeimagefile, 0, 1, Gmagick, 0) -+ ZEND_ARG_INFO(0, filehandle) -+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, format, IS_STRING, 1, "null") -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_getversion, 0, 0, IS_ARRAY, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_annotateimage, 0, 5, Gmagick, 0) -+ ZEND_ARG_OBJ_INFO(0, drawing_wand, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, x, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, y, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, angle, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, text, IS_STRING, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_blurimage, 0, 2, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, radius, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, sigma, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+#if GMAGICK_LIB_MASK >= 1003007 -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_setcompressionquality, 0, 1, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, quality, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+#endif -+ -+#if GMAGICK_LIB_MASK >= 1005000 -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_getimagematte, 0, 0, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+#endif -+ -+#if defined(GMAGICK_HAVE_SET_IMAGE_PAGE) -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_setimagepage, 0, 4, _IS_BOOL, 0) -+ ZEND_ARG_TYPE_INFO(0, width, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, height, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, x, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, y, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+#endif -+ -+#if defined(GMAGICK_HAVE_SET_IMAGE_PAGE) -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_getimagepage, 0, 0, IS_ARRAY, 0) -+ZEND_END_ARG_INFO() -+#endif -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_thumbnailimage, 0, 2, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, width, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, height, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, fit, _IS_BOOL, 0, "false") -+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, legacy, _IS_BOOL, 0, "false") -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_resizeimage, 0, 4, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, width, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, height, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, filter, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, blur, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, fit, _IS_BOOL, 0, "false") -+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, legacy, _IS_BOOL, 0, "false") -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_clear, 0, 0, Gmagick, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_cropimage, 0, 4, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, width, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, height, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, x, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, y, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_cropthumbnailimage, 0, 2, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, width, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, height, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_coalesceimages arginfo_class_Gmagick_clear -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_compositeimage, 0, 4, Gmagick, 0) -+ ZEND_ARG_OBJ_INFO(0, source, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, COMPOSE, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, x, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, y, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_addimage, 0, 1, Gmagick, 0) -+ ZEND_ARG_OBJ_INFO(0, source, Gmagick, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_addnoiseimage, 0, 1, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, noise_type, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_borderimage, 0, 3, Gmagick, 0) -+ ZEND_ARG_OBJ_TYPE_MASK(0, color, GmagickPixel, MAY_BE_STRING, NULL) -+ ZEND_ARG_TYPE_INFO(0, width, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, height, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_thresholdimage, 0, 1, _IS_BOOL, 0) -+ ZEND_ARG_TYPE_INFO(0, threshold, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, channel, IS_LONG, 0, "CHANNEL_DEFAULT") -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_charcoalimage arginfo_class_Gmagick_blurimage -+ -+#define arginfo_class_Gmagick_chopimage arginfo_class_Gmagick_cropimage -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_commentimage, 0, 1, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, comment, IS_STRING, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_current arginfo_class_Gmagick_clear -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_cyclecolormapimage, 0, 1, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, displace, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_deconstructimages arginfo_class_Gmagick_clear -+ -+#define arginfo_class_Gmagick_despeckleimage arginfo_class_Gmagick_clear -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_destroy, 0, 0, _IS_BOOL, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_drawimage, 0, 1, Gmagick, 0) -+ ZEND_ARG_OBJ_INFO(0, drawing_wand, GmagickDraw, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_edgeimage, 0, 1, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, radius, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_embossimage arginfo_class_Gmagick_blurimage -+ -+#define arginfo_class_Gmagick_enhanceimage arginfo_class_Gmagick_clear -+ -+#define arginfo_class_Gmagick_equalizeimage arginfo_class_Gmagick_clear -+ -+#define arginfo_class_Gmagick_flipimage arginfo_class_Gmagick_clear -+ -+#define arginfo_class_Gmagick_flopimage arginfo_class_Gmagick_clear -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_frameimage, 0, 5, Gmagick, 0) -+ ZEND_ARG_OBJ_TYPE_MASK(0, color, GmagickPixel, MAY_BE_STRING, NULL) -+ ZEND_ARG_TYPE_INFO(0, width, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, height, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, inner_bevel, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, outer_bevel, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_gammaimage, 0, 1, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, gamma, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_getcopyright arginfo_class_Gmagick___tostring -+ -+#define arginfo_class_Gmagick_getfilename arginfo_class_Gmagick___tostring -+ -+#define arginfo_class_Gmagick_getimage arginfo_class_Gmagick_clear -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_setimage, 0, 1, _IS_BOOL, 0) -+ ZEND_ARG_OBJ_INFO(0, replace, Gmagick, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_getimagebackgroundcolor, 0, 0, GmagickPixel, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_getimageblob arginfo_class_Gmagick___tostring -+ -+#define arginfo_class_Gmagick_getimagesblob arginfo_class_Gmagick___tostring -+ -+#define arginfo_class_Gmagick_getimageblueprimary arginfo_class_Gmagick_getversion -+ -+#define arginfo_class_Gmagick_getimagebordercolor arginfo_class_Gmagick_getimagebackgroundcolor -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_getimagechanneldepth, 0, 1, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, channel_type, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_getimagecolors, 0, 0, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_getimagecolorspace arginfo_class_Gmagick_getimagecolors -+ -+#define arginfo_class_Gmagick_getimagecompose arginfo_class_Gmagick_getimagecolors -+ -+#define arginfo_class_Gmagick_getimagedelay arginfo_class_Gmagick_getimagecolors -+ -+#define arginfo_class_Gmagick_getimagedepth arginfo_class_Gmagick_getimagecolors -+ -+#define arginfo_class_Gmagick_getnumberimages arginfo_class_Gmagick_getimagecolors -+ -+#define arginfo_class_Gmagick_getimagedispose arginfo_class_Gmagick_getimagecolors -+ -+#define arginfo_class_Gmagick_getimageextrema arginfo_class_Gmagick_getversion -+ -+#define arginfo_class_Gmagick_getimagefilename arginfo_class_Gmagick___tostring -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_getimagegamma, 0, 0, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_getimagegreenprimary arginfo_class_Gmagick_getversion -+ -+#define arginfo_class_Gmagick_getimageheight arginfo_class_Gmagick_getimagecolors -+ -+#define arginfo_class_Gmagick_getimagehistogram arginfo_class_Gmagick_getversion -+ -+#define arginfo_class_Gmagick_getimageindex arginfo_class_Gmagick_getimagecolors -+ -+#define arginfo_class_Gmagick_getimageinterlacescheme arginfo_class_Gmagick_getimagecolors -+ -+#define arginfo_class_Gmagick_getimageiterations arginfo_class_Gmagick_getimagecolors -+ -+#define arginfo_class_Gmagick_getimagemattecolor arginfo_class_Gmagick_getimagebackgroundcolor -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_getimageprofile, 0, 1, IS_STRING, 0) -+ ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_getimageredprimary arginfo_class_Gmagick_getversion -+ -+#define arginfo_class_Gmagick_getimagerenderingintent arginfo_class_Gmagick_getimagecolors -+ -+#define arginfo_class_Gmagick_getimageresolution arginfo_class_Gmagick_getversion -+ -+#define arginfo_class_Gmagick_getimagescene arginfo_class_Gmagick_getimagecolors -+ -+#define arginfo_class_Gmagick_getimagesignature arginfo_class_Gmagick___tostring -+ -+#define arginfo_class_Gmagick_getimagetype arginfo_class_Gmagick_getimagecolors -+ -+#define arginfo_class_Gmagick_getimageunits arginfo_class_Gmagick_getimagecolors -+ -+#define arginfo_class_Gmagick_getimagewhitepoint arginfo_class_Gmagick_getversion -+ -+#define arginfo_class_Gmagick_getimagewidth arginfo_class_Gmagick_getimagecolors -+ -+#define arginfo_class_Gmagick_getpackagename arginfo_class_Gmagick___tostring -+ -+#define arginfo_class_Gmagick_getquantumdepth arginfo_class_Gmagick_getversion -+ -+#define arginfo_class_Gmagick_getreleasedate arginfo_class_Gmagick___tostring -+ -+#define arginfo_class_Gmagick_getsamplingfactors arginfo_class_Gmagick_getversion -+ -+#define arginfo_class_Gmagick_getsize arginfo_class_Gmagick_getversion -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_setinterlacescheme, 0, 1, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, interlace_scheme, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_hasnextimage arginfo_class_Gmagick_clear -+ -+#define arginfo_class_Gmagick_haspreviousimage arginfo_class_Gmagick_clear -+ -+#define arginfo_class_Gmagick_implodeimage arginfo_class_Gmagick_edgeimage -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_labelimage, 0, 1, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, label, IS_STRING, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_levelimage, 0, 3, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, blackPoint, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, gamma, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, whitePoint, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, channel, IS_LONG, 0, "Gmagick::CHANNEL_DEFAULT") -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_magnifyimage arginfo_class_Gmagick_clear -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_mapimage, 0, 2, Gmagick, 0) -+ ZEND_ARG_OBJ_INFO(0, gmagick, gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, dither, _IS_BOOL, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_medianfilterimage, 0, 1, IS_VOID, 0) -+ ZEND_ARG_TYPE_INFO(0, radius, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_minifyimage arginfo_class_Gmagick_clear -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_modulateimage, 0, 3, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, brightness, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, saturation, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, hue, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_motionblurimage, 0, 3, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, radius, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, sigma, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, angle, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_newimage, 0, 3, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, width, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, height, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, background, IS_STRING, 0) -+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, format, IS_STRING, 1, "null") -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_nextimage arginfo_class_Gmagick_destroy -+ -+#define arginfo_class_Gmagick_normalizeimage arginfo_class_Gmagick_clear -+ -+#define arginfo_class_Gmagick_oilpaintimage arginfo_class_Gmagick_edgeimage -+ -+#define arginfo_class_Gmagick_previousimage arginfo_class_Gmagick_destroy -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_profileimage, 0, 2, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) -+ ZEND_ARG_TYPE_INFO(0, profile, IS_STRING, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_quantizeimage, 0, 5, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, numColors, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, colorspace, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, treeDepth, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, dither, _IS_BOOL, 0) -+ ZEND_ARG_TYPE_INFO(0, measureError, _IS_BOOL, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_quantizeimages arginfo_class_Gmagick_quantizeimage -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_queryfontmetrics, 0, 2, IS_ARRAY, 0) -+ ZEND_ARG_OBJ_INFO(0, draw, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, text, IS_STRING, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_queryfonts, 0, 0, IS_ARRAY, 0) -+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, pattern, IS_STRING, 0, "\"*\"") -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_queryformats arginfo_class_Gmagick_queryfonts -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_radialblurimage, 0, 1, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, angle, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, channel, IS_LONG, 0, "Gmagick::CHANNEL_DEFAULT") -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_raiseimage, 0, 5, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, width, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, height, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, x, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, y, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, raise, _IS_BOOL, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_readimageblob, 0, 1, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, imageContents, IS_STRING, 0) -+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, filename, IS_STRING, 1, "null") -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_reducenoiseimage arginfo_class_Gmagick_edgeimage -+ -+#define arginfo_class_Gmagick_removeimage arginfo_class_Gmagick_clear -+ -+#define arginfo_class_Gmagick_removeimageprofile arginfo_class_Gmagick_getimageprofile -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_resampleimage, 0, 4, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, xResolution, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, yResolution, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, filter, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, blur, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_rollimage, 0, 2, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, x, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, y, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_rotateimage, 0, 2, Gmagick, 0) -+ ZEND_ARG_OBJ_TYPE_MASK(0, background, GmagickPixel, MAY_BE_STRING, NULL) -+ ZEND_ARG_TYPE_INFO(0, degrees, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_scaleimage, 0, 2, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, width, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, height, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, fit, _IS_BOOL, 0, "false") -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_separateimagechannel, 0, 1, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, channel, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_setfilename arginfo_class_Gmagick_readimage -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_setimagebackgroundcolor, 0, 1, Gmagick, 0) -+ ZEND_ARG_OBJ_TYPE_MASK(0, color, GmagickPixel, MAY_BE_STRING, NULL) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_setimageblueprimary, 0, 2, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, x, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, y, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_setimagebordercolor arginfo_class_Gmagick_setimagebackgroundcolor -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_setimagechanneldepth, 0, 2, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, channel, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, depth, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_setimagecolorspace, 0, 1, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, colorspace, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_setimagecompose, 0, 1, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, composite, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_getimagecompression arginfo_class_Gmagick_getimagecolors -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_setimagecompression, 0, 1, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, compression, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_setimagedelay, 0, 1, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, delay, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_setimagedepth, 0, 1, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, depth, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_setimagedispose, 0, 1, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, disposeType, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_setimagefilename arginfo_class_Gmagick_readimage -+ -+#define arginfo_class_Gmagick_getimageformat arginfo_class_Gmagick___tostring -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_setimageformat, 0, 1, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, imageFormat, IS_STRING, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_setimagegamma arginfo_class_Gmagick_gammaimage -+ -+#define arginfo_class_Gmagick_setimagegreenprimary arginfo_class_Gmagick_setimageblueprimary -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_setimageindex, 0, 1, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_setimageinterlacescheme, 0, 1, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, interlace, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_setimageiterations, 0, 1, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, iterations, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_setimageprofile arginfo_class_Gmagick_profileimage -+ -+#define arginfo_class_Gmagick_setimageredprimary arginfo_class_Gmagick_setimageblueprimary -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_setimagerenderingintent, 0, 1, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, rendering_intent, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_setimageresolution, 0, 2, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, xResolution, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, yResolution, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_setimagescene, 0, 1, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, scene, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_setimagetype, 0, 1, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, imgType, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_setimageunits, 0, 1, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, resolution, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_setimagewhitepoint arginfo_class_Gmagick_setimageblueprimary -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_setsamplingfactors, 0, 1, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, factors, IS_ARRAY, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_setsize, 0, 2, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, columns, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, rows, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_shearimage, 0, 3, Gmagick, 0) -+ ZEND_ARG_OBJ_TYPE_MASK(0, background, GmagickPixel, MAY_BE_STRING, NULL) -+ ZEND_ARG_TYPE_INFO(0, xShear, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, yShear, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_solarizeimage, 0, 1, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, threshold, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_spreadimage arginfo_class_Gmagick_edgeimage -+ -+#define arginfo_class_Gmagick_stripimage arginfo_class_Gmagick_clear -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_swirlimage, 0, 1, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, degrees, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_trimimage, 0, 1, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, fuzz, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_blackthresholdimage, 0, 1, _IS_BOOL, 0) -+ ZEND_ARG_OBJ_TYPE_MASK(0, threshold, GmagickPixel, MAY_BE_STRING, NULL) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_whitethresholdimage arginfo_class_Gmagick_blackthresholdimage -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_colordecisionlist, 0, 1, _IS_BOOL, 0) -+ ZEND_ARG_TYPE_INFO(0, color_correction_collection, IS_STRING, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_clipimage arginfo_class_Gmagick_destroy -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_clippathimage, 0, 2, _IS_BOOL, 0) -+ ZEND_ARG_TYPE_INFO(0, pathname, IS_STRING, 0) -+ ZEND_ARG_TYPE_INFO(0, inside, _IS_BOOL, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_colorfloodfillimage, 0, 5, _IS_BOOL, 0) -+ ZEND_ARG_INFO(0, fill) -+ ZEND_ARG_TYPE_INFO(0, fuzz, IS_DOUBLE, 0) -+ ZEND_ARG_OBJ_TYPE_MASK(0, bordercolor, GmagickPixel, MAY_BE_STRING, NULL) -+ ZEND_ARG_TYPE_INFO(0, x, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, y, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_colorizeimage, 0, 2, _IS_BOOL, 0) -+ ZEND_ARG_INFO(0, colorize) -+ ZEND_ARG_OBJ_TYPE_MASK(0, opacity, GmagickPixel, MAY_BE_STRING, NULL) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_compareimagechannels, 0, 3, IS_ARRAY, 0) -+ ZEND_ARG_OBJ_INFO(0, reference, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, channel, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, metric, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_compareimages, 0, 2, IS_ARRAY, 0) -+ ZEND_ARG_OBJ_INFO(0, reference, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, metric, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_contrastimage, 0, 1, _IS_BOOL, 0) -+ ZEND_ARG_TYPE_INFO(0, sharpen, _IS_BOOL, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_convolveimage, 0, 1, _IS_BOOL, 0) -+ ZEND_ARG_TYPE_INFO(0, kernel, IS_ARRAY, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_extentimage, 0, 4, _IS_BOOL, 0) -+ ZEND_ARG_TYPE_INFO(0, width, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, height, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, x, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, y, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_getimageboundingbox, 0, 1, IS_ARRAY, 0) -+ ZEND_ARG_TYPE_INFO(0, fuzz, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_getimageattribute, 0, 1, IS_STRING, 0) -+ ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_setimageattribute, 0, 2, _IS_BOOL, 0) -+ ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) -+ ZEND_ARG_TYPE_INFO(0, attribute, IS_STRING, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_getimagechannelextrema, 0, 1, IS_ARRAY, 0) -+ ZEND_ARG_TYPE_INFO(0, channel, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_getimagechannelmean arginfo_class_Gmagick_getimagechannelextrema -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_getimagecolormapcolor, 0, 1, GmagickPixel, 0) -+ ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_setimagecolormapcolor, 0, 2, _IS_BOOL, 0) -+ ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0) -+ ZEND_ARG_INFO(0, color) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_getimagegravity arginfo_class_Gmagick_getimagecolors -+ -+#if defined(HAVE_GMAGICK_SET_IMAGE_GRAVITY) -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_setimagegravity, 0, 1, _IS_BOOL, 0) -+ ZEND_ARG_TYPE_INFO(0, gravity, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+#endif -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_setimagemattecolor, 0, 1, _IS_BOOL, 0) -+ ZEND_ARG_INFO(0, color) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_getimagevirtualpixelmethod arginfo_class_Gmagick_getimagecolors -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_setimagevirtualpixelmethod, 0, 1, _IS_BOOL, 0) -+ ZEND_ARG_TYPE_INFO(0, method, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_haldclutimage, 0, 1, _IS_BOOL, 0) -+ ZEND_ARG_OBJ_INFO(0, hald, Gmagick, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_mattefloodfillimage, 0, 5, _IS_BOOL, 0) -+ ZEND_ARG_TYPE_INFO(0, alpha, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, fuzz, IS_DOUBLE, 0) -+ ZEND_ARG_INFO(0, bordercolor) -+ ZEND_ARG_TYPE_INFO(0, x, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, y, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_montageimage, 0, 5, Gmagick, 0) -+ ZEND_ARG_OBJ_INFO(0, drawing_wand, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, tile_geometry, IS_STRING, 0) -+ ZEND_ARG_TYPE_INFO(0, thumbnail_geometry, IS_STRING, 0) -+ ZEND_ARG_TYPE_INFO(0, mode, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, frame, IS_STRING, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_morphimages, 0, 1, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, frames, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_mosaicimages arginfo_class_Gmagick_clear -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_shaveimage, 0, 2, _IS_BOOL, 0) -+ ZEND_ARG_TYPE_INFO(0, columns, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, rows, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_steganoimage, 0, 2, Gmagick, 0) -+ ZEND_ARG_OBJ_INFO(0, watermark_wand, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_stereoimage, 0, 1, Gmagick, 0) -+ ZEND_ARG_OBJ_INFO(0, object_wand, Gmagick, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_transformimage, 0, 2, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, crop, IS_STRING, 0) -+ ZEND_ARG_TYPE_INFO(0, geometry, IS_STRING, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_waveimage, 0, 2, _IS_BOOL, 0) -+ ZEND_ARG_TYPE_INFO(0, amplitude, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, length, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_getimagefuzz arginfo_class_Gmagick_getimagegamma -+ -+#define arginfo_class_Gmagick_setimagefuzz arginfo_class_Gmagick_trimimage -+ -+#define arginfo_class_Gmagick_getimagesavedtype arginfo_class_Gmagick_getimagecolors -+ -+#define arginfo_class_Gmagick_setdepth arginfo_class_Gmagick_setimagedepth -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_setimageoption, 0, 3, _IS_BOOL, 0) -+ ZEND_ARG_TYPE_INFO(0, format, IS_STRING, 0) -+ ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) -+ ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_setimagesavedtype, 0, 1, _IS_BOOL, 0) -+ ZEND_ARG_TYPE_INFO(0, type, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_setformat, 0, 1, _IS_BOOL, 0) -+ ZEND_ARG_TYPE_INFO(0, format, IS_STRING, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_setresolutionunits, 0, 1, _IS_BOOL, 0) -+ ZEND_ARG_TYPE_INFO(0, resolution_type, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_getimagegeometry arginfo_class_Gmagick_getversion -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_getresourcelimit, 0, 1, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, type, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_setresourcelimit, 0, 2, _IS_BOOL, 0) -+ ZEND_ARG_TYPE_INFO(0, type, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, limit, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_negateimage, 0, 1, _IS_BOOL, 0) -+ ZEND_ARG_TYPE_INFO(0, gray, _IS_BOOL, 0) -+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, channel, IS_LONG, 0, "CHANNEL_DEFAULT") -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_sharpenimage, 0, 2, _IS_BOOL, 0) -+ ZEND_ARG_TYPE_INFO(0, radius, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, sigma, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_textureimage, 0, 1, Gmagick, 0) -+ ZEND_ARG_OBJ_INFO(0, texture_wand, Gmagick, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_flattenimages arginfo_class_Gmagick_clear -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_sampleimage, 0, 2, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, cols, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, rows, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, fit, _IS_BOOL, 0, "false") -+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, legacy, _IS_BOOL, 0, "false") -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_cloneimage arginfo_class_Gmagick_clear -+ -+#define arginfo_class_Gmagick_appendimages arginfo_class_Gmagick_clear -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Gmagick_unsharpmaskimage, 0, 4, Gmagick, 0) -+ ZEND_ARG_TYPE_INFO(0, radius, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, sigma, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, amount, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, threshold, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_setresolution, 0, 4, _IS_BOOL, 0) -+ ZEND_ARG_TYPE_INFO(0, x_resolution, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, y_resolution, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, amount, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, threshold, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_adaptivethresholdimage, 0, 3, _IS_BOOL, 0) -+ ZEND_ARG_TYPE_INFO(0, width, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, height, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Gmagick_affinetransformimage, 0, 1, _IS_BOOL, 0) -+ ZEND_ARG_OBJ_INFO(0, drawing_wand, GmagickDraw, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_Gmagick_averageimages arginfo_class_Gmagick_clear -+ -+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_GmagickPixel___construct, 0, 0, 0) -+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, color, IS_STRING, 1, "null") -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_class_GmagickPixel_getcolor, 0, 0, MAY_BE_STRING|MAY_BE_ARRAY) -+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, as_array, _IS_BOOL, 0, "false") -+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, normalize_array, _IS_BOOL, 0, "false") -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickPixel_setcolor, 0, 1, GmagickPixel, 0) -+ ZEND_ARG_TYPE_INFO(0, color, IS_STRING, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_GmagickPixel_getcolorcount arginfo_class_Gmagick_getimagecolors -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickPixel_setcolorcount, 0, 1, GmagickPixel, 0) -+ ZEND_ARG_TYPE_INFO(0, color_count, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_GmagickPixel_getcolorvalue, 0, 1, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, color, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickPixel_setcolorvalue, 0, 2, GmagickPixel, 0) -+ ZEND_ARG_TYPE_INFO(0, color, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, value, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_GmagickPixel_getcolorvaluequantum, 0, 1, IS_LONG, 0) -+ ZEND_ARG_TYPE_INFO(0, color, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_GmagickPixel_setcolorvaluequantum arginfo_class_GmagickPixel_setcolorvalue -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_setstrokecolor, 0, 1, GmagickDraw, 0) -+ ZEND_ARG_OBJ_TYPE_MASK(0, color, GmagickPixel, MAY_BE_STRING, NULL) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_setstrokewidth, 0, 1, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, width, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_ellipse, 0, 6, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, ox, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, oy, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, rx, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, ry, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, start, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, end, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_annotate, 0, 3, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, x, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, y, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, text, IS_STRING, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_GmagickDraw_affine, 0, 1, _IS_BOOL, 0) -+ ZEND_ARG_TYPE_INFO(0, affine, IS_ARRAY, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_arc, 0, 6, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, sx, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, sy, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, ex, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, ey, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, sd, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, ed, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_bezier, 0, 1, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, coordinates, IS_ARRAY, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_GmagickDraw_getfillcolor arginfo_class_Gmagick_getimagebackgroundcolor -+ -+#define arginfo_class_GmagickDraw_getfillopacity arginfo_class_Gmagick_getimagegamma -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_class_GmagickDraw_getfont, 0, 0, MAY_BE_STRING|MAY_BE_FALSE) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_GmagickDraw_getfontfamily arginfo_class_GmagickDraw_getfont -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_setfontfamily, 0, 1, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, font_family, IS_STRING, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_GmagickDraw_getfontsize arginfo_class_Gmagick_getimagegamma -+ -+#define arginfo_class_GmagickDraw_getfontstyle arginfo_class_Gmagick_getimagecolors -+ -+#define arginfo_class_GmagickDraw_getfontweight arginfo_class_Gmagick_getimagecolors -+ -+#define arginfo_class_GmagickDraw_getstrokeopacity arginfo_class_Gmagick_getimagegamma -+ -+#define arginfo_class_GmagickDraw_getstrokecolor arginfo_class_Gmagick_getimagebackgroundcolor -+ -+#define arginfo_class_GmagickDraw_getstrokewidth arginfo_class_Gmagick_getimagegamma -+ -+#define arginfo_class_GmagickDraw_gettextdecoration arginfo_class_Gmagick_getimagecolors -+ -+#define arginfo_class_GmagickDraw_gettextencoding arginfo_class_GmagickDraw_getfont -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_line, 0, 4, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, sx, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, sy, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, ex, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, ey, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_point, 0, 2, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, x, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, y, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_GmagickDraw_polygon arginfo_class_GmagickDraw_bezier -+ -+#define arginfo_class_GmagickDraw_polyline arginfo_class_GmagickDraw_bezier -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_rectangle, 0, 4, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, x1, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, y1, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, x2, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, y2, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_rotate, 0, 1, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, degrees, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_roundrectangle, 0, 6, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, x1, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, y1, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, x2, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, y2, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, rx, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, ry, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_GmagickDraw_scale arginfo_class_GmagickDraw_point -+ -+#define arginfo_class_GmagickDraw_setfillcolor arginfo_class_GmagickDraw_setstrokecolor -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_setfillopacity, 0, 1, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, fill_opacity, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_setfont, 0, 1, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, font, IS_STRING, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_setfontsize, 0, 1, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, pointsize, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_setfontstyle, 0, 1, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, style, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_setfontweight, 0, 1, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, weight, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_setstrokeopacity, 0, 1, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, stroke_opacity, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_settextdecoration, 0, 1, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, decoration, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_settextencoding, 0, 1, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, encoding, IS_STRING, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_GmagickDraw_getgravity arginfo_class_Gmagick_getimagecolors -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_setgravity, 0, 1, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, gravity, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_GmagickDraw_getstrokeantialias arginfo_class_Gmagick_destroy -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_setstrokeantialias, 0, 1, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, antialias, _IS_BOOL, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_GmagickDraw_getstrokedashoffset arginfo_class_Gmagick_getimagegamma -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_setstrokedashoffset, 0, 1, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, offset, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_GmagickDraw_getstrokelinecap arginfo_class_Gmagick_getimagecolors -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_setstrokelinecap, 0, 1, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, linecap, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_GmagickDraw_getstrokelinejoin arginfo_class_Gmagick_getimagecolors -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_setstrokelinejoin, 0, 1, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, linejoin, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_GmagickDraw_getstrokemiterlimit arginfo_class_Gmagick_getimagecolors -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_setstrokemiterlimit, 0, 1, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, miterlimit, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+#if GMAGICK_LIB_MASK >= 1003000 -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_GmagickDraw_getstrokedasharray, 0, 0, IS_ARRAY, 0) -+ZEND_END_ARG_INFO() -+#endif -+ -+#if GMAGICK_LIB_MASK >= 1003000 -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_setstrokedasharray, 0, 1, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, dash_array, IS_ARRAY, 0) -+ZEND_END_ARG_INFO() -+#endif -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_circle, 0, 4, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, ox, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, oy, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, px, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, py, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_GmagickDraw_getclippath arginfo_class_GmagickDraw_getfont -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_setclippath, 0, 1, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, clip_mask, IS_STRING, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_GmagickDraw_getcliprule arginfo_class_Gmagick_getimagecolors -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_setcliprule, 0, 1, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, fill_rule, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_GmagickDraw_getclipunits arginfo_class_Gmagick_getimagecolors -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_setclipunits, 0, 1, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, clip_units, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_color, 0, 3, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, x, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, y, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, paint_method, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_comment, 0, 1, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, comment, IS_STRING, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_setfillpatternurl, 0, 1, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, fill_url, IS_STRING, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_GmagickDraw_getfillrule arginfo_class_Gmagick_getimagecolors -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_setfillrule, 0, 1, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, fill_rule, IS_STRING, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_GmagickDraw_getfontstretch arginfo_class_Gmagick_getimagecolors -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_GmagickDraw_setfontstretch, 0, 1, _IS_BOOL, 0) -+ ZEND_ARG_TYPE_INFO(0, font_stretch, IS_LONG, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_pathclose, 0, 0, GmagickDraw, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_pathcurvetoabsolute, 0, 6, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, x1, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, y1, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, x2, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, y2, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, x, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, y, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_GmagickDraw_pathcurvetorelative arginfo_class_GmagickDraw_pathcurvetoabsolute -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_pathcurvetoquadraticbezierabsolute, 0, 4, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, x1, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, y1, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, x, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, y, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_GmagickDraw_pathcurvetoquadraticbezierrelative arginfo_class_GmagickDraw_pathcurvetoquadraticbezierabsolute -+ -+#define arginfo_class_GmagickDraw_pathcurvetoquadraticbeziersmoothabsolute arginfo_class_GmagickDraw_point -+ -+#define arginfo_class_GmagickDraw_pathcurvetoquadraticbeziersmoothrelative arginfo_class_GmagickDraw_point -+ -+#define arginfo_class_GmagickDraw_pathcurvetosmoothabsolute arginfo_class_GmagickDraw_pathcurvetoquadraticbezierabsolute -+ -+#define arginfo_class_GmagickDraw_pathcurvetosmoothrelative arginfo_class_GmagickDraw_pathcurvetoquadraticbezierabsolute -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_pathellipticarcabsolute, 0, 7, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, rx, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, ry, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, x_axis_rotation, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, large_arc_flag, _IS_BOOL, 0) -+ ZEND_ARG_TYPE_INFO(0, sweep_flag, _IS_BOOL, 0) -+ ZEND_ARG_TYPE_INFO(0, x, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, y, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_GmagickDraw_pathellipticarcrelative arginfo_class_GmagickDraw_pathellipticarcabsolute -+ -+#define arginfo_class_GmagickDraw_pathmovetoabsolute arginfo_class_GmagickDraw_point -+ -+#define arginfo_class_GmagickDraw_pathmovetorelative arginfo_class_GmagickDraw_point -+ -+#define arginfo_class_GmagickDraw_pathlinetoabsolute arginfo_class_GmagickDraw_point -+ -+#define arginfo_class_GmagickDraw_pathlinetorelative arginfo_class_GmagickDraw_point -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_pathlinetohorizontalabsolute, 0, 1, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, x, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_GmagickDraw_pathlinetohorizontalrelative arginfo_class_GmagickDraw_pathlinetohorizontalabsolute -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_pathlinetoverticalabsolute, 0, 1, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, y, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_GmagickDraw_pathlinetoverticalrelative arginfo_class_GmagickDraw_pathlinetoverticalabsolute -+ -+#define arginfo_class_GmagickDraw_pathstart arginfo_class_GmagickDraw_pathclose -+ -+#define arginfo_class_GmagickDraw_pathfinish arginfo_class_GmagickDraw_pathclose -+ -+#define arginfo_class_GmagickDraw_popclippath arginfo_class_GmagickDraw_pathclose -+ -+#define arginfo_class_GmagickDraw_popdefs arginfo_class_GmagickDraw_pathclose -+ -+#define arginfo_class_GmagickDraw_pushdefs arginfo_class_GmagickDraw_pathclose -+ -+#define arginfo_class_GmagickDraw_poppattern arginfo_class_GmagickDraw_pathclose -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_pushpattern, 0, 5, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, pattern_id, IS_STRING, 0) -+ ZEND_ARG_TYPE_INFO(0, x, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, y, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, width, IS_DOUBLE, 0) -+ ZEND_ARG_TYPE_INFO(0, height, IS_DOUBLE, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_pushclippath, 0, 1, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, clip_mask_id, IS_STRING, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_GmagickDraw_skewx arginfo_class_GmagickDraw_rotate -+ -+#define arginfo_class_GmagickDraw_skewy arginfo_class_GmagickDraw_rotate -+ -+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_GmagickDraw_setstrokepatternurl, 0, 1, GmagickDraw, 0) -+ ZEND_ARG_TYPE_INFO(0, stroke_url, IS_STRING, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_GmagickDraw_gettextantialias arginfo_class_Gmagick_destroy -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_GmagickDraw_settextantialias, 0, 1, _IS_BOOL, 0) -+ ZEND_ARG_TYPE_INFO(0, anti_alias, _IS_BOOL, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_class_GmagickDraw_gettextundercolor arginfo_class_Gmagick_getimagebackgroundcolor -+ -+#define arginfo_class_GmagickDraw_settextundercolor arginfo_class_GmagickDraw_setstrokecolor -+ -+#define arginfo_class_GmagickDraw_translate arginfo_class_GmagickDraw_point -+ -+#define arginfo_class_GmagickDraw_setviewbox arginfo_class_GmagickDraw_rectangle -+ -+#define arginfo_class_GmagickDraw_popGraphicContext arginfo_class_GmagickDraw_pathclose -+ -+#define arginfo_class_GmagickDraw_pushGraphicContext arginfo_class_GmagickDraw_pathclose -+ -+ -+ZEND_METHOD(Gmagick, __construct); -+ZEND_METHOD(Gmagick, __tostring); -+ZEND_METHOD(Gmagick, readimage); -+ZEND_METHOD(Gmagick, readimagefile); -+ZEND_METHOD(Gmagick, writeimage); -+ZEND_METHOD(Gmagick, writeimagefile); -+ZEND_METHOD(Gmagick, getversion); -+ZEND_METHOD(Gmagick, annotateimage); -+ZEND_METHOD(Gmagick, blurimage); -+#if GMAGICK_LIB_MASK >= 1003007 -+ZEND_METHOD(Gmagick, setcompressionquality); -+#endif -+#if GMAGICK_LIB_MASK >= 1005000 -+ZEND_METHOD(Gmagick, getimagematte); -+#endif -+#if defined(GMAGICK_HAVE_SET_IMAGE_PAGE) -+ZEND_METHOD(Gmagick, setimagepage); -+#endif -+#if defined(GMAGICK_HAVE_SET_IMAGE_PAGE) -+ZEND_METHOD(Gmagick, getimagepage); -+#endif -+ZEND_METHOD(Gmagick, thumbnailimage); -+ZEND_METHOD(Gmagick, resizeimage); -+ZEND_METHOD(Gmagick, clear); -+ZEND_METHOD(Gmagick, cropimage); -+ZEND_METHOD(Gmagick, cropthumbnailimage); -+ZEND_METHOD(Gmagick, coalesceimages); -+ZEND_METHOD(Gmagick, compositeimage); -+ZEND_METHOD(Gmagick, addimage); -+ZEND_METHOD(Gmagick, addnoiseimage); -+ZEND_METHOD(Gmagick, borderimage); -+ZEND_METHOD(Gmagick, thresholdimage); -+ZEND_METHOD(Gmagick, charcoalimage); -+ZEND_METHOD(Gmagick, chopimage); -+ZEND_METHOD(Gmagick, commentimage); -+ZEND_METHOD(Gmagick, current); -+ZEND_METHOD(Gmagick, cyclecolormapimage); -+ZEND_METHOD(Gmagick, deconstructimages); -+ZEND_METHOD(Gmagick, despeckleimage); -+ZEND_METHOD(Gmagick, destroy); -+ZEND_METHOD(Gmagick, drawimage); -+ZEND_METHOD(Gmagick, edgeimage); -+ZEND_METHOD(Gmagick, embossimage); -+ZEND_METHOD(Gmagick, enhanceimage); -+ZEND_METHOD(Gmagick, equalizeimage); -+ZEND_METHOD(Gmagick, flipimage); -+ZEND_METHOD(Gmagick, flopimage); -+ZEND_METHOD(Gmagick, frameimage); -+ZEND_METHOD(Gmagick, gammaimage); -+ZEND_METHOD(Gmagick, getcopyright); -+ZEND_METHOD(Gmagick, getfilename); -+ZEND_METHOD(Gmagick, getimage); -+ZEND_METHOD(Gmagick, setimage); -+ZEND_METHOD(Gmagick, getimagebackgroundcolor); -+ZEND_METHOD(Gmagick, getimageblob); -+ZEND_METHOD(Gmagick, getimagesblob); -+ZEND_METHOD(Gmagick, getimageblueprimary); -+ZEND_METHOD(Gmagick, getimagebordercolor); -+ZEND_METHOD(Gmagick, getimagechanneldepth); -+ZEND_METHOD(Gmagick, getimagecolors); -+ZEND_METHOD(Gmagick, getimagecolorspace); -+ZEND_METHOD(Gmagick, getimagecompose); -+ZEND_METHOD(Gmagick, getimagedelay); -+ZEND_METHOD(Gmagick, getimagedepth); -+ZEND_METHOD(Gmagick, getnumberimages); -+ZEND_METHOD(Gmagick, getimagedispose); -+ZEND_METHOD(Gmagick, getimageextrema); -+ZEND_METHOD(Gmagick, getimagefilename); -+ZEND_METHOD(Gmagick, getimagegamma); -+ZEND_METHOD(Gmagick, getimagegreenprimary); -+ZEND_METHOD(Gmagick, getimageheight); -+ZEND_METHOD(Gmagick, getimagehistogram); -+ZEND_METHOD(Gmagick, getimageindex); -+ZEND_METHOD(Gmagick, getimageinterlacescheme); -+ZEND_METHOD(Gmagick, getimageiterations); -+ZEND_METHOD(Gmagick, getimagemattecolor); -+ZEND_METHOD(Gmagick, getimageprofile); -+ZEND_METHOD(Gmagick, getimageredprimary); -+ZEND_METHOD(Gmagick, getimagerenderingintent); -+ZEND_METHOD(Gmagick, getimageresolution); -+ZEND_METHOD(Gmagick, getimagescene); -+ZEND_METHOD(Gmagick, getimagesignature); -+ZEND_METHOD(Gmagick, getimagetype); -+ZEND_METHOD(Gmagick, getimageunits); -+ZEND_METHOD(Gmagick, getimagewhitepoint); -+ZEND_METHOD(Gmagick, getimagewidth); -+ZEND_METHOD(Gmagick, getpackagename); -+ZEND_METHOD(Gmagick, getquantumdepth); -+ZEND_METHOD(Gmagick, getreleasedate); -+ZEND_METHOD(Gmagick, getsamplingfactors); -+ZEND_METHOD(Gmagick, getsize); -+ZEND_METHOD(Gmagick, setinterlacescheme); -+ZEND_METHOD(Gmagick, hasnextimage); -+ZEND_METHOD(Gmagick, haspreviousimage); -+ZEND_METHOD(Gmagick, implodeimage); -+ZEND_METHOD(Gmagick, labelimage); -+ZEND_METHOD(Gmagick, levelimage); -+ZEND_METHOD(Gmagick, magnifyimage); -+ZEND_METHOD(Gmagick, mapimage); -+ZEND_METHOD(Gmagick, medianfilterimage); -+ZEND_METHOD(Gmagick, minifyimage); -+ZEND_METHOD(Gmagick, modulateimage); -+ZEND_METHOD(Gmagick, motionblurimage); -+ZEND_METHOD(Gmagick, newimage); -+ZEND_METHOD(Gmagick, nextimage); -+ZEND_METHOD(Gmagick, normalizeimage); -+ZEND_METHOD(Gmagick, oilpaintimage); -+ZEND_METHOD(Gmagick, previousimage); -+ZEND_METHOD(Gmagick, profileimage); -+ZEND_METHOD(Gmagick, quantizeimage); -+ZEND_METHOD(Gmagick, quantizeimages); -+ZEND_METHOD(Gmagick, queryfontmetrics); -+ZEND_METHOD(Gmagick, queryfonts); -+ZEND_METHOD(Gmagick, queryformats); -+ZEND_METHOD(Gmagick, radialblurimage); -+ZEND_METHOD(Gmagick, raiseimage); -+ZEND_METHOD(Gmagick, readimageblob); -+ZEND_METHOD(Gmagick, reducenoiseimage); -+ZEND_METHOD(Gmagick, removeimage); -+ZEND_METHOD(Gmagick, removeimageprofile); -+ZEND_METHOD(Gmagick, resampleimage); -+ZEND_METHOD(Gmagick, rollimage); -+ZEND_METHOD(Gmagick, rotateimage); -+ZEND_METHOD(Gmagick, scaleimage); -+ZEND_METHOD(Gmagick, separateimagechannel); -+ZEND_METHOD(Gmagick, setfilename); -+ZEND_METHOD(Gmagick, setimagebackgroundcolor); -+ZEND_METHOD(Gmagick, setimageblueprimary); -+ZEND_METHOD(Gmagick, setimagebordercolor); -+ZEND_METHOD(Gmagick, setimagechanneldepth); -+ZEND_METHOD(Gmagick, setimagecolorspace); -+ZEND_METHOD(Gmagick, setimagecompose); -+ZEND_METHOD(Gmagick, getimagecompression); -+ZEND_METHOD(Gmagick, setimagecompression); -+ZEND_METHOD(Gmagick, setimagedelay); -+ZEND_METHOD(Gmagick, setimagedepth); -+ZEND_METHOD(Gmagick, setimagedispose); -+ZEND_METHOD(Gmagick, setimagefilename); -+ZEND_METHOD(Gmagick, getimageformat); -+ZEND_METHOD(Gmagick, setimageformat); -+ZEND_METHOD(Gmagick, setimagegamma); -+ZEND_METHOD(Gmagick, setimagegreenprimary); -+ZEND_METHOD(Gmagick, setimageindex); -+ZEND_METHOD(Gmagick, setimageinterlacescheme); -+ZEND_METHOD(Gmagick, setimageiterations); -+ZEND_METHOD(Gmagick, setimageprofile); -+ZEND_METHOD(Gmagick, setimageredprimary); -+ZEND_METHOD(Gmagick, setimagerenderingintent); -+ZEND_METHOD(Gmagick, setimageresolution); -+ZEND_METHOD(Gmagick, setimagescene); -+ZEND_METHOD(Gmagick, setimagetype); -+ZEND_METHOD(Gmagick, setimageunits); -+ZEND_METHOD(Gmagick, setimagewhitepoint); -+ZEND_METHOD(Gmagick, setsamplingfactors); -+ZEND_METHOD(Gmagick, setsize); -+ZEND_METHOD(Gmagick, shearimage); -+ZEND_METHOD(Gmagick, solarizeimage); -+ZEND_METHOD(Gmagick, spreadimage); -+ZEND_METHOD(Gmagick, stripimage); -+ZEND_METHOD(Gmagick, swirlimage); -+ZEND_METHOD(Gmagick, trimimage); -+ZEND_METHOD(Gmagick, blackthresholdimage); -+ZEND_METHOD(Gmagick, whitethresholdimage); -+ZEND_METHOD(Gmagick, colordecisionlist); -+ZEND_METHOD(Gmagick, clipimage); -+ZEND_METHOD(Gmagick, clippathimage); -+ZEND_METHOD(Gmagick, colorfloodfillimage); -+ZEND_METHOD(Gmagick, colorizeimage); -+ZEND_METHOD(Gmagick, compareimagechannels); -+ZEND_METHOD(Gmagick, compareimages); -+ZEND_METHOD(Gmagick, contrastimage); -+ZEND_METHOD(Gmagick, convolveimage); -+ZEND_METHOD(Gmagick, extentimage); -+ZEND_METHOD(Gmagick, getimageboundingbox); -+ZEND_METHOD(Gmagick, getimageattribute); -+ZEND_METHOD(Gmagick, setimageattribute); -+ZEND_METHOD(Gmagick, getimagechannelextrema); -+ZEND_METHOD(Gmagick, getimagechannelmean); -+ZEND_METHOD(Gmagick, getimagecolormapcolor); -+ZEND_METHOD(Gmagick, setimagecolormapcolor); -+ZEND_METHOD(Gmagick, getimagegravity); -+#if defined(HAVE_GMAGICK_SET_IMAGE_GRAVITY) -+ZEND_METHOD(Gmagick, setimagegravity); -+#endif -+ZEND_METHOD(Gmagick, setimagemattecolor); -+ZEND_METHOD(Gmagick, getimagevirtualpixelmethod); -+ZEND_METHOD(Gmagick, setimagevirtualpixelmethod); -+ZEND_METHOD(Gmagick, haldclutimage); -+ZEND_METHOD(Gmagick, mattefloodfillimage); -+ZEND_METHOD(Gmagick, montageimage); -+ZEND_METHOD(Gmagick, morphimages); -+ZEND_METHOD(Gmagick, mosaicimages); -+ZEND_METHOD(Gmagick, shaveimage); -+ZEND_METHOD(Gmagick, steganoimage); -+ZEND_METHOD(Gmagick, stereoimage); -+ZEND_METHOD(Gmagick, transformimage); -+ZEND_METHOD(Gmagick, waveimage); -+ZEND_METHOD(Gmagick, getimagefuzz); -+ZEND_METHOD(Gmagick, setimagefuzz); -+ZEND_METHOD(Gmagick, getimagesavedtype); -+ZEND_METHOD(Gmagick, setdepth); -+ZEND_METHOD(Gmagick, setimageoption); -+ZEND_METHOD(Gmagick, setimagesavedtype); -+ZEND_METHOD(Gmagick, setformat); -+ZEND_METHOD(Gmagick, setresolutionunits); -+ZEND_METHOD(Gmagick, getimagegeometry); -+ZEND_METHOD(Gmagick, getresourcelimit); -+ZEND_METHOD(Gmagick, setresourcelimit); -+ZEND_METHOD(Gmagick, negateimage); -+ZEND_METHOD(Gmagick, sharpenimage); -+ZEND_METHOD(Gmagick, textureimage); -+ZEND_METHOD(Gmagick, flattenimages); -+ZEND_METHOD(Gmagick, sampleimage); -+ZEND_METHOD(Gmagick, cloneimage); -+ZEND_METHOD(Gmagick, appendimages); -+ZEND_METHOD(Gmagick, unsharpmaskimage); -+ZEND_METHOD(Gmagick, setresolution); -+ZEND_METHOD(Gmagick, adaptivethresholdimage); -+ZEND_METHOD(Gmagick, affinetransformimage); -+ZEND_METHOD(Gmagick, averageimages); -+ZEND_METHOD(GmagickPixel, __construct); -+ZEND_METHOD(GmagickPixel, getcolor); -+ZEND_METHOD(GmagickPixel, setcolor); -+ZEND_METHOD(GmagickPixel, getcolorcount); -+ZEND_METHOD(GmagickPixel, setcolorcount); -+ZEND_METHOD(GmagickPixel, getcolorvalue); -+ZEND_METHOD(GmagickPixel, setcolorvalue); -+ZEND_METHOD(GmagickPixel, getcolorvaluequantum); -+ZEND_METHOD(GmagickPixel, setcolorvaluequantum); -+ZEND_METHOD(GmagickDraw, setstrokecolor); -+ZEND_METHOD(GmagickDraw, setstrokewidth); -+ZEND_METHOD(GmagickDraw, ellipse); -+ZEND_METHOD(GmagickDraw, annotate); -+ZEND_METHOD(GmagickDraw, affine); -+ZEND_METHOD(GmagickDraw, arc); -+ZEND_METHOD(GmagickDraw, bezier); -+ZEND_METHOD(GmagickDraw, getfillcolor); -+ZEND_METHOD(GmagickDraw, getfillopacity); -+ZEND_METHOD(GmagickDraw, getfont); -+ZEND_METHOD(GmagickDraw, getfontfamily); -+ZEND_METHOD(GmagickDraw, setfontfamily); -+ZEND_METHOD(GmagickDraw, getfontsize); -+ZEND_METHOD(GmagickDraw, getfontstyle); -+ZEND_METHOD(GmagickDraw, getfontweight); -+ZEND_METHOD(GmagickDraw, getstrokeopacity); -+ZEND_METHOD(GmagickDraw, getstrokecolor); -+ZEND_METHOD(GmagickDraw, getstrokewidth); -+ZEND_METHOD(GmagickDraw, gettextdecoration); -+ZEND_METHOD(GmagickDraw, gettextencoding); -+ZEND_METHOD(GmagickDraw, line); -+ZEND_METHOD(GmagickDraw, point); -+ZEND_METHOD(GmagickDraw, polygon); -+ZEND_METHOD(GmagickDraw, polyline); -+ZEND_METHOD(GmagickDraw, rectangle); -+ZEND_METHOD(GmagickDraw, rotate); -+ZEND_METHOD(GmagickDraw, roundrectangle); -+ZEND_METHOD(GmagickDraw, scale); -+ZEND_METHOD(GmagickDraw, setfillcolor); -+ZEND_METHOD(GmagickDraw, setfillopacity); -+ZEND_METHOD(GmagickDraw, setfont); -+ZEND_METHOD(GmagickDraw, setfontsize); -+ZEND_METHOD(GmagickDraw, setfontstyle); -+ZEND_METHOD(GmagickDraw, setfontweight); -+ZEND_METHOD(GmagickDraw, setstrokeopacity); -+ZEND_METHOD(GmagickDraw, settextdecoration); -+ZEND_METHOD(GmagickDraw, settextencoding); -+ZEND_METHOD(GmagickDraw, getgravity); -+ZEND_METHOD(GmagickDraw, setgravity); -+ZEND_METHOD(GmagickDraw, getstrokeantialias); -+ZEND_METHOD(GmagickDraw, setstrokeantialias); -+ZEND_METHOD(GmagickDraw, getstrokedashoffset); -+ZEND_METHOD(GmagickDraw, setstrokedashoffset); -+ZEND_METHOD(GmagickDraw, getstrokelinecap); -+ZEND_METHOD(GmagickDraw, setstrokelinecap); -+ZEND_METHOD(GmagickDraw, getstrokelinejoin); -+ZEND_METHOD(GmagickDraw, setstrokelinejoin); -+ZEND_METHOD(GmagickDraw, getstrokemiterlimit); -+ZEND_METHOD(GmagickDraw, setstrokemiterlimit); -+#if GMAGICK_LIB_MASK >= 1003000 -+ZEND_METHOD(GmagickDraw, getstrokedasharray); -+#endif -+#if GMAGICK_LIB_MASK >= 1003000 -+ZEND_METHOD(GmagickDraw, setstrokedasharray); -+#endif -+ZEND_METHOD(GmagickDraw, circle); -+ZEND_METHOD(GmagickDraw, getclippath); -+ZEND_METHOD(GmagickDraw, setclippath); -+ZEND_METHOD(GmagickDraw, getcliprule); -+ZEND_METHOD(GmagickDraw, setcliprule); -+ZEND_METHOD(GmagickDraw, getclipunits); -+ZEND_METHOD(GmagickDraw, setclipunits); -+ZEND_METHOD(GmagickDraw, color); -+ZEND_METHOD(GmagickDraw, comment); -+ZEND_METHOD(GmagickDraw, setfillpatternurl); -+ZEND_METHOD(GmagickDraw, getfillrule); -+ZEND_METHOD(GmagickDraw, setfillrule); -+ZEND_METHOD(GmagickDraw, getfontstretch); -+ZEND_METHOD(GmagickDraw, setfontstretch); -+ZEND_METHOD(GmagickDraw, pathclose); -+ZEND_METHOD(GmagickDraw, pathcurvetoabsolute); -+ZEND_METHOD(GmagickDraw, pathcurvetorelative); -+ZEND_METHOD(GmagickDraw, pathcurvetoquadraticbezierabsolute); -+ZEND_METHOD(GmagickDraw, pathcurvetoquadraticbezierrelative); -+ZEND_METHOD(GmagickDraw, pathcurvetoquadraticbeziersmoothabsolute); -+ZEND_METHOD(GmagickDraw, pathcurvetoquadraticbeziersmoothrelative); -+ZEND_METHOD(GmagickDraw, pathcurvetosmoothabsolute); -+ZEND_METHOD(GmagickDraw, pathcurvetosmoothrelative); -+ZEND_METHOD(GmagickDraw, pathellipticarcabsolute); -+ZEND_METHOD(GmagickDraw, pathellipticarcrelative); -+ZEND_METHOD(GmagickDraw, pathmovetoabsolute); -+ZEND_METHOD(GmagickDraw, pathmovetorelative); -+ZEND_METHOD(GmagickDraw, pathlinetoabsolute); -+ZEND_METHOD(GmagickDraw, pathlinetorelative); -+ZEND_METHOD(GmagickDraw, pathlinetohorizontalabsolute); -+ZEND_METHOD(GmagickDraw, pathlinetohorizontalrelative); -+ZEND_METHOD(GmagickDraw, pathlinetoverticalabsolute); -+ZEND_METHOD(GmagickDraw, pathlinetoverticalrelative); -+ZEND_METHOD(GmagickDraw, pathstart); -+ZEND_METHOD(GmagickDraw, pathfinish); -+ZEND_METHOD(GmagickDraw, popclippath); -+ZEND_METHOD(GmagickDraw, popdefs); -+ZEND_METHOD(GmagickDraw, pushdefs); -+ZEND_METHOD(GmagickDraw, poppattern); -+ZEND_METHOD(GmagickDraw, pushpattern); -+ZEND_METHOD(GmagickDraw, pushclippath); -+ZEND_METHOD(GmagickDraw, skewx); -+ZEND_METHOD(GmagickDraw, skewy); -+ZEND_METHOD(GmagickDraw, setstrokepatternurl); -+ZEND_METHOD(GmagickDraw, gettextantialias); -+ZEND_METHOD(GmagickDraw, settextantialias); -+ZEND_METHOD(GmagickDraw, gettextundercolor); -+ZEND_METHOD(GmagickDraw, settextundercolor); -+ZEND_METHOD(GmagickDraw, translate); -+ZEND_METHOD(GmagickDraw, setviewbox); -+ZEND_METHOD(GmagickDraw, popGraphicContext); -+ZEND_METHOD(GmagickDraw, pushGraphicContext); -+ -+ -+static const zend_function_entry class_Gmagick_methods[] = { -+ ZEND_ME(Gmagick, __construct, arginfo_class_Gmagick___construct, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, __tostring, arginfo_class_Gmagick___tostring, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, readimage, arginfo_class_Gmagick_readimage, ZEND_ACC_PUBLIC) -+ ZEND_MALIAS(Gmagick, read, readimage, arginfo_class_Gmagick_read, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, readimagefile, arginfo_class_Gmagick_readimagefile, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, writeimage, arginfo_class_Gmagick_writeimage, ZEND_ACC_PUBLIC) -+ ZEND_MALIAS(Gmagick, write, writeimage, arginfo_class_Gmagick_write, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, writeimagefile, arginfo_class_Gmagick_writeimagefile, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getversion, arginfo_class_Gmagick_getversion, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) -+ ZEND_ME(Gmagick, annotateimage, arginfo_class_Gmagick_annotateimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, blurimage, arginfo_class_Gmagick_blurimage, ZEND_ACC_PUBLIC) -+#if GMAGICK_LIB_MASK >= 1003007 -+ ZEND_ME(Gmagick, setcompressionquality, arginfo_class_Gmagick_setcompressionquality, ZEND_ACC_PUBLIC) -+#endif -+#if GMAGICK_LIB_MASK >= 1005000 -+ ZEND_ME(Gmagick, getimagematte, arginfo_class_Gmagick_getimagematte, ZEND_ACC_PUBLIC) -+#endif -+#if defined(GMAGICK_HAVE_SET_IMAGE_PAGE) -+ ZEND_ME(Gmagick, setimagepage, arginfo_class_Gmagick_setimagepage, ZEND_ACC_PUBLIC) -+#endif -+#if defined(GMAGICK_HAVE_SET_IMAGE_PAGE) -+ ZEND_ME(Gmagick, getimagepage, arginfo_class_Gmagick_getimagepage, ZEND_ACC_PUBLIC) -+#endif -+ ZEND_ME(Gmagick, thumbnailimage, arginfo_class_Gmagick_thumbnailimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, resizeimage, arginfo_class_Gmagick_resizeimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, clear, arginfo_class_Gmagick_clear, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, cropimage, arginfo_class_Gmagick_cropimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, cropthumbnailimage, arginfo_class_Gmagick_cropthumbnailimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, coalesceimages, arginfo_class_Gmagick_coalesceimages, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, compositeimage, arginfo_class_Gmagick_compositeimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, addimage, arginfo_class_Gmagick_addimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, addnoiseimage, arginfo_class_Gmagick_addnoiseimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, borderimage, arginfo_class_Gmagick_borderimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, thresholdimage, arginfo_class_Gmagick_thresholdimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, charcoalimage, arginfo_class_Gmagick_charcoalimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, chopimage, arginfo_class_Gmagick_chopimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, commentimage, arginfo_class_Gmagick_commentimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, current, arginfo_class_Gmagick_current, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, cyclecolormapimage, arginfo_class_Gmagick_cyclecolormapimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, deconstructimages, arginfo_class_Gmagick_deconstructimages, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, despeckleimage, arginfo_class_Gmagick_despeckleimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, destroy, arginfo_class_Gmagick_destroy, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, drawimage, arginfo_class_Gmagick_drawimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, edgeimage, arginfo_class_Gmagick_edgeimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, embossimage, arginfo_class_Gmagick_embossimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, enhanceimage, arginfo_class_Gmagick_enhanceimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, equalizeimage, arginfo_class_Gmagick_equalizeimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, flipimage, arginfo_class_Gmagick_flipimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, flopimage, arginfo_class_Gmagick_flopimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, frameimage, arginfo_class_Gmagick_frameimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, gammaimage, arginfo_class_Gmagick_gammaimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getcopyright, arginfo_class_Gmagick_getcopyright, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getfilename, arginfo_class_Gmagick_getfilename, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimage, arginfo_class_Gmagick_getimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setimage, arginfo_class_Gmagick_setimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimagebackgroundcolor, arginfo_class_Gmagick_getimagebackgroundcolor, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimageblob, arginfo_class_Gmagick_getimageblob, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimagesblob, arginfo_class_Gmagick_getimagesblob, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimageblueprimary, arginfo_class_Gmagick_getimageblueprimary, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimagebordercolor, arginfo_class_Gmagick_getimagebordercolor, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimagechanneldepth, arginfo_class_Gmagick_getimagechanneldepth, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimagecolors, arginfo_class_Gmagick_getimagecolors, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimagecolorspace, arginfo_class_Gmagick_getimagecolorspace, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimagecompose, arginfo_class_Gmagick_getimagecompose, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimagedelay, arginfo_class_Gmagick_getimagedelay, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimagedepth, arginfo_class_Gmagick_getimagedepth, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getnumberimages, arginfo_class_Gmagick_getnumberimages, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimagedispose, arginfo_class_Gmagick_getimagedispose, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimageextrema, arginfo_class_Gmagick_getimageextrema, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimagefilename, arginfo_class_Gmagick_getimagefilename, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimagegamma, arginfo_class_Gmagick_getimagegamma, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimagegreenprimary, arginfo_class_Gmagick_getimagegreenprimary, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimageheight, arginfo_class_Gmagick_getimageheight, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimagehistogram, arginfo_class_Gmagick_getimagehistogram, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimageindex, arginfo_class_Gmagick_getimageindex, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimageinterlacescheme, arginfo_class_Gmagick_getimageinterlacescheme, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimageiterations, arginfo_class_Gmagick_getimageiterations, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimagemattecolor, arginfo_class_Gmagick_getimagemattecolor, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimageprofile, arginfo_class_Gmagick_getimageprofile, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimageredprimary, arginfo_class_Gmagick_getimageredprimary, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimagerenderingintent, arginfo_class_Gmagick_getimagerenderingintent, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimageresolution, arginfo_class_Gmagick_getimageresolution, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimagescene, arginfo_class_Gmagick_getimagescene, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimagesignature, arginfo_class_Gmagick_getimagesignature, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimagetype, arginfo_class_Gmagick_getimagetype, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimageunits, arginfo_class_Gmagick_getimageunits, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimagewhitepoint, arginfo_class_Gmagick_getimagewhitepoint, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimagewidth, arginfo_class_Gmagick_getimagewidth, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getpackagename, arginfo_class_Gmagick_getpackagename, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getquantumdepth, arginfo_class_Gmagick_getquantumdepth, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getreleasedate, arginfo_class_Gmagick_getreleasedate, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getsamplingfactors, arginfo_class_Gmagick_getsamplingfactors, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getsize, arginfo_class_Gmagick_getsize, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setinterlacescheme, arginfo_class_Gmagick_setinterlacescheme, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, hasnextimage, arginfo_class_Gmagick_hasnextimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, haspreviousimage, arginfo_class_Gmagick_haspreviousimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, implodeimage, arginfo_class_Gmagick_implodeimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, labelimage, arginfo_class_Gmagick_labelimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, levelimage, arginfo_class_Gmagick_levelimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, magnifyimage, arginfo_class_Gmagick_magnifyimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, mapimage, arginfo_class_Gmagick_mapimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, medianfilterimage, arginfo_class_Gmagick_medianfilterimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, minifyimage, arginfo_class_Gmagick_minifyimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, modulateimage, arginfo_class_Gmagick_modulateimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, motionblurimage, arginfo_class_Gmagick_motionblurimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, newimage, arginfo_class_Gmagick_newimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, nextimage, arginfo_class_Gmagick_nextimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, normalizeimage, arginfo_class_Gmagick_normalizeimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, oilpaintimage, arginfo_class_Gmagick_oilpaintimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, previousimage, arginfo_class_Gmagick_previousimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, profileimage, arginfo_class_Gmagick_profileimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, quantizeimage, arginfo_class_Gmagick_quantizeimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, quantizeimages, arginfo_class_Gmagick_quantizeimages, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, queryfontmetrics, arginfo_class_Gmagick_queryfontmetrics, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, queryfonts, arginfo_class_Gmagick_queryfonts, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, queryformats, arginfo_class_Gmagick_queryformats, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, radialblurimage, arginfo_class_Gmagick_radialblurimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, raiseimage, arginfo_class_Gmagick_raiseimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, readimageblob, arginfo_class_Gmagick_readimageblob, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, reducenoiseimage, arginfo_class_Gmagick_reducenoiseimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, removeimage, arginfo_class_Gmagick_removeimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, removeimageprofile, arginfo_class_Gmagick_removeimageprofile, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, resampleimage, arginfo_class_Gmagick_resampleimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, rollimage, arginfo_class_Gmagick_rollimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, rotateimage, arginfo_class_Gmagick_rotateimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, scaleimage, arginfo_class_Gmagick_scaleimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, separateimagechannel, arginfo_class_Gmagick_separateimagechannel, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setfilename, arginfo_class_Gmagick_setfilename, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setimagebackgroundcolor, arginfo_class_Gmagick_setimagebackgroundcolor, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setimageblueprimary, arginfo_class_Gmagick_setimageblueprimary, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setimagebordercolor, arginfo_class_Gmagick_setimagebordercolor, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setimagechanneldepth, arginfo_class_Gmagick_setimagechanneldepth, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setimagecolorspace, arginfo_class_Gmagick_setimagecolorspace, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setimagecompose, arginfo_class_Gmagick_setimagecompose, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimagecompression, arginfo_class_Gmagick_getimagecompression, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setimagecompression, arginfo_class_Gmagick_setimagecompression, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setimagedelay, arginfo_class_Gmagick_setimagedelay, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setimagedepth, arginfo_class_Gmagick_setimagedepth, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setimagedispose, arginfo_class_Gmagick_setimagedispose, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setimagefilename, arginfo_class_Gmagick_setimagefilename, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimageformat, arginfo_class_Gmagick_getimageformat, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setimageformat, arginfo_class_Gmagick_setimageformat, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setimagegamma, arginfo_class_Gmagick_setimagegamma, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setimagegreenprimary, arginfo_class_Gmagick_setimagegreenprimary, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setimageindex, arginfo_class_Gmagick_setimageindex, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setimageinterlacescheme, arginfo_class_Gmagick_setimageinterlacescheme, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setimageiterations, arginfo_class_Gmagick_setimageiterations, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setimageprofile, arginfo_class_Gmagick_setimageprofile, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setimageredprimary, arginfo_class_Gmagick_setimageredprimary, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setimagerenderingintent, arginfo_class_Gmagick_setimagerenderingintent, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setimageresolution, arginfo_class_Gmagick_setimageresolution, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setimagescene, arginfo_class_Gmagick_setimagescene, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setimagetype, arginfo_class_Gmagick_setimagetype, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setimageunits, arginfo_class_Gmagick_setimageunits, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setimagewhitepoint, arginfo_class_Gmagick_setimagewhitepoint, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setsamplingfactors, arginfo_class_Gmagick_setsamplingfactors, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setsize, arginfo_class_Gmagick_setsize, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, shearimage, arginfo_class_Gmagick_shearimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, solarizeimage, arginfo_class_Gmagick_solarizeimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, spreadimage, arginfo_class_Gmagick_spreadimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, stripimage, arginfo_class_Gmagick_stripimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, swirlimage, arginfo_class_Gmagick_swirlimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, trimimage, arginfo_class_Gmagick_trimimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, blackthresholdimage, arginfo_class_Gmagick_blackthresholdimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, whitethresholdimage, arginfo_class_Gmagick_whitethresholdimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, colordecisionlist, arginfo_class_Gmagick_colordecisionlist, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, clipimage, arginfo_class_Gmagick_clipimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, clippathimage, arginfo_class_Gmagick_clippathimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, colorfloodfillimage, arginfo_class_Gmagick_colorfloodfillimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, colorizeimage, arginfo_class_Gmagick_colorizeimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, compareimagechannels, arginfo_class_Gmagick_compareimagechannels, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, compareimages, arginfo_class_Gmagick_compareimages, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, contrastimage, arginfo_class_Gmagick_contrastimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, convolveimage, arginfo_class_Gmagick_convolveimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, extentimage, arginfo_class_Gmagick_extentimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimageboundingbox, arginfo_class_Gmagick_getimageboundingbox, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimageattribute, arginfo_class_Gmagick_getimageattribute, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setimageattribute, arginfo_class_Gmagick_setimageattribute, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimagechannelextrema, arginfo_class_Gmagick_getimagechannelextrema, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimagechannelmean, arginfo_class_Gmagick_getimagechannelmean, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimagecolormapcolor, arginfo_class_Gmagick_getimagecolormapcolor, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setimagecolormapcolor, arginfo_class_Gmagick_setimagecolormapcolor, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimagegravity, arginfo_class_Gmagick_getimagegravity, ZEND_ACC_PUBLIC) -+#if defined(HAVE_GMAGICK_SET_IMAGE_GRAVITY) -+ ZEND_ME(Gmagick, setimagegravity, arginfo_class_Gmagick_setimagegravity, ZEND_ACC_PUBLIC) -+#endif -+ ZEND_ME(Gmagick, setimagemattecolor, arginfo_class_Gmagick_setimagemattecolor, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimagevirtualpixelmethod, arginfo_class_Gmagick_getimagevirtualpixelmethod, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setimagevirtualpixelmethod, arginfo_class_Gmagick_setimagevirtualpixelmethod, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, haldclutimage, arginfo_class_Gmagick_haldclutimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, mattefloodfillimage, arginfo_class_Gmagick_mattefloodfillimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, montageimage, arginfo_class_Gmagick_montageimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, morphimages, arginfo_class_Gmagick_morphimages, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, mosaicimages, arginfo_class_Gmagick_mosaicimages, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, shaveimage, arginfo_class_Gmagick_shaveimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, steganoimage, arginfo_class_Gmagick_steganoimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, stereoimage, arginfo_class_Gmagick_stereoimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, transformimage, arginfo_class_Gmagick_transformimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, waveimage, arginfo_class_Gmagick_waveimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimagefuzz, arginfo_class_Gmagick_getimagefuzz, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setimagefuzz, arginfo_class_Gmagick_setimagefuzz, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimagesavedtype, arginfo_class_Gmagick_getimagesavedtype, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setdepth, arginfo_class_Gmagick_setdepth, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setimageoption, arginfo_class_Gmagick_setimageoption, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setimagesavedtype, arginfo_class_Gmagick_setimagesavedtype, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setformat, arginfo_class_Gmagick_setformat, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setresolutionunits, arginfo_class_Gmagick_setresolutionunits, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getimagegeometry, arginfo_class_Gmagick_getimagegeometry, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, getresourcelimit, arginfo_class_Gmagick_getresourcelimit, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setresourcelimit, arginfo_class_Gmagick_setresourcelimit, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, negateimage, arginfo_class_Gmagick_negateimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, sharpenimage, arginfo_class_Gmagick_sharpenimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, textureimage, arginfo_class_Gmagick_textureimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, flattenimages, arginfo_class_Gmagick_flattenimages, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, sampleimage, arginfo_class_Gmagick_sampleimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, cloneimage, arginfo_class_Gmagick_cloneimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, appendimages, arginfo_class_Gmagick_appendimages, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, unsharpmaskimage, arginfo_class_Gmagick_unsharpmaskimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, setresolution, arginfo_class_Gmagick_setresolution, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, adaptivethresholdimage, arginfo_class_Gmagick_adaptivethresholdimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, affinetransformimage, arginfo_class_Gmagick_affinetransformimage, ZEND_ACC_PUBLIC) -+ ZEND_ME(Gmagick, averageimages, arginfo_class_Gmagick_averageimages, ZEND_ACC_PUBLIC) -+ ZEND_FE_END -+}; -+ -+ -+static const zend_function_entry class_GmagickPixel_methods[] = { -+ ZEND_ME(GmagickPixel, __construct, arginfo_class_GmagickPixel___construct, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickPixel, getcolor, arginfo_class_GmagickPixel_getcolor, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickPixel, setcolor, arginfo_class_GmagickPixel_setcolor, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickPixel, getcolorcount, arginfo_class_GmagickPixel_getcolorcount, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickPixel, setcolorcount, arginfo_class_GmagickPixel_setcolorcount, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickPixel, getcolorvalue, arginfo_class_GmagickPixel_getcolorvalue, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickPixel, setcolorvalue, arginfo_class_GmagickPixel_setcolorvalue, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickPixel, getcolorvaluequantum, arginfo_class_GmagickPixel_getcolorvaluequantum, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickPixel, setcolorvaluequantum, arginfo_class_GmagickPixel_setcolorvaluequantum, ZEND_ACC_PUBLIC) -+ ZEND_FE_END -+}; -+ -+ -+static const zend_function_entry class_GmagickDraw_methods[] = { -+ ZEND_ME(GmagickDraw, setstrokecolor, arginfo_class_GmagickDraw_setstrokecolor, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, setstrokewidth, arginfo_class_GmagickDraw_setstrokewidth, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, ellipse, arginfo_class_GmagickDraw_ellipse, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, annotate, arginfo_class_GmagickDraw_annotate, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, affine, arginfo_class_GmagickDraw_affine, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, arc, arginfo_class_GmagickDraw_arc, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, bezier, arginfo_class_GmagickDraw_bezier, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, getfillcolor, arginfo_class_GmagickDraw_getfillcolor, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, getfillopacity, arginfo_class_GmagickDraw_getfillopacity, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, getfont, arginfo_class_GmagickDraw_getfont, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, getfontfamily, arginfo_class_GmagickDraw_getfontfamily, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, setfontfamily, arginfo_class_GmagickDraw_setfontfamily, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, getfontsize, arginfo_class_GmagickDraw_getfontsize, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, getfontstyle, arginfo_class_GmagickDraw_getfontstyle, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, getfontweight, arginfo_class_GmagickDraw_getfontweight, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, getstrokeopacity, arginfo_class_GmagickDraw_getstrokeopacity, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, getstrokecolor, arginfo_class_GmagickDraw_getstrokecolor, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, getstrokewidth, arginfo_class_GmagickDraw_getstrokewidth, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, gettextdecoration, arginfo_class_GmagickDraw_gettextdecoration, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, gettextencoding, arginfo_class_GmagickDraw_gettextencoding, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, line, arginfo_class_GmagickDraw_line, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, point, arginfo_class_GmagickDraw_point, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, polygon, arginfo_class_GmagickDraw_polygon, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, polyline, arginfo_class_GmagickDraw_polyline, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, rectangle, arginfo_class_GmagickDraw_rectangle, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, rotate, arginfo_class_GmagickDraw_rotate, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, roundrectangle, arginfo_class_GmagickDraw_roundrectangle, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, scale, arginfo_class_GmagickDraw_scale, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, setfillcolor, arginfo_class_GmagickDraw_setfillcolor, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, setfillopacity, arginfo_class_GmagickDraw_setfillopacity, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, setfont, arginfo_class_GmagickDraw_setfont, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, setfontsize, arginfo_class_GmagickDraw_setfontsize, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, setfontstyle, arginfo_class_GmagickDraw_setfontstyle, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, setfontweight, arginfo_class_GmagickDraw_setfontweight, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, setstrokeopacity, arginfo_class_GmagickDraw_setstrokeopacity, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, settextdecoration, arginfo_class_GmagickDraw_settextdecoration, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, settextencoding, arginfo_class_GmagickDraw_settextencoding, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, getgravity, arginfo_class_GmagickDraw_getgravity, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, setgravity, arginfo_class_GmagickDraw_setgravity, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, getstrokeantialias, arginfo_class_GmagickDraw_getstrokeantialias, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, setstrokeantialias, arginfo_class_GmagickDraw_setstrokeantialias, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, getstrokedashoffset, arginfo_class_GmagickDraw_getstrokedashoffset, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, setstrokedashoffset, arginfo_class_GmagickDraw_setstrokedashoffset, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, getstrokelinecap, arginfo_class_GmagickDraw_getstrokelinecap, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, setstrokelinecap, arginfo_class_GmagickDraw_setstrokelinecap, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, getstrokelinejoin, arginfo_class_GmagickDraw_getstrokelinejoin, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, setstrokelinejoin, arginfo_class_GmagickDraw_setstrokelinejoin, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, getstrokemiterlimit, arginfo_class_GmagickDraw_getstrokemiterlimit, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, setstrokemiterlimit, arginfo_class_GmagickDraw_setstrokemiterlimit, ZEND_ACC_PUBLIC) -+#if GMAGICK_LIB_MASK >= 1003000 -+ ZEND_ME(GmagickDraw, getstrokedasharray, arginfo_class_GmagickDraw_getstrokedasharray, ZEND_ACC_PUBLIC) -+#endif -+#if GMAGICK_LIB_MASK >= 1003000 -+ ZEND_ME(GmagickDraw, setstrokedasharray, arginfo_class_GmagickDraw_setstrokedasharray, ZEND_ACC_PUBLIC) -+#endif -+ ZEND_ME(GmagickDraw, circle, arginfo_class_GmagickDraw_circle, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, getclippath, arginfo_class_GmagickDraw_getclippath, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, setclippath, arginfo_class_GmagickDraw_setclippath, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, getcliprule, arginfo_class_GmagickDraw_getcliprule, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, setcliprule, arginfo_class_GmagickDraw_setcliprule, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, getclipunits, arginfo_class_GmagickDraw_getclipunits, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, setclipunits, arginfo_class_GmagickDraw_setclipunits, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, color, arginfo_class_GmagickDraw_color, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, comment, arginfo_class_GmagickDraw_comment, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, setfillpatternurl, arginfo_class_GmagickDraw_setfillpatternurl, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, getfillrule, arginfo_class_GmagickDraw_getfillrule, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, setfillrule, arginfo_class_GmagickDraw_setfillrule, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, getfontstretch, arginfo_class_GmagickDraw_getfontstretch, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, setfontstretch, arginfo_class_GmagickDraw_setfontstretch, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, pathclose, arginfo_class_GmagickDraw_pathclose, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, pathcurvetoabsolute, arginfo_class_GmagickDraw_pathcurvetoabsolute, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, pathcurvetorelative, arginfo_class_GmagickDraw_pathcurvetorelative, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, pathcurvetoquadraticbezierabsolute, arginfo_class_GmagickDraw_pathcurvetoquadraticbezierabsolute, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, pathcurvetoquadraticbezierrelative, arginfo_class_GmagickDraw_pathcurvetoquadraticbezierrelative, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, pathcurvetoquadraticbeziersmoothabsolute, arginfo_class_GmagickDraw_pathcurvetoquadraticbeziersmoothabsolute, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, pathcurvetoquadraticbeziersmoothrelative, arginfo_class_GmagickDraw_pathcurvetoquadraticbeziersmoothrelative, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, pathcurvetosmoothabsolute, arginfo_class_GmagickDraw_pathcurvetosmoothabsolute, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, pathcurvetosmoothrelative, arginfo_class_GmagickDraw_pathcurvetosmoothrelative, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, pathellipticarcabsolute, arginfo_class_GmagickDraw_pathellipticarcabsolute, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, pathellipticarcrelative, arginfo_class_GmagickDraw_pathellipticarcrelative, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, pathmovetoabsolute, arginfo_class_GmagickDraw_pathmovetoabsolute, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, pathmovetorelative, arginfo_class_GmagickDraw_pathmovetorelative, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, pathlinetoabsolute, arginfo_class_GmagickDraw_pathlinetoabsolute, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, pathlinetorelative, arginfo_class_GmagickDraw_pathlinetorelative, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, pathlinetohorizontalabsolute, arginfo_class_GmagickDraw_pathlinetohorizontalabsolute, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, pathlinetohorizontalrelative, arginfo_class_GmagickDraw_pathlinetohorizontalrelative, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, pathlinetoverticalabsolute, arginfo_class_GmagickDraw_pathlinetoverticalabsolute, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, pathlinetoverticalrelative, arginfo_class_GmagickDraw_pathlinetoverticalrelative, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, pathstart, arginfo_class_GmagickDraw_pathstart, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, pathfinish, arginfo_class_GmagickDraw_pathfinish, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, popclippath, arginfo_class_GmagickDraw_popclippath, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, popdefs, arginfo_class_GmagickDraw_popdefs, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, pushdefs, arginfo_class_GmagickDraw_pushdefs, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, poppattern, arginfo_class_GmagickDraw_poppattern, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, pushpattern, arginfo_class_GmagickDraw_pushpattern, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, pushclippath, arginfo_class_GmagickDraw_pushclippath, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, skewx, arginfo_class_GmagickDraw_skewx, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, skewy, arginfo_class_GmagickDraw_skewy, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, setstrokepatternurl, arginfo_class_GmagickDraw_setstrokepatternurl, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, gettextantialias, arginfo_class_GmagickDraw_gettextantialias, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, settextantialias, arginfo_class_GmagickDraw_settextantialias, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, gettextundercolor, arginfo_class_GmagickDraw_gettextundercolor, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, settextundercolor, arginfo_class_GmagickDraw_settextundercolor, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, translate, arginfo_class_GmagickDraw_translate, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, setviewbox, arginfo_class_GmagickDraw_setviewbox, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, popGraphicContext, arginfo_class_GmagickDraw_popGraphicContext, ZEND_ACC_PUBLIC) -+ ZEND_ME(GmagickDraw, pushGraphicContext, arginfo_class_GmagickDraw_pushGraphicContext, ZEND_ACC_PUBLIC) -+ ZEND_FE_END -+}; -diff --git a/gmagick_methods.c b/gmagick_methods.c -index d18633c..2f60add 100644 ---- a/gmagick_methods.c -+++ b/gmagick_methods.c -@@ -53,7 +53,7 @@ static MagickBool OpenBaseDirMonitor(const ConfirmAccessMode mode, - /* {{{ Gmagick Gmagick::read(string filename) - Reads image - */ --PHP_METHOD(gmagick, readimage) -+PHP_METHOD(Gmagick, readimage) - { - php_gmagick_object *intern; - char *filename = NULL; -@@ -78,7 +78,7 @@ PHP_METHOD(gmagick, readimage) - /* {{{ Gmagick Gmagick::__construct([string filename]) - Constructs a new Gmagick object - */ --PHP_METHOD(gmagick, __construct) -+PHP_METHOD(Gmagick, __construct) - { - php_gmagick_object *intern; - char *filename = NULL; -@@ -90,7 +90,7 @@ PHP_METHOD(gmagick, __construct) - if (!filename) { - return; - } -- -+ - intern = Z_GMAGICK_OBJ_P(getThis()); - #if GMAGICK_LIB_MASK >= 1004000 && PHP_VERSION_ID <= 50399 - GMAGICK_SAFEMODE_OPENBASEDIR_CONFIRMACCESS(filename); -@@ -108,7 +108,7 @@ PHP_METHOD(gmagick, __construct) - /* {{{ proto Gmagick Gmagick::annotateImage(GmagickDraw drawing_wand, float x, float y, float angle, string text) - Annotates an image with text. - */ --PHP_METHOD(gmagick, annotateimage) -+PHP_METHOD(Gmagick, annotateimage) - { - php_gmagick_object *intern; - MagickBool status; -@@ -140,7 +140,7 @@ PHP_METHOD(gmagick, annotateimage) - /* {{{ proto Gmagick Gmagick::blurImage(float radius, float sigma ) - Adds blur filter to image. Optional third parameter to blur a specific channel. - */ --PHP_METHOD(gmagick, blurimage) -+PHP_METHOD(Gmagick, blurimage) - { - double radius, sigma; - php_gmagick_object *intern; -@@ -168,20 +168,20 @@ PHP_METHOD(gmagick, blurimage) - /* {{{ Gmagick Gmagick::write(string filename[, boolean all_frames]) - Writes the current image sequence to a file - */ --PHP_METHOD(gmagick, writeimage) -+PHP_METHOD(Gmagick, writeimage) - { - MagickBool status; - php_gmagick_object *intern; - char *filename = NULL; - size_t filename_len; - zend_bool all_frames = 0; -- -+ - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|b", &filename, &filename_len, &all_frames) == FAILURE) { - return; - } -- -+ - intern = Z_GMAGICK_OBJ_P(getThis()); -- -+ - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); - - if (!filename) { -@@ -195,27 +195,27 @@ PHP_METHOD(gmagick, writeimage) - if (!filename_len) { - GMAGICK_THROW_GMAGICK_EXCEPTION(intern->magick_wand, "Unable to write the image. Empty filename string provided"); - } -- -+ - if (all_frames) { - status = MagickWriteImages(intern->magick_wand, filename, MagickTrue); - } else { - status = MagickWriteImage(intern->magick_wand, filename); - } -- -+ - if (status == MagickFalse) { - GMAGICK_THROW_GMAGICK_EXCEPTION(intern->magick_wand, "Unable to write the image"); - } -- -+ - GMAGICK_CHAIN_METHOD; - } - /* }}} */ - - /* {{{ proto Gmagick Gmagick::thumbnail(int width, int height[, bool fit[, bool legacy = false]]) -- Scales an image to the desired dimensions. If legacy is true, uses the -+ Scales an image to the desired dimensions. If legacy is true, uses the - incorrect behaviour that was present until Gmagick 2.0.1. If false (default) it uses the correct - behaviour. - */ --PHP_METHOD(gmagick, thumbnailimage) -+PHP_METHOD(Gmagick, thumbnailimage) - { - zend_long columns, rows, width, height; - php_gmagick_object *intern; -@@ -239,17 +239,17 @@ PHP_METHOD(gmagick, thumbnailimage) - if (MagickResizeImage(intern->magick_wand, width, height, UndefinedFilter, 0.5) == MagickFalse) { - GMAGICK_THROW_GMAGICK_EXCEPTION(intern->magick_wand, "Unable to thumbnail image"); - } -- -+ - GMAGICK_CHAIN_METHOD; - } - /* }}} */ - - /* {{{ proto Gmagick Gmagick::resize(int width, int height, int filter, float blur[, bool fit = false[, bool legacy = false]]) -- Scales an image to the desired dimensions If legacy is true, uses the -+ Scales an image to the desired dimensions If legacy is true, uses the - incorrect behaviour that was present until Gmagick 2.0.1. If false (default) it uses the correct - behaviour. - */ --PHP_METHOD(gmagick, resizeimage) -+PHP_METHOD(Gmagick, resizeimage) - { - double blur; - zend_long width, height, new_width, new_height, filter = 0; -@@ -280,7 +280,7 @@ PHP_METHOD(gmagick, resizeimage) - /* {{{ proto Gmagick Gmagick::clear() - Removes all images from object - */ --PHP_METHOD(gmagick, clear) -+PHP_METHOD(Gmagick, clear) - { - php_gmagick_object *intern; - int i, image_count; -@@ -308,12 +308,14 @@ PHP_METHOD(gmagick, clear) - /* {{{ proto Gmagick Gmagick::crop(int width, int height, int x, int y) - Crops image - */ --PHP_METHOD(gmagick, cropimage) -+PHP_METHOD(Gmagick, cropimage) - { - php_gmagick_object *intern; - long x, y, width, height; - -- ZEND_PARSE_PARAMETERS_NONE(); -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "llll", &width, &height, &x, &y) == FAILURE) { -+ return; -+ } - - intern = Z_GMAGICK_OBJ_P(getThis()); - -@@ -330,7 +332,7 @@ PHP_METHOD(gmagick, cropimage) - incorrect behaviour that was present until Gmagick 2.0.1. If false (default) it uses the correct - behaviour. - */ --PHP_METHOD(gmagick, cropthumbnailimage) -+PHP_METHOD(Gmagick, cropthumbnailimage) - { - zend_long crop_width, crop_height; - zend_bool legacy = 0; -@@ -358,7 +360,7 @@ PHP_METHOD(gmagick, cropthumbnailimage) - each subsequent image varies in size and offset. returns a new sequence where each image in the - sequence is the same size as the first and composited with the next image in the sequence. - */ --PHP_METHOD(gmagick, coalesceimages) -+PHP_METHOD(Gmagick, coalesceimages) - { - MagickWand *tmp_wand; - php_gmagick_object *intern, *intern_return; -@@ -385,7 +387,7 @@ PHP_METHOD(gmagick, coalesceimages) - /* {{{ proto Gmagick Gmagick::composite(Gmagick source, int compose, int x, int y) - Crops image - */ --PHP_METHOD(gmagick, compositeimage) -+PHP_METHOD(Gmagick, compositeimage) - { - zval *source_obj; - php_gmagick_object *source, *intern; -@@ -416,7 +418,7 @@ PHP_METHOD(gmagick, compositeimage) - /* {{{ proto Gmagick Gmagick::drawImage(GmagickDraw drawing_wand) - Renders the GmagickDrawing object on the current image. - */ --PHP_METHOD(gmagick, drawimage) -+PHP_METHOD(Gmagick, drawimage) - { - zval *objvar; - php_gmagick_object *intern; -@@ -447,7 +449,7 @@ PHP_METHOD(gmagick, drawimage) - /* {{{ proto Gmagick GMAGICK::addImage(GMAGICK source ) - Adds new image to GMAGICK object from the current position of the source object. - */ --PHP_METHOD(gmagick, addimage) -+PHP_METHOD(Gmagick, addimage) - { - php_gmagick_object *intern, *intern_add; - zval *add_obj; -@@ -476,7 +478,7 @@ PHP_METHOD(gmagick, addimage) - /* {{{ proto Gmagick GMAGICK::addNoiseImage(int noise_type[, int channel]) - Adds random noise to the image. Channel parameter is ignored in ImageMagick below 6.2.8 - */ --PHP_METHOD(gmagick, addnoiseimage) -+PHP_METHOD(Gmagick, addnoiseimage) - { - php_gmagick_object *intern; - MagickBool status; -@@ -503,7 +505,7 @@ PHP_METHOD(gmagick, addnoiseimage) - /* {{{ proto Gmagick Gmagick::borderImage(GmagickPixel bordercolor, int width, int height) - Surrounds the image with a border of the color defined by the bordercolor pixel wand. - */ --PHP_METHOD(gmagick, borderimage) -+PHP_METHOD(Gmagick, borderimage) - { - zval *param; - php_gmagick_object *intern; -@@ -534,7 +536,7 @@ PHP_METHOD(gmagick, borderimage) - /* {{{ proto bool Gmagick::thresholdImage(float threshold[, int channel] ) - Changes the value of individual pixels based on the intensity of each pixel compared to threshold. The result is a high-contrast, two color image. - */ --PHP_METHOD(gmagick, thresholdimage) -+PHP_METHOD(Gmagick, thresholdimage) - { - php_gmagick_object *intern; - double threshold; -@@ -564,7 +566,7 @@ PHP_METHOD(gmagick, thresholdimage) - /* {{{ proto Gmagick Gmagick::charcoalImage(float radius, float sigma) - Simulates a charcoal drawing. - */ --PHP_METHOD(gmagick, charcoalimage) -+PHP_METHOD(Gmagick, charcoalimage) - { - double sigma, radius; - MagickBool status; -@@ -591,7 +593,7 @@ PHP_METHOD(gmagick, charcoalimage) - /* {{{ proto Gmagick Gmagick::chopImage(int width, int height, int x, int y) - Removes a region of an image and collapses the image to occupy the removed portion - */ --PHP_METHOD(gmagick, chopimage) -+PHP_METHOD(Gmagick, chopimage) - { - php_gmagick_object *intern; - zend_long width, height, x, y; -@@ -620,7 +622,7 @@ PHP_METHOD(gmagick, chopimage) - /* {{{ proto Gmagick Gmagick::commentImage(string comment) - Adds a comment to your image. - */ --PHP_METHOD(gmagick, commentimage) -+PHP_METHOD(Gmagick, commentimage) - { - php_gmagick_object *intern; - char *comment; -@@ -650,7 +652,7 @@ PHP_METHOD(gmagick, commentimage) - /* {{{ proto Gmagick Gmagick::current() - Returns reference to the current Gmagick object with image pointer at the correct sequence. - */ --PHP_METHOD(gmagick, current) -+PHP_METHOD(Gmagick, current) - { - RETURN_ZVAL(getThis(), 1, 0); - } -@@ -659,7 +661,7 @@ PHP_METHOD(gmagick, current) - /* {{{ proto Gmagick Gmagick::cycleColormapImage(int displace) - Displaces an image's colormap by a given number of positions. If you cycle the colormap a number of times you can produce a psychodelic effect. - */ --PHP_METHOD(gmagick, cyclecolormapimage) -+PHP_METHOD(Gmagick, cyclecolormapimage) - { - php_gmagick_object *intern; - zend_long displace; -@@ -687,7 +689,7 @@ PHP_METHOD(gmagick, cyclecolormapimage) - /* {{{ proto Gmagick Gmagick::deconstructImages() - Compares each image with the next in a sequence and returns the maximum bounding region of any pixel differences it discovers. - */ --PHP_METHOD(gmagick, deconstructimages) -+PHP_METHOD(Gmagick, deconstructimages) - { - MagickWand *tmp_wand; - php_gmagick_object *intern, *intern_return; -@@ -714,7 +716,7 @@ PHP_METHOD(gmagick, deconstructimages) - /* {{{ proto Gmagick Gmagick::despeckleImage() - Reduces the speckle noise in an image while perserving the edges of the original image. - */ --PHP_METHOD(gmagick, despeckleimage) -+PHP_METHOD(Gmagick, despeckleimage) - { - php_gmagick_object *intern; - MagickBool status; -@@ -738,7 +740,7 @@ PHP_METHOD(gmagick, despeckleimage) - /* {{{ proto bool Gmagick::destroy() - Destroys the Gmagick object - */ --PHP_METHOD(gmagick, destroy) -+PHP_METHOD(Gmagick, destroy) - { - php_gmagick_object *intern; - -@@ -758,7 +760,7 @@ PHP_METHOD(gmagick, destroy) - /* {{{ proto Gmagick Gmagick::edgeImage(float radius) - Enhance edges within the image with a convolution filter of the given radius. Use a radius of 0 and Edge() selects a suitable radius for you. - */ --PHP_METHOD(gmagick, edgeimage) -+PHP_METHOD(Gmagick, edgeimage) - { - php_gmagick_object *intern; - double radius; -@@ -787,7 +789,7 @@ PHP_METHOD(gmagick, edgeimage) - /* {{{ proto Gmagick Gmagick::embossImage(float radius, float sigma) - Returns a grayscale image with a three-dimensional effect. We convolve the image with a Gaussian operator of the given radius and standard deviation (sigma). For reasonable results, radius should be larger than sigma. Use a radius of 0 and it will choose a suitable radius for you. - */ --PHP_METHOD(gmagick, embossimage) -+PHP_METHOD(Gmagick, embossimage) - { - php_gmagick_object *intern; - double radius, sigma; -@@ -818,7 +820,7 @@ PHP_METHOD(gmagick, embossimage) - /* {{{ proto Gmagick Gmagick::enhanceImage() - Applies a digital filter that improves the quality of a noisy image. - */ --PHP_METHOD(gmagick, enhanceimage) -+PHP_METHOD(Gmagick, enhanceimage) - { - php_gmagick_object *intern; - MagickBool status; -@@ -842,7 +844,7 @@ PHP_METHOD(gmagick, enhanceimage) - /* {{{ proto Gmagick Gmagick::equalizeImage() - Equalizes the image histogram. - */ --PHP_METHOD(gmagick, equalizeimage) -+PHP_METHOD(Gmagick, equalizeimage) - { - php_gmagick_object *intern; - MagickBool status; -@@ -866,7 +868,7 @@ PHP_METHOD(gmagick, equalizeimage) - /* {{{ proto Gmagick Gmagick::flipImage() - Creates a vertical mirror image by reflecting the pixels around the central x-axis. - */ --PHP_METHOD(gmagick, flipimage) -+PHP_METHOD(Gmagick, flipimage) - { - php_gmagick_object *intern; - MagickBool status; -@@ -889,7 +891,7 @@ PHP_METHOD(gmagick, flipimage) - /* {{{ proto Gmagick Gmagick::flopImage() - Creates a horizontal mirror image by reflecting the pixels around the central y-axis. - */ --PHP_METHOD(gmagick, flopimage) -+PHP_METHOD(Gmagick, flopimage) - { - php_gmagick_object *intern; - MagickBool status; -@@ -913,7 +915,7 @@ PHP_METHOD(gmagick, flopimage) - /* {{{ proto Gmagick Gmagick::frameImage(GmagickPixel matte_color, int width, int height, int inner_bevel, int outer_bevel) - Adds a simulated three-dimensional border around the image - */ --PHP_METHOD(gmagick, frameimage) -+PHP_METHOD(Gmagick, frameimage) - { - zval *param; - php_gmagick_object *intern; -@@ -943,7 +945,7 @@ PHP_METHOD(gmagick, frameimage) - /* {{{ proto Gmagick Gmagick::gammaImage(float gamma[, int channel]) - Gamma-corrects an image. The same image viewed on different devices will have perceptual differences in the way the image's intensities are represented on the screen. Specify individual gamma levels for the red, green, and blue channels, or adjust all three with the gamma parameter. Values typically range from 0.8 to 2.3. - */ --PHP_METHOD(gmagick, gammaimage) -+PHP_METHOD(Gmagick, gammaimage) - { - php_gmagick_object *intern; - MagickBool status; -@@ -972,7 +974,7 @@ PHP_METHOD(gmagick, gammaimage) - /* {{{ proto string Gmagick::getCopyright() - Returns the ImageMagick API copyright as a string constant. - */ --PHP_METHOD(gmagick, getcopyright) -+PHP_METHOD(Gmagick, getcopyright) - { - char *copyright; - -@@ -989,7 +991,7 @@ PHP_METHOD(gmagick, getcopyright) - /* {{{ proto string Gmagick::getFilename() - Returns the filename associated with an image sequence. - */ --PHP_METHOD(gmagick, getfilename) -+PHP_METHOD(Gmagick, getfilename) - { - php_gmagick_object *intern; - char *filename; -@@ -1010,7 +1012,7 @@ PHP_METHOD(gmagick, getfilename) - /* {{{ proto GmagickPixel Gmagick::getImageBackgroundColor() - Returns the image background color. - */ --PHP_METHOD(gmagick, getimagebackgroundcolor) -+PHP_METHOD(Gmagick, getimagebackgroundcolor) - { - php_gmagick_object *intern; - php_gmagickpixel_object *internp; -@@ -1043,7 +1045,7 @@ PHP_METHOD(gmagick, getimagebackgroundcolor) - /* {{{ proto string Gmagick::getImageBlob() - Returns the current image sequence as a string - */ --PHP_METHOD(gmagick, getimageblob) -+PHP_METHOD(Gmagick, getimageblob) - { - php_gmagick_object *intern; - unsigned char *image_contents; -@@ -1072,7 +1074,7 @@ PHP_METHOD(gmagick, getimageblob) - /* {{{ proto string Gmagick::getImagesBlob() - Returns all image sequences as a string - */ --PHP_METHOD(gmagick, getimagesblob) -+PHP_METHOD(Gmagick, getimagesblob) - { - php_gmagick_object *intern; - unsigned char *image_contents; -@@ -1106,7 +1108,7 @@ PHP_METHOD(gmagick, getimagesblob) - - image_contents = MagickWriteImageBlob(intern->magick_wand, &image_size); - if (!image_contents) { -- return; -+ RETURN_EMPTY_STRING(); - } - - ZVAL_STRINGL(return_value, (char *)image_contents, image_size); -@@ -1118,7 +1120,7 @@ PHP_METHOD(gmagick, getimagesblob) - /* {{{ proto Gmagick Gmagick::setImageBackgroundColor(GmagickPixel background) - Sets the image background color. - */ --PHP_METHOD(gmagick, setimagebackgroundcolor) -+PHP_METHOD(Gmagick, setimagebackgroundcolor) - { - zval *param; - php_gmagick_object *intern; -@@ -1148,7 +1150,7 @@ PHP_METHOD(gmagick, setimagebackgroundcolor) - /* {{{ proto array Gmagick::getImageBluePrimary(float x, float y) - Returns the chromaticy blue primary point for the image. - */ --PHP_METHOD(gmagick, getimageblueprimary) -+PHP_METHOD(Gmagick, getimageblueprimary) - { - php_gmagick_object *intern; - MagickBool status; -@@ -1176,7 +1178,7 @@ PHP_METHOD(gmagick, getimageblueprimary) - /* {{{ proto GmagickPixel Gmagick::getImageBorderColor() - Returns the image border color. - */ --PHP_METHOD(gmagick, getimagebordercolor) -+PHP_METHOD(Gmagick, getimagebordercolor) - { - php_gmagick_object *intern; - php_gmagickpixel_object *internp; -@@ -1210,7 +1212,7 @@ PHP_METHOD(gmagick, getimagebordercolor) - /* {{{ proto int Gmagick::getImageChannelDepth() - Gets the depth for a particular image channel. - */ --PHP_METHOD(gmagick, getimagechanneldepth) -+PHP_METHOD(Gmagick, getimagechanneldepth) - { - php_gmagick_object *intern; - zend_long channel_type, channel_depth; -@@ -1231,7 +1233,7 @@ PHP_METHOD(gmagick, getimagechanneldepth) - /* {{{ proto Gmagick Gmagick::setImageBluePrimary(float x,float y) - Sets the image chromaticity blue primary point - */ --PHP_METHOD(gmagick, setimageblueprimary) -+PHP_METHOD(Gmagick, setimageblueprimary) - { - php_gmagick_object *intern; - double x, y; -@@ -1258,7 +1260,7 @@ PHP_METHOD(gmagick, setimageblueprimary) - /* {{{ proto Gmagick Gmagick::setImageBorderColor(GmagickPixel border) - Sets the image border color - */ --PHP_METHOD(gmagick, setimagebordercolor) -+PHP_METHOD(Gmagick, setimagebordercolor) - { - zval *param; - php_gmagick_object *intern; -@@ -1287,7 +1289,7 @@ PHP_METHOD(gmagick, setimagebordercolor) - /* {{{ proto Gmagick Gmagick::setImageChannelDepth(int channel, int depth) - Sets the depth of a particular image channel - */ --PHP_METHOD(gmagick, setimagechanneldepth) -+PHP_METHOD(Gmagick, setimagechanneldepth) - { - php_gmagick_object *intern; - zend_long channel_type, depth; -@@ -1314,7 +1316,7 @@ PHP_METHOD(gmagick, setimagechanneldepth) - /* {{{ proto Gmagick Gmagick::setImageColorspace(int colorspace) - Sets the image colorspace - */ --PHP_METHOD(gmagick, setimagecolorspace) -+PHP_METHOD(Gmagick, setimagecolorspace) - { - php_gmagick_object *intern; - zend_long colorspace; -@@ -1341,7 +1343,7 @@ PHP_METHOD(gmagick, setimagecolorspace) - /* {{{ proto Gmagick Gmagick::setInterlaceScheme(INTERLACETYPE interlace_scheme) - Sets the image interlace scheme. - */ --PHP_METHOD(gmagick, setinterlacescheme) -+PHP_METHOD(Gmagick, setinterlacescheme) - { - php_gmagick_object *intern; - zend_long schema; -@@ -1366,7 +1368,7 @@ PHP_METHOD(gmagick, setinterlacescheme) - /* {{{ proto int Gmagick::getImageColorspace() - Gets the image colorspace. - */ --PHP_METHOD(gmagick, getimagecolorspace) -+PHP_METHOD(Gmagick, getimagecolorspace) - { - php_gmagick_object *intern; - long colorSpace; -@@ -1384,7 +1386,7 @@ PHP_METHOD(gmagick, getimagecolorspace) - /* {{{ proto int Gmagick::getImageColors() - Gets the number of unique colors in the image. - */ --PHP_METHOD(gmagick, getimagecolors) -+PHP_METHOD(Gmagick, getimagecolors) - { - php_gmagick_object *intern; - -@@ -1401,7 +1403,7 @@ PHP_METHOD(gmagick, getimagecolors) - /* {{{ proto int Gmagick::getImageCompose() - Returns the composite operator associated with the image. - */ --PHP_METHOD(gmagick, getimagecompose) -+PHP_METHOD(Gmagick, getimagecompose) - { - php_gmagick_object *intern; - long composite; -@@ -1419,7 +1421,7 @@ PHP_METHOD(gmagick, getimagecompose) - /* {{{ proto int Gmagick::getImageDelay() - Gets the image delay. - */ --PHP_METHOD(gmagick, getimagedelay) -+PHP_METHOD(Gmagick, getimagedelay) - { - php_gmagick_object *intern; - long delay; -@@ -1437,7 +1439,7 @@ PHP_METHOD(gmagick, getimagedelay) - /* {{{ proto int Gmagick::getImageDepth() - Gets the image depth. - */ --PHP_METHOD(gmagick, getimagedepth) -+PHP_METHOD(Gmagick, getimagedepth) - { - php_gmagick_object *intern; - long depth; -@@ -1455,7 +1457,7 @@ PHP_METHOD(gmagick, getimagedepth) - /* {{{ proto int Gmagick::getNumberImages() - Returns the number of images associated with Gmagick object. - */ --PHP_METHOD(gmagick, getnumberimages) -+PHP_METHOD(Gmagick, getnumberimages) - { - php_gmagick_object *intern; - unsigned long num_images; -@@ -1472,7 +1474,7 @@ PHP_METHOD(gmagick, getnumberimages) - /* {{{ proto Gmagick Gmagick::setImageCompose(int compose) - Sets the image composite operator, useful for specifying how to composite the image thumbnail when using the Gmagick::montageImage() method. - */ --PHP_METHOD(gmagick, setimagecompose) -+PHP_METHOD(Gmagick, setimagecompose) - { - php_gmagick_object *intern; - zend_long compose; -@@ -1499,7 +1501,7 @@ PHP_METHOD(gmagick, setimagecompose) - /* {{{ proto Gmagick Gmagick::setImageCompression(int compression) - Sets the image compression. - */ --PHP_METHOD(gmagick, setimagecompression) -+PHP_METHOD(Gmagick, setimagecompression) - { - php_gmagick_object *intern; - zend_long compression; -@@ -1530,7 +1532,7 @@ PHP_METHOD(gmagick, setimagecompression) - /* {{{ proto int Gmagick::getImageCompression - Gets the image compression - */ --PHP_METHOD(gmagick, getimagecompression) -+PHP_METHOD(Gmagick, getimagecompression) - { - php_gmagick_object *intern; - -@@ -1544,7 +1546,7 @@ PHP_METHOD(gmagick, getimagecompression) - /* {{{ proto Gmagick Gmagick::setImageDelay(int delay) - Sets the image delay. - */ --PHP_METHOD(gmagick, setimagedelay) -+PHP_METHOD(Gmagick, setimagedelay) - { - php_gmagick_object *intern; - zend_long delay; -@@ -1571,7 +1573,7 @@ PHP_METHOD(gmagick, setimagedelay) - /* {{{ proto Gmagick Gmagick::setImageDepth(int depth) - Sets the image depth. - */ --PHP_METHOD(gmagick, setimagedepth) -+PHP_METHOD(Gmagick, setimagedepth) - { - php_gmagick_object *intern; - zend_long depth; -@@ -1598,7 +1600,7 @@ PHP_METHOD(gmagick, setimagedepth) - /* {{{ proto int Gmagick::getImageDispose() - Gets the image disposal method. - */ --PHP_METHOD(gmagick, getimagedispose) -+PHP_METHOD(Gmagick, getimagedispose) - { - php_gmagick_object *intern; - long dispose; -@@ -1616,7 +1618,7 @@ PHP_METHOD(gmagick, getimagedispose) - /* {{{ proto Gmagick Gmagick::setImageDispose(int dispose) - Sets the image disposal method - */ --PHP_METHOD(gmagick, setimagedispose) -+PHP_METHOD(Gmagick, setimagedispose) - { - php_gmagick_object *intern; - zend_long dispose; -@@ -1643,7 +1645,7 @@ PHP_METHOD(gmagick, setimagedispose) - /* {{{ proto Gmagick Gmagick::setFilename(string filename) - Sets the filename before you read or write an image file. - */ --PHP_METHOD(gmagick, setfilename) -+PHP_METHOD(Gmagick, setfilename) - { - php_gmagick_object *intern; - char *filename; -@@ -1670,7 +1672,7 @@ PHP_METHOD(gmagick, setfilename) - /* {{{ proto Gmagick Gmagick::getImage() - Returns a new Gmagick object with the current image sequence. - */ --PHP_METHOD(gmagick, getimage) -+PHP_METHOD(Gmagick, getimage) - { - MagickWand *tmp_wand; - php_gmagick_object *intern, *intern_return; -@@ -1697,7 +1699,7 @@ PHP_METHOD(gmagick, getimage) - /* {{{ proto bool Gmagick::setImage(Gmagick replace ) - Replaces the current sequence - */ --PHP_METHOD(gmagick, setimage) -+PHP_METHOD(Gmagick, setimage) - { - zval *objvar; - MagickBool status; -@@ -1728,7 +1730,7 @@ PHP_METHOD(gmagick, setimage) - /* {{{ proto array Gmagick::getImageExtrema() - Gets the extrema for the image. Returns an associative array with the keys "min" and "max". - */ --PHP_METHOD(gmagick, getimageextrema) -+PHP_METHOD(Gmagick, getimageextrema) - { - php_gmagick_object *intern; - unsigned long min, max; -@@ -1757,7 +1759,7 @@ PHP_METHOD(gmagick, getimageextrema) - /* {{{ proto string Gmagick::getImageFilename() - Returns the filename of a particular image in a sequence - */ --PHP_METHOD(gmagick, getimagefilename) -+PHP_METHOD(Gmagick, getimagefilename) - { - php_gmagick_object *intern; - char *filename; -@@ -1782,7 +1784,7 @@ PHP_METHOD(gmagick, getimagefilename) - /* {{{ proto Gmagick Gmagick::setImageFilename(string filename) - Sets the filename of a particular image in a sequence. - */ --PHP_METHOD(gmagick, setimagefilename) -+PHP_METHOD(Gmagick, setimagefilename) - { - php_gmagick_object *intern; - char *filename; -@@ -1811,7 +1813,7 @@ PHP_METHOD(gmagick, setimagefilename) - /* {{{ proto string Gmagick::getImageFormat() - Returns the format of a particular image in a sequence. - */ --PHP_METHOD(gmagick, getimageformat) -+PHP_METHOD(Gmagick, getimageformat) - { - php_gmagick_object *intern; - char *format; -@@ -1836,7 +1838,7 @@ PHP_METHOD(gmagick, getimageformat) - /* {{{ proto Gmagick Gmagick::setImageFormat(string format) - Sets the format of a particular image in a sequence. - */ --PHP_METHOD(gmagick, setimageformat) -+PHP_METHOD(Gmagick, setimageformat) - { - char *format; - size_t format_len; -@@ -1866,7 +1868,7 @@ PHP_METHOD(gmagick, setimageformat) - /* {{{ proto Gmagick Gmagick::setCompressionQuality(int quality) - Sets the compression quality factor (0-100). The GraphicsMagick default value is 75. - */ --PHP_METHOD(gmagick, setcompressionquality) -+PHP_METHOD(Gmagick, setcompressionquality) - { - php_gmagick_object *intern; - zend_long compression_quality; -@@ -1894,7 +1896,7 @@ PHP_METHOD(gmagick, setcompressionquality) - /* {{{ proto float Gmagick::getImageGamma() - Gets the image gamma. - */ --PHP_METHOD(gmagick, getimagegamma) -+PHP_METHOD(Gmagick, getimagegamma) - { - php_gmagick_object *intern; - double gamma; -@@ -1912,7 +1914,7 @@ PHP_METHOD(gmagick, getimagegamma) - /* {{{ proto Gmagick Gmagick::setImageGamma(float gamma) - Sets the image gamma. - */ --PHP_METHOD(gmagick, setimagegamma) -+PHP_METHOD(Gmagick, setimagegamma) - { - php_gmagick_object *intern; - double gamma; -@@ -1939,7 +1941,7 @@ PHP_METHOD(gmagick, setimagegamma) - /* {{{ proto array Gmagick::getImageGreenPrimary() - Returns the chromaticy green primary point. Returns an array with the keys "x" and "y". - */ --PHP_METHOD(gmagick, getimagegreenprimary) -+PHP_METHOD(Gmagick, getimagegreenprimary) - { - php_gmagick_object *intern; - double x, y; -@@ -1967,7 +1969,7 @@ PHP_METHOD(gmagick, getimagegreenprimary) - /* {{{ proto Gmagick Gmagick::setImageGreenPrimary(float x, float y) - Sets the image chromaticity green primary point - */ --PHP_METHOD(gmagick, setimagegreenprimary) -+PHP_METHOD(Gmagick, setimagegreenprimary) - { - php_gmagick_object *intern; - double x, y; -@@ -1995,7 +1997,7 @@ PHP_METHOD(gmagick, setimagegreenprimary) - /* {{{ proto int Gmagick::getImageHeight() - Returns the image height. - */ --PHP_METHOD(gmagick, getimageheight) -+PHP_METHOD(Gmagick, getimageheight) - { - php_gmagick_object *intern; - long height; -@@ -2013,7 +2015,7 @@ PHP_METHOD(gmagick, getimageheight) - /* {{{ proto array Gmagick::getImageHistogram() - Returns the image histogram as an array of GmagickPixel objects. - */ --PHP_METHOD(gmagick, getimagehistogram) -+PHP_METHOD(Gmagick, getimagehistogram) - { - php_gmagick_object *intern; - php_gmagickpixel_object *internp; -@@ -2045,7 +2047,7 @@ PHP_METHOD(gmagick, getimagehistogram) - /* {{{ proto int Gmagick::getImageIndex() - Returns the index of the current active image, within the Gmagick object. - */ --PHP_METHOD(gmagick, getimageindex) -+PHP_METHOD(Gmagick, getimageindex) - { - MagickBool status; - php_gmagick_object *intern; -@@ -2063,7 +2065,7 @@ PHP_METHOD(gmagick, getimageindex) - /* {{{ proto Gmagick Gmagick::setImageIndex(int index) - Returns the index of the current active image, within the Gmagick object. - */ --PHP_METHOD(gmagick, setimageindex) -+PHP_METHOD(Gmagick, setimageindex) - { - zend_long index; - MagickBool status; -@@ -2091,7 +2093,7 @@ PHP_METHOD(gmagick, setimageindex) - /* {{{ proto int Gmagick::getImageInterlaceScheme() - Gets the image interlace scheme. - */ --PHP_METHOD(gmagick, getimageinterlacescheme) -+PHP_METHOD(Gmagick, getimageinterlacescheme) - { - php_gmagick_object *intern; - long interlace; -@@ -2109,7 +2111,7 @@ PHP_METHOD(gmagick, getimageinterlacescheme) - /* {{{ proto Gmagick Gmagick::setImageInterlaceScheme(int interlace_scheme) - Sets the image interlace scheme - */ --PHP_METHOD(gmagick, setimageinterlacescheme) -+PHP_METHOD(Gmagick, setimageinterlacescheme) - { - php_gmagick_object *intern; - zend_long interlace; -@@ -2137,7 +2139,7 @@ PHP_METHOD(gmagick, setimageinterlacescheme) - /* {{{ proto int Gmagick::getImageIterations() - Gets the image iterations. - */ --PHP_METHOD(gmagick, getimageiterations) -+PHP_METHOD(Gmagick, getimageiterations) - { - php_gmagick_object *intern; - long iterations; -@@ -2155,7 +2157,7 @@ PHP_METHOD(gmagick, getimageiterations) - /* {{{ proto array Gmagick::getImageGeometry() - Returns the width and height as an associative array. - */ --PHP_METHOD(gmagick, getimagegeometry) -+PHP_METHOD(Gmagick, getimagegeometry) - { - long width,height; - php_gmagick_object *intern; -@@ -2180,7 +2182,7 @@ PHP_METHOD(gmagick, getimagegeometry) - /* {{{ proto GmagickPixel Gmagick::getImageMatteColor() - Returns the image matte color. - */ --PHP_METHOD(gmagick, getimagemattecolor) -+PHP_METHOD(Gmagick, getimagemattecolor) - { - php_gmagick_object *intern; - php_gmagickpixel_object *internp; -@@ -2216,7 +2218,7 @@ PHP_METHOD(gmagick, getimagemattecolor) - /* {{{ proto int Gmagick::getImageMatte() - Returns true if the image has a matte channel otherwise false - */ --PHP_METHOD(gmagick, getimagematte) -+PHP_METHOD(Gmagick, getimagematte) - { - php_gmagick_object *intern; - long matte; -@@ -2237,7 +2239,7 @@ PHP_METHOD(gmagick, getimagematte) - /* {{{ proto array Gmagick::getImagePage() - Returns the page geometry associated with the image in an array with the keys "width", "height", "x", and "y". - */ --PHP_METHOD(gmagick, getimagepage) -+PHP_METHOD(Gmagick, getimagepage) - { - php_gmagick_object *intern; - MagickBool status; -@@ -2272,7 +2274,7 @@ PHP_METHOD(gmagick, getimagepage) - /* {{{ proto string Gmagick::getImageProfile(string name) - Returns the named image profile. - */ --PHP_METHOD(gmagick, getimageprofile) -+PHP_METHOD(Gmagick, getimageprofile) - { - php_gmagick_object *intern; - char *profile, *name; -@@ -2302,7 +2304,7 @@ PHP_METHOD(gmagick, getimageprofile) - /* {{{ proto array Gmagick::getImageRedPrimary() - Returns the chromaticy red primary point as an array with the keys "x" and "y". - */ --PHP_METHOD(gmagick, getimageredprimary) -+PHP_METHOD(Gmagick, getimageredprimary) - { - php_gmagick_object *intern; - MagickBool status; -@@ -2330,7 +2332,7 @@ PHP_METHOD(gmagick, getimageredprimary) - /* {{{ proto int Gmagick::getImageRenderingIntent() - Gets the image rendering intent. - */ --PHP_METHOD(gmagick, getimagerenderingintent) -+PHP_METHOD(Gmagick, getimagerenderingintent) - { - php_gmagick_object *intern; - long renderingIntent; -@@ -2349,7 +2351,7 @@ PHP_METHOD(gmagick, getimagerenderingintent) - /* {{{ proto array Gmagick::getImageResolution() - Gets the image X and Y resolution. - */ --PHP_METHOD(gmagick, getimageresolution) -+PHP_METHOD(Gmagick, getimageresolution) - { - php_gmagick_object *intern; - MagickBool status; -@@ -2377,7 +2379,7 @@ PHP_METHOD(gmagick, getimageresolution) - /* {{{ proto int Gmagick::getImageScene() - Gets the image scene. - */ --PHP_METHOD(gmagick, getimagescene) -+PHP_METHOD(Gmagick, getimagescene) - { - php_gmagick_object *intern; - unsigned long scene; -@@ -2395,7 +2397,7 @@ PHP_METHOD(gmagick, getimagescene) - /* {{{ proto string Gmagick::getImageSignature() - Generates an SHA-256 message digest for the image pixel stream. - */ --PHP_METHOD(gmagick, getimagesignature) -+PHP_METHOD(Gmagick, getimagesignature) - { - php_gmagick_object *intern; - char *signature; -@@ -2415,7 +2417,7 @@ PHP_METHOD(gmagick, getimagesignature) - /* {{{ proto int Gmagick::getImageType() - Gets the potential image type: - */ --PHP_METHOD(gmagick, getimagetype) -+PHP_METHOD(Gmagick, getimagetype) - { - php_gmagick_object *intern; - long imageType; -@@ -2433,7 +2435,7 @@ PHP_METHOD(gmagick, getimagetype) - /* {{{ proto Gmagick Gmagick::setImageIterations(int iterations) - Sets the image iterations. - */ --PHP_METHOD(gmagick, setimageiterations) -+PHP_METHOD(Gmagick, setimageiterations) - { - php_gmagick_object *intern; - zend_long iterations; -@@ -2460,7 +2462,7 @@ PHP_METHOD(gmagick, setimageiterations) - /* {{{ proto Gmagick Gmagick::setImageProfile(string name, string profile) - Adds a named profile to the Gmagick object - */ --PHP_METHOD(gmagick, setimageprofile) -+PHP_METHOD(Gmagick, setimageprofile) - { - php_gmagick_object *intern; - char *name; -@@ -2489,7 +2491,7 @@ PHP_METHOD(gmagick, setimageprofile) - /* {{{ proto Gmagick Gmagick::setImageRedPrimary(float x,float y) - Sets the image chromaticity red primary point. - */ --PHP_METHOD(gmagick, setimageredprimary) -+PHP_METHOD(Gmagick, setimageredprimary) - { - php_gmagick_object *intern; - double x, y; -@@ -2516,7 +2518,7 @@ PHP_METHOD(gmagick, setimageredprimary) - /* {{{ proto Gmagick Gmagick::setImageRenderingIntent(int rendering_intent) - Sets the image rendering intent. - */ --PHP_METHOD(gmagick, setimagerenderingintent) -+PHP_METHOD(Gmagick, setimagerenderingintent) - { - php_gmagick_object *intern; - zend_long rendering_intent; -@@ -2543,7 +2545,7 @@ PHP_METHOD(gmagick, setimagerenderingintent) - /* {{{ proto Gmagick Gmagick::setImageResolution(float x_resolution,const float y_resolution) - Sets the image resolution. - */ --PHP_METHOD(gmagick, setimageresolution) -+PHP_METHOD(Gmagick, setimageresolution) - { - php_gmagick_object *intern; - double x_res, y_res; -@@ -2570,7 +2572,7 @@ PHP_METHOD(gmagick, setimageresolution) - /* {{{ proto Gmagick Gmagick::setImageScene(int scene) - Sets the image scene. - */ --PHP_METHOD(gmagick, setimagescene) -+PHP_METHOD(Gmagick, setimagescene) - { - php_gmagick_object *intern; - zend_long scene; -@@ -2597,7 +2599,7 @@ PHP_METHOD(gmagick, setimagescene) - /* {{{ proto Gmagick Gmagick::setImageType(int image_type) - Sets the image type. - */ --PHP_METHOD(gmagick, setimagetype) -+PHP_METHOD(Gmagick, setimagetype) - { - php_gmagick_object *intern; - zend_long image_type; -@@ -2626,7 +2628,7 @@ PHP_METHOD(gmagick, setimagetype) - /* {{{ proto bool Imagick::setImagePage(int width, int height, int x, int y) - Sets the page geometry of the image. - */ --PHP_METHOD(gmagick, setimagepage) -+PHP_METHOD(Gmagick, setimagepage) - { - php_gmagick_object *intern; - zend_long width, height, x, y; -@@ -2649,12 +2651,12 @@ PHP_METHOD(gmagick, setimagepage) - RETURN_TRUE; - } - /* }}} */ --#endif //GMAGICK_HAVE_SET_IMAGE_PAGE -+#endif //GMAGICK_HAVE_SET_IMAGE_PAGE - - /* {{{ proto int Gmagick::getImageUnits() - Gets the image units of resolution. - */ --PHP_METHOD(gmagick, getimageunits) -+PHP_METHOD(Gmagick, getimageunits) - { - php_gmagick_object *intern; - long resolutionType; -@@ -2672,7 +2674,7 @@ PHP_METHOD(gmagick, getimageunits) - /* {{{ proto array Gmagick::getImageWhitePoint() - Returns the chromaticy white point as an associative array with the keys "x" and "y". - */ --PHP_METHOD(gmagick, getimagewhitepoint) -+PHP_METHOD(Gmagick, getimagewhitepoint) - { - php_gmagick_object *intern; - MagickBool status; -@@ -2700,7 +2702,7 @@ PHP_METHOD(gmagick, getimagewhitepoint) - /* {{{ proto int Gmagick::getImageWidth() - Returns the image width. - */ --PHP_METHOD(gmagick, getimagewidth) -+PHP_METHOD(Gmagick, getimagewidth) - { - php_gmagick_object *intern; - unsigned long width; -@@ -2718,7 +2720,7 @@ PHP_METHOD(gmagick, getimagewidth) - /* {{{ proto string Gmagick::getPackageName() - Returns the ImageMagick package name as a string constant. - */ --PHP_METHOD(gmagick, getpackagename) -+PHP_METHOD(Gmagick, getpackagename) - { - char *package_name; - -@@ -2735,7 +2737,7 @@ PHP_METHOD(gmagick, getpackagename) - /* {{{ proto array Gmagick::getQuantumDepth() - Returns the ImageMagick quantum depth as a string constant. - */ --PHP_METHOD(gmagick, getquantumdepth) -+PHP_METHOD(Gmagick, getquantumdepth) - { - char *quantum_depth; - unsigned long depth; -@@ -2755,7 +2757,7 @@ PHP_METHOD(gmagick, getquantumdepth) - /* {{{ proto string Gmagick::getReleaseDate() - Returns the ImageMagick release date as a string constant. - */ --PHP_METHOD(gmagick, getreleasedate) -+PHP_METHOD(Gmagick, getreleasedate) - { - char *release_date; - -@@ -2772,7 +2774,7 @@ PHP_METHOD(gmagick, getreleasedate) - /* {{{ proto int Gmagick::getResourceLimit(int type) - Returns the specified resource limit in megabytes. - */ --PHP_METHOD(gmagick, getresourcelimit) -+PHP_METHOD(Gmagick, getresourcelimit) - { - zend_long resource_type; - -@@ -2787,7 +2789,7 @@ PHP_METHOD(gmagick, getresourcelimit) - /* {{{ proto array Gmagick::getSamplingFactors() - Gets the horizontal and vertical sampling factor. - */ --PHP_METHOD(gmagick, getsamplingfactors) -+PHP_METHOD(Gmagick, getsamplingfactors) - { - php_gmagick_object *intern; - double *sampling_factors; -@@ -2812,7 +2814,7 @@ PHP_METHOD(gmagick, getsamplingfactors) - /* {{{ proto array Gmagick::getSize() - Returns the size associated with the Gmagick object as an array with the keys "columns" and "rows". - */ --PHP_METHOD(gmagick, getsize) -+PHP_METHOD(Gmagick, getsize) - { - php_gmagick_object *intern; - unsigned long columns, rows; -@@ -2838,7 +2840,7 @@ PHP_METHOD(gmagick, getsize) - /* {{{ proto Gmagick Gmagick::setImageUnits(int units) - Sets the image units of resolution. - */ --PHP_METHOD(gmagick, setimageunits) -+PHP_METHOD(Gmagick, setimageunits) - { - php_gmagick_object *intern; - zend_long units; -@@ -2868,7 +2870,7 @@ PHP_METHOD(gmagick, setimageunits) - /* {{{ proto Gmagick Gmagick::setImageWhitePoint(float x,float y) - Sets the image chromaticity white point. - */ --PHP_METHOD(gmagick, setimagewhitepoint) -+PHP_METHOD(Gmagick, setimagewhitepoint) - { - php_gmagick_object *intern; - double x, y; -@@ -2895,7 +2897,7 @@ PHP_METHOD(gmagick, setimagewhitepoint) - /* {{{ proto Gmagick Gmagick::setSamplingFactors(array factors) - Sets the image sampling factors. - */ --PHP_METHOD(gmagick, setsamplingfactors) -+PHP_METHOD(Gmagick, setsamplingfactors) - { - php_gmagick_object *intern; - MagickBool status; -@@ -2930,7 +2932,7 @@ PHP_METHOD(gmagick, setsamplingfactors) - /* {{{ proto bool Gmagick::setResourceLimit(RESOURCETYPE type, int limit) - Sets the limit for a particular resource in megabytes. - */ --PHP_METHOD(gmagick, setresourcelimit) -+PHP_METHOD(Gmagick, setresourcelimit) - { - MagickBool status; - zend_long type, limit; -@@ -2953,7 +2955,7 @@ PHP_METHOD(gmagick, setresourcelimit) - /* {{{ proto Gmagick Gmagick::setSize(int columns, int rows) - Sets the size of the Gmagick object. Set it before you read a raw image format such as RGB, GRAY, or CMYK. - */ --PHP_METHOD(gmagick, setsize) -+PHP_METHOD(Gmagick, setsize) - { - php_gmagick_object *intern; - zend_long columns, rows; -@@ -2978,11 +2980,13 @@ PHP_METHOD(gmagick, setsize) - /* {{{ proto array Gmagick::getVersion() - Returns the ImageMagick API version as a string constant and as a number. - */ --PHP_METHOD(gmagick, getversion) -+PHP_METHOD(Gmagick, getversion) - { - char *version_string; - unsigned long version_number; - -+ ZEND_PARSE_PARAMETERS_NONE(); -+ - version_string = (char *)MagickGetVersion(&version_number); - array_init(return_value); - -@@ -2997,7 +3001,7 @@ PHP_METHOD(gmagick, getversion) - /* {{{ proto bool Gmagick::hasNextImage() - Returns true if the wand has more images when traversing the list in the forward direction - */ --PHP_METHOD(gmagick, hasnextimage) -+PHP_METHOD(Gmagick, hasnextimage) - { - php_gmagick_object *intern; - MagickBool status; -@@ -3019,7 +3023,7 @@ PHP_METHOD(gmagick, hasnextimage) - /* {{{ proto bool Gmagick::hasPreviousImage() - Returns true if the wand has more images when traversing the list in the reverse direction - */ --PHP_METHOD(gmagick, haspreviousimage) -+PHP_METHOD(Gmagick, haspreviousimage) - { - php_gmagick_object *intern; - MagickBool status; -@@ -3041,7 +3045,7 @@ PHP_METHOD(gmagick, haspreviousimage) - /* {{{ proto Gmagick Gmagick::implodeImage(float radius ) - Creates a new image that is a copy of an existing one with the image pixels "implode" by the specified percentage. It allocates the memory necessary for the new Image structure and returns a pointer to the new image. - */ --PHP_METHOD(gmagick, implodeimage) -+PHP_METHOD(Gmagick, implodeimage) - { - php_gmagick_object *intern; - double radius; -@@ -3068,7 +3072,7 @@ PHP_METHOD(gmagick, implodeimage) - /* {{{ proto Gmagick Gmagick::labelImage(string label) - Adds a label to your image. - */ --PHP_METHOD(gmagick, labelimage) -+PHP_METHOD(Gmagick, labelimage) - { - char *label; - size_t label_len; -@@ -3097,7 +3101,7 @@ PHP_METHOD(gmagick, labelimage) - /* {{{ proto Gmagick Gmagick::levelImage(float blackPoint, float gamma, float whitePoint[, int channel] ) - Adjusts the levels of an image by scaling the colors falling between specified white and black points to the full available quantum range. The parameters provided represent the black, mid, and white points. The black point specifies the darkest color in the image. Colors darker than the black point are set to zero. Mid point specifies a gamma correction to apply to the image. White point specifies the lightest color in the image. Colors brighter than the white point are set to the maximum quantum value. - */ --PHP_METHOD(gmagick, levelimage) -+PHP_METHOD(Gmagick, levelimage) - { - php_gmagick_object *intern; - double black_point, gamma, white_point; -@@ -3130,7 +3134,7 @@ PHP_METHOD(gmagick, levelimage) - /* {{{ proto Gmagick Gmagick::magnifyImage() - Is a convenience method that scales an image proportionally to twice its original size. - */ --PHP_METHOD(gmagick, magnifyimage) -+PHP_METHOD(Gmagick, magnifyimage) - { - php_gmagick_object *intern; - MagickBool status; -@@ -3153,7 +3157,7 @@ PHP_METHOD(gmagick, magnifyimage) - /* {{{ proto Gmagick Gmagick::cycleColormapImage(Gmagick map, bool dither) - Replaces the colors of an image with the closest color from a reference image. - */ --PHP_METHOD(gmagick, mapimage) -+PHP_METHOD(Gmagick, mapimage) - { - php_gmagick_object *intern, *intern_map; - zval *map_obj; -@@ -3182,7 +3186,7 @@ PHP_METHOD(gmagick, mapimage) - /* {{{ proto Gmagick Gmagick::medianFilterImage(float radius) - Applies a digital filter that improves the quality of a noisy image. Each pixel is replaced by the median in a set of neighboring pixels as defined by radius. - */ --PHP_METHOD(gmagick, medianfilterimage) -+PHP_METHOD(Gmagick, medianfilterimage) - { - php_gmagick_object *intern; - double radius; -@@ -3209,7 +3213,7 @@ PHP_METHOD(gmagick, medianfilterimage) - /* {{{ proto bool Gmagick::negateImage(bool gray[, int channel] ) - Negates the colors in the reference image. The Grayscale option means that only grayscale values within the image are negated. - */ --PHP_METHOD(gmagick, negateimage) -+PHP_METHOD(Gmagick, negateimage) - { - php_gmagick_object *intern; - zend_bool gray; -@@ -3237,7 +3241,7 @@ PHP_METHOD(gmagick, negateimage) - /* {{{ proto Gmagick Gmagick::minifyImage() - Is a convenience method that scales an image proportionally to one-half its original size - */ --PHP_METHOD(gmagick, minifyimage) -+PHP_METHOD(Gmagick, minifyimage) - { - php_gmagick_object *intern; - MagickBool status; -@@ -3262,7 +3266,7 @@ PHP_METHOD(gmagick, minifyimage) - /* {{{ proto Gmagick Gmagick::modulateImage(float brightness, float saturation, float hue) - Lets you control the brightness, saturation, and hue of an image. Hue is the percentage of absolute rotation from the current position. For example 50 results in a counter-clockwise rotation of 90 degrees, 150 results in a clockwise rotation of 90 degrees, with 0 and 200 both resulting in a rotation of 180 degrees. - */ --PHP_METHOD(gmagick, modulateimage) -+PHP_METHOD(Gmagick, modulateimage) - { - php_gmagick_object *intern; - MagickBool status; -@@ -3288,7 +3292,7 @@ PHP_METHOD(gmagick, modulateimage) - /* {{{ proto Gmagick Gmagick::motionBlurImage(float radius, float sigma, float angle) - Simulates motion blur. We convolve the image with a Gaussian operator of the given radius and standard deviation (sigma). For reasonable results, radius should be larger than sigma. Use a radius of 0 and MotionBlurImage() selects a suitable radius for you. Angle gives the angle of the blurring motion. - */ --PHP_METHOD(gmagick, motionblurimage) -+PHP_METHOD(Gmagick, motionblurimage) - { - php_gmagick_object *intern; - MagickBool status; -@@ -3317,7 +3321,7 @@ PHP_METHOD(gmagick, motionblurimage) - /* {{{ proto bool Gmagick::nextImage() - Associates the next image in the image list with an Gmagick object. - */ --PHP_METHOD(gmagick, nextimage) -+PHP_METHOD(Gmagick, nextimage) - { - php_gmagick_object *intern; - MagickBool status; -@@ -3340,7 +3344,7 @@ PHP_METHOD(gmagick, nextimage) - /* {{{ proto Gmagick Gmagick::newImage(int cols, int rows, string color[, string format] ) - Creates a new image of given size, background color and format - */ --PHP_METHOD(gmagick, newimage) -+PHP_METHOD(Gmagick, newimage) - { - php_gmagick_object *intern; - zend_long columns, rows; -@@ -3377,19 +3381,15 @@ PHP_METHOD(gmagick, newimage) - } - /* }}} */ - --/* {{{ proto Gmagick Gmagick::normalizeImage([int channel]) -+/* {{{ proto Gmagick Gmagick::normalizeImage() - Enhances the contrast of a color image by adjusting the pixels color to span the entire range of colors available - */ --PHP_METHOD(gmagick, normalizeimage) -+PHP_METHOD(Gmagick, normalizeimage) - { - MagickBool status; - php_gmagick_object *intern; -- zend_long channel; - -- /* Parse parameters given to function */ -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &channel) == FAILURE) { -- return; -- } -+ ZEND_PARSE_PARAMETERS_NONE(); - - intern = Z_GMAGICK_OBJ_P(getThis()); - GMAGICK_CHECK_NOT_EMPTY(intern->magick_wand, 1, 1); -@@ -3407,7 +3407,7 @@ PHP_METHOD(gmagick, normalizeimage) - /* {{{ proto Gmagick Gmagick::oilPaintImage(float radius) - Applies a special effect filter that simulates an oil painting. Each pixel is replaced by the most frequent color occurring in a circular region defined by radius. - */ --PHP_METHOD(gmagick, oilpaintimage) -+PHP_METHOD(Gmagick, oilpaintimage) - { - double radius; - MagickBool status; -@@ -3435,7 +3435,7 @@ PHP_METHOD(gmagick, oilpaintimage) - /* {{{ proto bool Gmagick::previousImage() - Assocates the previous image in an image list with the Gmagick object. - */ --PHP_METHOD(gmagick, previousimage) -+PHP_METHOD(Gmagick, previousimage) - { - php_gmagick_object *intern; - MagickBool status; -@@ -3457,7 +3457,7 @@ PHP_METHOD(gmagick, previousimage) - /* {{{ proto Gmagick Gmagick::profileImage(string name,string profile) - Adds or removes a ICC, IPTC, or generic profile from an image. If the profile is NULL, it is removed from the image otherwise added. Use a name of '*' and a profile of NULL to remove all profiles from the image. - */ --PHP_METHOD(gmagick, profileimage) -+PHP_METHOD(Gmagick, profileimage) - { - php_gmagick_object *intern; - char *name; -@@ -3487,7 +3487,7 @@ PHP_METHOD(gmagick, profileimage) - bool measureError) - Analyzes the colors within a reference image - */ --PHP_METHOD(gmagick, quantizeimage) -+PHP_METHOD(Gmagick, quantizeimage) - { - php_gmagick_object *intern; - zend_long number_colors, colorspace, tree_depth; -@@ -3517,7 +3517,7 @@ PHP_METHOD(gmagick, quantizeimage) - bool measure_error) - Analyzes the colors within a sequence of images - */ --PHP_METHOD(gmagick, quantizeimages) -+PHP_METHOD(Gmagick, quantizeimages) - { - php_gmagick_object *intern; - zend_long number_colors, colorspace, tree_depth; -@@ -3545,7 +3545,7 @@ PHP_METHOD(gmagick, quantizeimages) - /* {{{ proto array Gmagick::(GmagickDraw draw, string text) - Returns a 7 element array representing the font metrics - */ --PHP_METHOD(gmagick, queryfontmetrics) -+PHP_METHOD(Gmagick, queryfontmetrics) - { - zval *objvar; - php_gmagick_object *intern; -@@ -3595,7 +3595,7 @@ PHP_METHOD(gmagick, queryfontmetrics) - /* {{{ proto array Gmagick::queryFonts([string pattern] ) - Returns fonts supported by GraphicsMagick - */ --PHP_METHOD(gmagick, queryfonts) -+PHP_METHOD(Gmagick, queryfonts) - { - char **fonts; - unsigned long num_fonts = 0, i; -@@ -3622,7 +3622,7 @@ PHP_METHOD(gmagick, queryfonts) - /* {{{ proto array Gmagick::queryFormats([string pattern] ) - Returns formats supported by GraphicsMagick - */ --PHP_METHOD(gmagick, queryformats) -+PHP_METHOD(Gmagick, queryformats) - { - char **supported_formats; - unsigned long num_formats = 0, i; -@@ -3649,7 +3649,7 @@ PHP_METHOD(gmagick, queryformats) - /* {{{ proto Gmagick Gmagick::radialBlurImage(float angle[, int channel]) - Radial blurs an image. - */ --PHP_METHOD(gmagick, radialblurimage) -+PHP_METHOD(Gmagick, radialblurimage) - { - php_gmagick_object *intern; - MagickBool status; -@@ -3680,7 +3680,7 @@ PHP_METHOD(gmagick, radialblurimage) - /* {{{ proto Gmagick Gmagick::raiseImage(int width, int height, int x, int y, bool raise) - Creates a simulated three-dimensional button-like effect by lightening and darkening the edges of the image. Members width and height of raise_info define the width of the vertical and horizontal edge of the effect. - */ --PHP_METHOD(gmagick, raiseimage) -+PHP_METHOD(Gmagick, raiseimage) - { - php_gmagick_object *intern; - MagickBool status; -@@ -3708,7 +3708,7 @@ PHP_METHOD(gmagick, raiseimage) - /* {{{ proto Gmagick Gmagick::readImageBlob(string image ) - Reads image from a binary string - */ --PHP_METHOD(gmagick, readimageblob) -+PHP_METHOD(Gmagick, readimageblob) - { - unsigned char *image_string; - char *filename = NULL; -@@ -3743,10 +3743,10 @@ PHP_METHOD(gmagick, readimageblob) - } - /* }}} */ - --/* {{{ proto Gmagick Gmagick::readImageFile(resource filehandle ) -+/* {{{ proto Gmagick Gmagick::readImageFile(resource filehandle[, string $filename=null]) - Reads image from open filehandle - */ --PHP_METHOD(gmagick, readimagefile) -+PHP_METHOD(Gmagick, readimagefile) - { - FILE *fp; - char *filename = NULL; -@@ -3786,7 +3786,7 @@ PHP_METHOD(gmagick, readimagefile) - /* {{{ proto Gmagick Gmagick::reduceNoiseImage(float radius) - Smooths the contours of an image - */ --PHP_METHOD(gmagick, reducenoiseimage) -+PHP_METHOD(Gmagick, reducenoiseimage) - { - php_gmagick_object *intern; - double radius; -@@ -3813,7 +3813,7 @@ PHP_METHOD(gmagick, reducenoiseimage) - /* {{{ proto Gmagick Gmagick::removeImage() - Removes an image from the image list. - */ --PHP_METHOD(gmagick, removeimage) -+PHP_METHOD(Gmagick, removeimage) - { - MagickBool status; - php_gmagick_object *intern; -@@ -3837,7 +3837,7 @@ PHP_METHOD(gmagick, removeimage) - /* {{{ proto string Gmagick::removeImageProfile(string name) - Removes the named image profile and returns it - */ --PHP_METHOD(gmagick, removeimageprofile) -+PHP_METHOD(Gmagick, removeimageprofile) - { - php_gmagick_object *intern; - char *name; -@@ -3868,7 +3868,7 @@ PHP_METHOD(gmagick, removeimageprofile) - /* {{{ proto Gmagick Gmagick::resampleImage(float x_resolution, float y_resolution, int filter, float blur) - Resample image to desired resolution. - */ --PHP_METHOD(gmagick, resampleimage) -+PHP_METHOD(Gmagick, resampleimage) - { - double xRes, yRes, blur; - zend_long filter = 0; -@@ -3895,7 +3895,7 @@ PHP_METHOD(gmagick, resampleimage) - /* {{{ proto Gmagick Gmagick::rollImage(int x, int y) - Offsets an image as defined by x and y. - */ --PHP_METHOD(gmagick, rollimage) -+PHP_METHOD(Gmagick, rollimage) - { - zend_long x, y; - php_gmagick_object *intern; -@@ -3921,7 +3921,7 @@ PHP_METHOD(gmagick, rollimage) - /* {{{ proto Gmagick Gmagick::rotateImage(GmagickPixel background, float degrees) - Rotates an image the specified number of degrees. Empty triangles left over from rotating the image are filled with the background color. - */ --PHP_METHOD(gmagick, rotateimage) -+PHP_METHOD(Gmagick, rotateimage) - { - zval *param; - php_gmagick_object *intern; -@@ -3955,7 +3955,7 @@ PHP_METHOD(gmagick, rotateimage) - incorrect behaviour that was present until Gmagick 2.0.1. If false (default) it uses the correct - behaviour. - */ --PHP_METHOD(gmagick, scaleimage) -+PHP_METHOD(Gmagick, scaleimage) - { - zend_long x, y, width, height; - php_gmagick_object *intern; -@@ -3990,7 +3990,7 @@ PHP_METHOD(gmagick, scaleimage) - /* {{{ proto Gmagick Gmagick::separateImageChannel(int channel) - Separates a channel from the image - */ --PHP_METHOD(gmagick, separateimagechannel) -+PHP_METHOD(Gmagick, separateimagechannel) - { - php_gmagick_object *intern; - zend_long channel; -@@ -4014,10 +4014,10 @@ PHP_METHOD(gmagick, separateimagechannel) - } - /* }}} */ - --/* {{{ proto Gmagick Gmagick::sharpenImage(float radius, float sigma[, int channel]) -+/* {{{ proto Gmagick Gmagick::sharpenImage(float radius, float sigma) - Sharpens an image. We convolve the image with a Gaussian operator of the given radius and standard deviation (sigma). For reasonable results, the radius should be larger than sigma. Use a radius of 0 and selects a suitable radius for you. - */ --PHP_METHOD(gmagick, sharpenimage) -+PHP_METHOD(Gmagick, sharpenimage) - { - double sigma, radius; - MagickBool status; -@@ -4044,7 +4044,7 @@ PHP_METHOD(gmagick, sharpenimage) - /* {{{ proto Gmagick Gmagick::shearImage(GmagickPixel background, float x_shear, float y_shear) - Slides one edge of an image along the X or Y axis - */ --PHP_METHOD(gmagick, shearimage) -+PHP_METHOD(Gmagick, shearimage) - { - zval *param; - php_gmagick_object *intern; -@@ -4075,7 +4075,7 @@ PHP_METHOD(gmagick, shearimage) - /* {{{ proto Gmagick Gmagick::solarizeImage(float threshold) - Applies a special effect to the image, similar to the effect achieved in a photo darkroom by selectively exposing areas of photo sensitive paper to light. Threshold ranges from 0 to QuantumRange and is a measure of the extent of the solarization. - */ --PHP_METHOD(gmagick, solarizeimage) -+PHP_METHOD(Gmagick, solarizeimage) - { - php_gmagick_object *intern; - MagickBool status; -@@ -4103,7 +4103,7 @@ PHP_METHOD(gmagick, solarizeimage) - /* {{{ proto Gmagick Gmagick::spreadImage(float radius ) - Special effects method that randomly displaces each pixel in a block defined by the radius parameter. - */ --PHP_METHOD(gmagick, spreadimage) -+PHP_METHOD(Gmagick, spreadimage) - { - double radius; - php_gmagick_object *intern; -@@ -4131,7 +4131,7 @@ PHP_METHOD(gmagick, spreadimage) - /* {{{ proto Gmagick Gmagick::stripImage() - Strips an image of all profiles and comments. - */ --PHP_METHOD(gmagick, stripimage) -+PHP_METHOD(Gmagick, stripimage) - { - php_gmagick_object *intern; - MagickBool status; -@@ -4155,7 +4155,7 @@ PHP_METHOD(gmagick, stripimage) - /* {{{ proto Gmagick Gmagick::swirlImage(float degrees ) - Swirls the pixels about the center of the image, where degrees indicates the sweep of the arc through which each pixel is moved. You get a more dramatic effect as the degrees move from 1 to 360. - */ --PHP_METHOD(gmagick, swirlimage) -+PHP_METHOD(Gmagick, swirlimage) - { - double degrees; - php_gmagick_object *intern; -@@ -4183,7 +4183,7 @@ PHP_METHOD(gmagick, swirlimage) - /* {{{ proto Gmagick Gmagick::textureImage(Gmagick texture_wand) - Repeatedly tiles the texture image across and down the image canvas. - */ --PHP_METHOD(gmagick, textureimage) -+PHP_METHOD(Gmagick, textureimage) - { - MagickWand *tmp_wand; - zval *magick_object; -@@ -4217,7 +4217,7 @@ PHP_METHOD(gmagick, textureimage) - /* {{{ proto Gmagick Gmagick::trimImage(double fuzz) - Remove edges that are the background color from the image. - */ --PHP_METHOD(gmagick, trimimage) -+PHP_METHOD(Gmagick, trimimage) - { - double fuzz; - php_gmagick_object *intern; -@@ -4245,7 +4245,7 @@ PHP_METHOD(gmagick, trimimage) - /* {{{ proto string Gmagick::__toString() - Returns the current image as string - */ --PHP_METHOD(gmagick, __tostring) -+PHP_METHOD(Gmagick, __tostring) - { - php_gmagick_object *intern; - unsigned char *image; -@@ -4281,7 +4281,7 @@ PHP_METHOD(gmagick, __tostring) - /* {{{ proto Gmagick Gmagick::flattenImages() - Merges a sequence of images. This is useful for combining Photoshop layers into a single image. - */ --PHP_METHOD(gmagick, flattenimages) -+PHP_METHOD(Gmagick, flattenimages) - { - php_gmagick_object *intern, *intern_return; - MagickWand *tmp_wand; -@@ -4313,7 +4313,7 @@ PHP_METHOD(gmagick, flattenimages) - incorrect behaviour that was present until Gmagick 2.0.1. If false (default) it uses the correct - behaviour. - */ --PHP_METHOD(gmagick, sampleimage) -+PHP_METHOD(Gmagick, sampleimage) - { - zend_long x, y, width, height; - php_gmagick_object *intern; -@@ -4348,7 +4348,7 @@ PHP_METHOD(gmagick, sampleimage) - /* {{{ proto Gmagick Gmagick::cloneImage() - makes an exact copy of the specified wand. - */ --PHP_METHOD(gmagick, cloneimage) -+PHP_METHOD(Gmagick, cloneimage) - { - MagickWand *tmp_wand; - php_gmagick_object *intern, *intern_return; -@@ -4375,7 +4375,7 @@ PHP_METHOD(gmagick, cloneimage) - /* {{{ proto Gmagick Gmagick::appendImages() - append a set of images - */ --PHP_METHOD(gmagick, appendimages) -+PHP_METHOD(Gmagick, appendimages) - { - MagickWand *tmp_wand; - zend_bool stack = 0; -@@ -4403,7 +4403,7 @@ PHP_METHOD(gmagick, appendimages) - /* {{{ proto bool Gmagick::unsharpMaskImage(float radius, float sigma, float amount, float threshold) - We convolve the image with a Gaussian operator of the given radius and standard deviation (sigma). For reasonable results, radius should be larger than sigma. Use a radius of 0 and Gmagick::UnsharpMaskImage() selects a suitable radius for you. - */ --PHP_METHOD(gmagick, unsharpmaskimage) -+PHP_METHOD(Gmagick, unsharpmaskimage) - { - php_gmagick_object *intern; - double radius, sigma, amount, threshold; -@@ -4431,7 +4431,7 @@ PHP_METHOD(gmagick, unsharpmaskimage) - /* {{{ proto bool Gmagick::setResolution(float x_resolution, float y_resolution, float amount, float threshold) - Sets the image resolution - */ --PHP_METHOD(gmagick, setresolution) -+PHP_METHOD(Gmagick, setresolution) - { - php_gmagick_object *intern; - MagickBool status; -@@ -4456,7 +4456,7 @@ PHP_METHOD(gmagick, setresolution) - /* {{{ proto bool Gmagick::adaptiveThresholdImage(int width, int height, int offset) - Selects an individual threshold for each pixel based on the range of intensity values in its local neighborhood. This allows for thresholding of an image whose global intensity histogram doesn't contain distinctive peaks. - */ --PHP_METHOD(gmagick, adaptivethresholdimage) -+PHP_METHOD(Gmagick, adaptivethresholdimage) - { - php_gmagick_object *intern; - long width, height, offset; -@@ -4485,7 +4485,7 @@ PHP_METHOD(gmagick, adaptivethresholdimage) - /* {{{ proto bool Gmagick::affineTransformImage(GmagickDraw drawing_wand) - Transforms an image as dictated by the affine matrix of the drawing wand. - */ --PHP_METHOD(gmagick, affinetransformimage) -+PHP_METHOD(Gmagick, affinetransformimage) - { - zval *objvar; - php_gmagick_object *intern; -@@ -4515,7 +4515,7 @@ PHP_METHOD(gmagick, affinetransformimage) - /* {{{ proto Gmagick Gmagick::averageImages() - Average a set of images. - */ --PHP_METHOD(gmagick, averageimages) -+PHP_METHOD(Gmagick, averageimages) - { - MagickWand *tmp_wand; - php_gmagick_object *intern, *intern_return; -@@ -4542,7 +4542,7 @@ PHP_METHOD(gmagick, averageimages) - /* {{{ proto bool Gmagick::blackThresholdImage(GmagickPixel threshold) - Is like MagickThresholdImage() but forces all pixels below the threshold into black while leaving all pixels above the threshold unchanged. - */ --PHP_METHOD(gmagick, blackthresholdimage) -+PHP_METHOD(Gmagick, blackthresholdimage) - { - php_gmagick_object *intern; - zval *param; -@@ -4576,7 +4576,7 @@ PHP_METHOD(gmagick, blackthresholdimage) - Set whether antialiasing should be used for operations. On by default. - */ - --PHP_METHOD(gmagick, colordecisionlist) -+PHP_METHOD(Gmagick, colordecisionlist) - { - php_gmagick_object *intern; - unsigned int status; -@@ -4605,7 +4605,7 @@ PHP_METHOD(gmagick, colordecisionlist) - /* {{{ proto bool Gmagick::clipImage() - Clips along the first path from the 8BIM profile, if present. - */ --PHP_METHOD(gmagick, clipimage) -+PHP_METHOD(Gmagick, clipimage) - { - php_gmagick_object *intern; - unsigned int status; -@@ -4629,7 +4629,7 @@ PHP_METHOD(gmagick, clipimage) - /* {{{ proto bool Gmagick::clipPathImage(string pathname, bool inside) - Clips along the named paths from the 8BIM profile, if present. Later operations take effect inside the path. Id may be a number if preceded with #, to work on a numbered path, e.g., "#1" to use the first path. - */ --PHP_METHOD(gmagick, clippathimage) -+PHP_METHOD(Gmagick, clippathimage) - { - php_gmagick_object *intern; - char *clip_path; -@@ -4660,7 +4660,7 @@ PHP_METHOD(gmagick, clippathimage) - /* {{{ proto bool Gmagick::colorFloodfillImage(GmagickPixel fill, double fuzz, GmagickPixel bordercolor, int x, int y) - Changes the color value of any pixel that matches target and is an immediate neighbor. - */ --PHP_METHOD(gmagick, colorfloodfillimage) -+PHP_METHOD(Gmagick, colorfloodfillimage) - { - php_gmagick_object *intern; - zval *fill_param, *border_param; -@@ -4700,7 +4700,7 @@ PHP_METHOD(gmagick, colorfloodfillimage) - legacy is true, the behaviour of this function is incorrect, but consistent - with how it behaved before Gmagick version 3.4.0 - */ --PHP_METHOD(gmagick, colorizeimage) -+PHP_METHOD(Gmagick, colorizeimage) - { - php_gmagick_object *intern; - zval *color_param, *opacity_param; -@@ -4733,7 +4733,7 @@ PHP_METHOD(gmagick, colorizeimage) - /* {{{ proto array Gmagick::compareImageChannels(Gmagick reference, int channel, int metric) - Compares one or more image channels of an image to a reconstructed image and returns the difference image. - */ --PHP_METHOD(gmagick, compareimagechannels) -+PHP_METHOD(Gmagick, compareimagechannels) - { - MagickWand *tmp_wand; - zval *objvar; -@@ -4786,10 +4786,10 @@ PHP_METHOD(gmagick, compareimagechannels) - } - /* }}} */ - --/* {{{ proto array Gmagick::compareImageChannels(int metric, int distortion) -+/* {{{ proto array Gmagick::compareImages(Gmagick reference, int metric) - Compares one or more images and returns the difference image. - */ --PHP_METHOD(gmagick, compareimages) -+PHP_METHOD(Gmagick, compareimages) - { - MagickWand *tmp_wand; - zval *objvar; -@@ -4844,7 +4844,7 @@ PHP_METHOD(gmagick, compareimages) - /* {{{ proto bool Gmagick::contrastImage(bool sharpen) - Enhances the intensity differences between the lighter and darker elements of the image. Set sharpen to a value other than 0 to increase the image contrast otherwise the contrast is reduced. - */ --PHP_METHOD(gmagick, contrastimage) -+PHP_METHOD(Gmagick, contrastimage) - { - php_gmagick_object *intern; - unsigned int status; -@@ -4872,7 +4872,7 @@ PHP_METHOD(gmagick, contrastimage) - /* {{{ proto bool Gmagick::convolveImage(array kernel) - Applies a custom convolution kernel to the image. - */ --PHP_METHOD(gmagick, convolveimage) -+PHP_METHOD(Gmagick, convolveimage) - { - php_gmagick_object *intern; - unsigned int status; -@@ -4913,7 +4913,7 @@ PHP_METHOD(gmagick, convolveimage) - /* {{{ proto bool Gmagick::extentImage(int width, int height, int x, int y ) - Sets the image size - */ --PHP_METHOD(gmagick, extentimage) -+PHP_METHOD(Gmagick, extentimage) - { - php_gmagick_object *intern; - unsigned int status; -@@ -4943,7 +4943,7 @@ PHP_METHOD(gmagick, extentimage) - /* {{{ proto string Gmagick::getImageAttribute(string key ) - Returns a named attribute - */ --PHP_METHOD(gmagick, getimageattribute) -+PHP_METHOD(Gmagick, getimageattribute) - { - php_gmagick_object *intern; - char *key, *attribute; -@@ -4971,7 +4971,7 @@ PHP_METHOD(gmagick, getimageattribute) - /* {{{ proto array Gmagick::getImageChannelExtrema(int channel) - Gets the extrema for one or more image channels. Return value is an associative array with the keys "minima" and "maxima". - */ --PHP_METHOD(gmagick, getimagechannelextrema) -+PHP_METHOD(Gmagick, getimagechannelextrema) - { - php_gmagick_object *intern; - long channel_type; -@@ -5003,7 +5003,7 @@ PHP_METHOD(gmagick, getimagechannelextrema) - /* {{{ proto array Gmagick::getImageChannelMean(int channel) - Gets the mean and standard deviation of one or more image channels. Return value is an associative array with the keys "mean" and "standardDeviation". - */ --PHP_METHOD(gmagick, getimagechannelmean) -+PHP_METHOD(Gmagick, getimagechannelmean) - { - php_gmagick_object *intern; - long channel_type; -@@ -5032,10 +5032,10 @@ PHP_METHOD(gmagick, getimagechannelmean) - } - /* }}} */ - --/* {{{ proto GmagickPixel Gmagick::getImageColormapColor(int index, GmagickPixel color) -+/* {{{ proto GmagickPixel Gmagick::getImageColormapColor(int index) - Returns the color of the specified colormap index. - */ --PHP_METHOD(gmagick, getimagecolormapcolor) -+PHP_METHOD(Gmagick, getimagecolormapcolor) - { - php_gmagick_object *intern; - php_gmagickpixel_object *internp; -@@ -5076,7 +5076,7 @@ PHP_METHOD(gmagick, getimagecolormapcolor) - /* {{{ proto int Gmagick::getImageGravity() - Gets the image gravity - */ --PHP_METHOD(gmagick, getimagegravity) -+PHP_METHOD(Gmagick, getimagegravity) - { - php_gmagick_object *intern; - -@@ -5093,7 +5093,7 @@ PHP_METHOD(gmagick, getimagegravity) - /* {{{ proto int Gmagick::getImageVirtualPixelMethod() - Returns the virtual pixel method for the sepcified image. - */ --PHP_METHOD(gmagick, getimagevirtualpixelmethod) -+PHP_METHOD(Gmagick, getimagevirtualpixelmethod) - { - php_gmagick_object *intern; - long pixelMethod; -@@ -5111,7 +5111,7 @@ PHP_METHOD(gmagick, getimagevirtualpixelmethod) - /* {{{ proto bool Gmagick::haldClutImage(Gmagick hald[, int CHANNEL]) - Replaces colors in the image from a Hald color lookup table - */ --PHP_METHOD(gmagick, haldclutimage) -+PHP_METHOD(Gmagick, haldclutimage) - { - zval *objvar; - unsigned int status; -@@ -5145,7 +5145,7 @@ PHP_METHOD(gmagick, haldclutimage) - /* {{{ proto bool Gmagick::matteFloodfillImage(float alpha,float fuzz,GmagickPixel bordercolor, int x, int y) - Changes the transparency value of any pixel that matches target and is an immediate neighbor - */ --PHP_METHOD(gmagick, mattefloodfillimage) -+PHP_METHOD(Gmagick, mattefloodfillimage) - { - php_gmagick_object *intern; - zval *param; -@@ -5180,7 +5180,7 @@ PHP_METHOD(gmagick, mattefloodfillimage) - Creates a composite image by combining several separate images. The images are tiled on the composite image with the name of the image optionally appearing just below the individual tile. - */ - --PHP_METHOD(gmagick, montageimage) -+PHP_METHOD(Gmagick, montageimage) - { - MagickWand *tmp_wand; - zval *objvar; -@@ -5222,7 +5222,7 @@ PHP_METHOD(gmagick, montageimage) - /* {{{ proto Gmagick Gmagick::morphImages(int number_frames) - Method morphs a set of images. Both the image pixels and size are linearly interpolated to give the appearance of a meta-morphosis from one image to the next. - */ --PHP_METHOD(gmagick, morphimages) -+PHP_METHOD(Gmagick, morphimages) - { - MagickWand *tmp_wand; - php_gmagick_object *intern, *intern_return; -@@ -5255,7 +5255,7 @@ PHP_METHOD(gmagick, morphimages) - /* {{{ proto Gmagick Gmagick::mosaicImages() - Inlays an image sequence to form a single coherent picture. It returns a wand with each image in the sequence composited at the location defined by the page offset of the image. - */ --PHP_METHOD(gmagick, mosaicimages) -+PHP_METHOD(Gmagick, mosaicimages) - { - MagickWand *tmp_wand = NULL; - php_gmagick_object *intern, *intern_return; -@@ -5282,7 +5282,7 @@ PHP_METHOD(gmagick, mosaicimages) - /* }}} */ - - --PHP_METHOD(gmagick, setimageattribute) -+PHP_METHOD(Gmagick, setimageattribute) - { - php_gmagick_object *intern; - char *key, *attribute; -@@ -5310,7 +5310,7 @@ PHP_METHOD(gmagick, setimageattribute) - /* {{{ proto bool Gmagick::setImageColormapColor(int index, GmagickPixel color) - Sets the color of the specified colormap index - */ --PHP_METHOD(gmagick, setimagecolormapcolor) -+PHP_METHOD(Gmagick, setimagecolormapcolor) - { - php_gmagick_object *intern; - zval *param; -@@ -5343,7 +5343,7 @@ PHP_METHOD(gmagick, setimagecolormapcolor) - /* {{{ proto bool Gmagick::setImageGravity(int GRAVITY) - Sets the image gravity - */ --PHP_METHOD(gmagick, setimagegravity) -+PHP_METHOD(Gmagick, setimagegravity) - { - php_gmagick_object *intern; - unsigned int status; -@@ -5371,7 +5371,7 @@ PHP_METHOD(gmagick, setimagegravity) - /* {{{ proto bool Gmagick::setImageMatteColor(GmagickPixel matte) - Sets the image matte color. - */ --PHP_METHOD(gmagick, setimagemattecolor) -+PHP_METHOD(Gmagick, setimagemattecolor) - { - zval *param; - php_gmagick_object *intern; -@@ -5402,7 +5402,7 @@ PHP_METHOD(gmagick, setimagemattecolor) - /* {{{ proto bool Gmagick::setImageVirtualPixelMethod(int method) - Sets the image virtual pixel method. - */ --PHP_METHOD(gmagick, setimagevirtualpixelmethod) -+PHP_METHOD(Gmagick, setimagevirtualpixelmethod) - { - php_gmagick_object *intern; - long virtual_pixel; -@@ -5423,7 +5423,7 @@ PHP_METHOD(gmagick, setimagevirtualpixelmethod) - /* {{{ proto bool Gmagick::shaveImage(int columns, int rows) - Shaves pixels from the image edges. It allocates the memory necessary for the new Image structure and returns a pointer to the new image. - */ --PHP_METHOD(gmagick, shaveimage) -+PHP_METHOD(Gmagick, shaveimage) - { - php_gmagick_object *intern; - long columns, rows; -@@ -5451,7 +5451,7 @@ PHP_METHOD(gmagick, shaveimage) - /* {{{ proto Gmagick Gmagick::steganoImage(Gmagick watermark_wand, int offset) - Hides a digital watermark within the image. Recover the hidden watermark later to prove that the authenticity of an image. Offset defines the start position within the image to hide the watermark. - */ --PHP_METHOD(gmagick, steganoimage) -+PHP_METHOD(Gmagick, steganoimage) - { - zval *objvar; - php_gmagick_object *intern, *intern_second, *intern_return; -@@ -5486,7 +5486,7 @@ PHP_METHOD(gmagick, steganoimage) - /* {{{ proto Gmagick Gmagick::stereoImage(Gmagick offset_wand) - Composites two images and produces a single image that is the composite of a left and right image of a stereo pair - */ --PHP_METHOD(gmagick, stereoimage) -+PHP_METHOD(Gmagick, stereoimage) - { - MagickWand *tmp_wand; - zval *magick_object; -@@ -5523,7 +5523,7 @@ PHP_METHOD(gmagick, stereoimage) - /* {{{ proto Gmagick Gmagick::transformimage(string crop, string geometry ) - Comfortability method for crop and resize - */ --PHP_METHOD(gmagick, transformimage) -+PHP_METHOD(Gmagick, transformimage) - { - char *crop, *geometry; - size_t crop_len, geometry_len; -@@ -5557,7 +5557,7 @@ PHP_METHOD(gmagick, transformimage) - /* {{{ proto bool Gmagick::waveImage(float amplitude, float length ) - Adds wave filter to the image. - */ --PHP_METHOD(gmagick, waveimage) -+PHP_METHOD(Gmagick, waveimage) - { - double amplitude, wave_length; - php_gmagick_object *intern; -@@ -5587,7 +5587,7 @@ PHP_METHOD(gmagick, waveimage) - /* {{{ proto bool Gmagick::whiteThresholdImage(GmagickPixel threshold) - Is like ThresholdImage() but force all pixels above the threshold into white while leaving all pixels below the threshold unchanged. - */ --PHP_METHOD(gmagick, whitethresholdimage) -+PHP_METHOD(Gmagick, whitethresholdimage) - { - php_gmagick_object *intern; - zval *param; -@@ -5618,7 +5618,7 @@ PHP_METHOD(gmagick, whitethresholdimage) - /* {{{ proto array Gmagick::getimageboundingbox(float fuzz) - MagickGetImageBoundingBox() obtains the crop bounding box required to remove a solid-color border from the image. Color quantums which differ less than the fuzz setting are considered to be the same. If a border is not detected, then the the original image dimensions are returned. The crop bounding box estimation uses the same algorithm as MagickTrimImage(). - */ --PHP_METHOD(gmagick, getimageboundingbox) -+PHP_METHOD(Gmagick, getimageboundingbox) - { - php_gmagick_object *intern; - double fuzz; -@@ -5656,7 +5656,7 @@ PHP_METHOD(gmagick, getimageboundingbox) - /* {{{ proto float Gmagick::getimagefuzz() - MagickGetImageFuzz() returns the color comparison fuzz factor. Colors closer than the fuzz factor are considered to be the same when comparing colors. Note that some other functions such as MagickColorFloodfillImage() implicitly set this value. - */ --PHP_METHOD(gmagick, getimagefuzz) -+PHP_METHOD(Gmagick, getimagefuzz) - { - php_gmagick_object *intern; - double fuzz; -@@ -5676,7 +5676,7 @@ PHP_METHOD(gmagick, getimagefuzz) - MagickGetImageSavedType() gets the image type that will be used when the image is saved. This may be different to the current image type, returned by MagickGetImageType(). - IMGTYPE_* - */ --PHP_METHOD(gmagick, getimagesavedtype) -+PHP_METHOD(Gmagick, getimagesavedtype) - { - php_gmagick_object *intern; - ImageType type; -@@ -5700,7 +5700,7 @@ unsigned int MagickSetDepth(MagickWand *wand,const size_t depth); - /* {{{ proto Gmagick Gmagick::setDepth(int depth) - MagickSetDepth() sets the sample depth to be used when reading from a raw image or a format which requires that the depth be specified in advance by the user. - */ --PHP_METHOD(gmagick, setdepth) -+PHP_METHOD(Gmagick, setdepth) - { - php_gmagick_object *intern; - long depth; -@@ -5726,7 +5726,7 @@ PHP_METHOD(gmagick, setdepth) - /* {{{ proto Gmagick Gmagick::setImageFuzz(float fuzz) - MagickSetImageFuzz() sets the color comparison fuzz factor. Colors closer than the fuzz factor are considered to be the same when comparing colors. Note that some other functions such as MagickColorFloodfillImage() implicitly set this value. - */ --PHP_METHOD(gmagick, setimagefuzz) -+PHP_METHOD(Gmagick, setimagefuzz) - { - php_gmagick_object *intern; - double fuzz; -@@ -5755,7 +5755,7 @@ PHP_METHOD(gmagick, setimagefuzz) - - "jpeg","preserve-settings","true"). - */ --PHP_METHOD(gmagick, setimageoption) -+PHP_METHOD(Gmagick, setimageoption) - { - php_gmagick_object *intern; - char *format, *key, *value; -@@ -5788,7 +5788,7 @@ PHP_METHOD(gmagick, setimageoption) - /* {{{ proto bool Gmagick::setimagesavedtype(int type) - MagickSetImageSavedType() sets the image type that will be used when the image is saved. - */ --PHP_METHOD(gmagick, setimagesavedtype) -+PHP_METHOD(Gmagick, setimagesavedtype) - { - php_gmagick_object *intern; - long type; -@@ -5821,7 +5821,7 @@ PHP_METHOD(gmagick, setimagesavedtype) - - MagickSetFormat() sets the file or blob format (e.g. "BMP") to be used when a file or blob is read. Usually this is not necessary because GraphicsMagick is able to auto-detect the format based on the file header (or the file extension), but some formats do not use a unique header or the selection may be ambigious. Use MagickSetImageFormat() to set the format to be used when a file or blob is to be written. - */ --PHP_METHOD(gmagick, setformat) -+PHP_METHOD(Gmagick, setformat) - { - php_gmagick_object *intern; - char *format; -@@ -5851,7 +5851,7 @@ PHP_METHOD(gmagick, setformat) - - Also see MagickSetImageUnits() which specifies the units which apply to the image resolution setting after an image has been read. - */ --PHP_METHOD(gmagick, setresolutionunits) -+PHP_METHOD(Gmagick, setresolutionunits) - { - php_gmagick_object *intern; - unsigned int status; -@@ -5879,7 +5879,7 @@ PHP_METHOD(gmagick, setresolutionunits) - Writes image to an open filehandle. Optional parameter format defines the format the file - is stored with - */ --PHP_METHOD(gmagick, writeimagefile) -+PHP_METHOD(Gmagick, writeimagefile) - { - php_gmagick_object *intern; - zval *zstream; -diff --git a/gmagickdraw_methods.c b/gmagickdraw_methods.c -index f282700..b6f4f4f 100644 ---- a/gmagickdraw_methods.c -+++ b/gmagickdraw_methods.c -@@ -1,6 +1,6 @@ - /** - +----------------------------------------------------------------------+ -- | PHP Version 5 / Gmagick | -+ | PHP Version 5 / Gmagick | - +----------------------------------------------------------------------+ - | Copyright (c) 2009 Vito Chin, Mikko Koppanen | - +----------------------------------------------------------------------+ -@@ -13,7 +13,7 @@ - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Mikko Kopppanen <mkoppanen@php.net> | -- | Vito Chin <vito@php.net> | -+ | Vito Chin <vito@php.net> | - +----------------------------------------------------------------------+ - */ - -@@ -21,10 +21,10 @@ - #include "php_gmagick_macros.h" - #include "php_gmagick_helpers.h" - --/* {{{ proto GmagickDraw GmagickDraw::setStrokeColor(PixelWand stroke_wand) -+/* {{{ proto GmagickDraw GmagickDraw::setStrokeColor(GmagickPixel|string color) - Sets the color used for stroking object outlines. - */ --PHP_METHOD(gmagickdraw, setstrokecolor) -+PHP_METHOD(GmagickDraw, setstrokecolor) - { - zval *param; - php_gmagickdraw_object *internd; -@@ -35,7 +35,7 @@ PHP_METHOD(gmagickdraw, setstrokecolor) - } - - internd = Z_GMAGICKDRAW_OBJ_P(getThis()); -- -+ - GMAGICK_CAST_PARAMETER_TO_COLOR(param, internp, 2); - - if (internd->drawing_wand != NULL) { -@@ -49,7 +49,7 @@ PHP_METHOD(gmagickdraw, setstrokecolor) - /* {{{ proto GmagickDraw GmagickDraw::setStrokeWidth(float stroke_width) - Sets the width of the stroke used to draw object outlines. - */ --PHP_METHOD(gmagickdraw, setstrokewidth) -+PHP_METHOD(GmagickDraw, setstrokewidth) - { - php_gmagickdraw_object *internd; - double width; -@@ -69,7 +69,7 @@ PHP_METHOD(gmagickdraw, setstrokewidth) - /* {{{ proto GmagickDraw GmagickDraw::ellipse(float ox, float oy, float rx, float ry, float start, float end) - Draws an ellipse on the image. - */ --PHP_METHOD(gmagickdraw, ellipse) -+PHP_METHOD(GmagickDraw, ellipse) - { - double ox, oy, rx, ry, start, end; - php_gmagickdraw_object *internd; -@@ -90,7 +90,7 @@ PHP_METHOD(gmagickdraw, ellipse) - /* {{{ proto GmagickDraw GmagickDraw::annotate(float x, float y, string *text) - Draws text on the image. - */ --PHP_METHOD(gmagickdraw, annotate) -+PHP_METHOD(GmagickDraw, annotate) - { - php_gmagickdraw_object *internd; - double x, y; -@@ -112,7 +112,7 @@ PHP_METHOD(gmagickdraw, annotate) - /* {{{ proto bool GmagickDraw::affine(array affine) - Adjusts the current affine transformation matrix with the specified affine transformation matrix. Note that the current affine transform is adjusted rather than replaced. - */ --PHP_METHOD(gmagickdraw, affine) -+PHP_METHOD(GmagickDraw, affine) - { - php_gmagickdraw_object *internd; - zval *affine_matrix, *current; -@@ -159,7 +159,7 @@ PHP_METHOD(gmagickdraw, affine) - - i++; - } ZEND_HASH_FOREACH_END(); -- -+ - internd = Z_GMAGICKDRAW_OBJ_P(getThis()); - - DrawAffine(internd->drawing_wand, pmatrix); -@@ -172,7 +172,7 @@ PHP_METHOD(gmagickdraw, affine) - /* {{{ proto GmagickDraw GmagickDraw::arc(float sx, float sy, float ex, float ey, float sd, float ed) - Draws an arc falling within a specified bounding rectangle on the image. - */ --PHP_METHOD(gmagickdraw, arc) -+PHP_METHOD(GmagickDraw, arc) - { - double sx, sy, ex, ey, sd, ed; - php_gmagickdraw_object *internd; -@@ -191,7 +191,7 @@ PHP_METHOD(gmagickdraw, arc) - /* {{{ proto GmagickDraw GmagickDraw::bezier(array coordinates) - Draws a bezier curve through a set of points on the image. - */ --PHP_METHOD(gmagickdraw, bezier) -+PHP_METHOD(GmagickDraw, bezier) - { - - zval *coordinate_array; -@@ -220,18 +220,16 @@ PHP_METHOD(gmagickdraw, bezier) - /* {{{ proto GmagickPixel GmagickDraw::getFillColor() - Returns the fill color used for drawing filled objects. - */ --PHP_METHOD(gmagickdraw, getfillcolor) -+PHP_METHOD(GmagickDraw, getfillcolor) - { - php_gmagickpixel_object *internp; - php_gmagickdraw_object *internd; - PixelWand *tmp_wand; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -- -+ -+ ZEND_PARSE_PARAMETERS_NONE(); -+ - internd = Z_GMAGICKDRAW_OBJ_P(getThis()); -- -+ - tmp_wand = NewPixelWand(); - DrawGetFillColor(internd->drawing_wand, tmp_wand); - -@@ -246,14 +244,12 @@ PHP_METHOD(gmagickdraw, getfillcolor) - /* {{{ proto float GmagickDraw::getFillOpacity() - Returns the opacity used when drawing using the fill color or fill texture. Fully opaque is 1.0. - */ --PHP_METHOD(gmagickdraw, getfillopacity) -+PHP_METHOD(GmagickDraw, getfillopacity) - { - php_gmagickdraw_object *internd; - double opacity; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - internd = Z_GMAGICKDRAW_OBJ_P(getThis()); - opacity = DrawGetFillOpacity(internd->drawing_wand); -@@ -265,14 +261,12 @@ PHP_METHOD(gmagickdraw, getfillopacity) - /* {{{ proto string|bool GmagickDraw::getFont() - Returns a null-terminaged string specifying the font used when annotating with text. The value returned must be freed by the user when no longer needed. - */ --PHP_METHOD(gmagickdraw, getfont) -+PHP_METHOD(GmagickDraw, getfont) - { - php_gmagickdraw_object *internd; - char *font; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - internd = Z_GMAGICKDRAW_OBJ_P(getThis()); - -@@ -290,14 +284,12 @@ PHP_METHOD(gmagickdraw, getfont) - /* {{{ proto float GmagickDraw::getFontSize() - Returns the font pointsize used when annotating with text. - */ --PHP_METHOD(gmagickdraw, getfontsize) -+PHP_METHOD(GmagickDraw, getfontsize) - { - php_gmagickdraw_object *internd; - double font_size; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - internd = Z_GMAGICKDRAW_OBJ_P(getThis()); - -@@ -310,14 +302,12 @@ PHP_METHOD(gmagickdraw, getfontsize) - /* {{{ proto int GmagickDraw::getFontStyle() - Returns the font style used when annotating with text. - */ --PHP_METHOD(gmagickdraw, getfontstyle) -+PHP_METHOD(GmagickDraw, getfontstyle) - { - php_gmagickdraw_object *internd; - long font_style; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - internd = Z_GMAGICKDRAW_OBJ_P(getThis()); - -@@ -330,14 +320,12 @@ PHP_METHOD(gmagickdraw, getfontstyle) - /* {{{ proto int GmagickDraw::getFontWeight() - Returns the font weight used when annotating with text. - */ --PHP_METHOD(gmagickdraw, getfontweight) -+PHP_METHOD(GmagickDraw, getfontweight) - { - php_gmagickdraw_object *internd; - long weight; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - internd = Z_GMAGICKDRAW_OBJ_P(getThis()); - -@@ -350,14 +338,12 @@ PHP_METHOD(gmagickdraw, getfontweight) - /* {{{ proto float GmagickDraw::getStrokeOpacity() - Returns the opacity of stroked object outlines. - */ --PHP_METHOD(gmagickdraw, getstrokeopacity) -+PHP_METHOD(GmagickDraw, getstrokeopacity) - { - php_gmagickdraw_object *internd; - double opacity; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - internd = Z_GMAGICKDRAW_OBJ_P(getThis()); - opacity = DrawGetStrokeOpacity(internd->drawing_wand); -@@ -366,18 +352,16 @@ PHP_METHOD(gmagickdraw, getstrokeopacity) - } - /* }}} */ - --/* {{{ proto GmagickPixel GmagickDraw::getStrokeColor(PixelWand stroke_color) -+/* {{{ proto GmagickPixel GmagickDraw::getStrokeColor() - Returns the color used for stroking object outlines. - */ --PHP_METHOD(gmagickdraw, getstrokecolor) -+PHP_METHOD(GmagickDraw, getstrokecolor) - { - php_gmagickpixel_object *internp; - php_gmagickdraw_object *internd; - PixelWand *tmp_wand; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - internd = Z_GMAGICKDRAW_OBJ_P(getThis()); - -@@ -395,14 +379,12 @@ PHP_METHOD(gmagickdraw, getstrokecolor) - /* {{{ proto float GmagickDraw::getStrokeWidth() - Returns the width of the stroke used to draw object outlines. - */ --PHP_METHOD(gmagickdraw, getstrokewidth) -+PHP_METHOD(GmagickDraw, getstrokewidth) - { - php_gmagickdraw_object *internd; - double width; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - internd = Z_GMAGICKDRAW_OBJ_P(getThis()); - width = DrawGetStrokeWidth(internd->drawing_wand); -@@ -414,14 +396,12 @@ PHP_METHOD(gmagickdraw, getstrokewidth) - /* {{{ proto int GmagickDraw::getTextDecoration() - Returns the decoration applied when annotating with text. - */ --PHP_METHOD(gmagickdraw, gettextdecoration) -+PHP_METHOD(GmagickDraw, gettextdecoration) - { - php_gmagickdraw_object *internd; - long decoration; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - internd = Z_GMAGICKDRAW_OBJ_P(getThis()); - -@@ -434,14 +414,12 @@ PHP_METHOD(gmagickdraw, gettextdecoration) - /* {{{ proto string|bool GmagickDraw::getTextEncoding() - Returns a null-terminated string which specifies the code set used for text annotations. The string must be freed by the user once it is no longer required. - */ --PHP_METHOD(gmagickdraw, gettextencoding) -+PHP_METHOD(GmagickDraw, gettextencoding) - { - php_gmagickdraw_object *internd; - char *encoding; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - internd = Z_GMAGICKDRAW_OBJ_P(getThis()); - encoding = DrawGetTextEncoding(internd->drawing_wand); -@@ -459,7 +437,7 @@ PHP_METHOD(gmagickdraw, gettextencoding) - /* {{{ proto GmagickDraw GmagickDraw::line(float sx, float sy, float ex, float ey) - Draws a line on the image using the current stroke color, stroke opacity, and stroke width. - */ --PHP_METHOD(gmagickdraw, line) -+PHP_METHOD(GmagickDraw, line) - { - php_gmagickdraw_object *internd; - double sx, sy, ex, ey; -@@ -472,14 +450,13 @@ PHP_METHOD(gmagickdraw, line) - - DrawLine(internd->drawing_wand, sx, sy, ex, ey); - GMAGICK_CHAIN_METHOD; -- - } - /* }}} */ - - /* {{{ proto GmagickDraw GmagickDraw::point(float x, float y) - Draws a point using the current stroke color and stroke thickness at the specified coordinates. - */ --PHP_METHOD(gmagickdraw, point) -+PHP_METHOD(GmagickDraw, point) - { - php_gmagickdraw_object *internd; - double x, y; -@@ -499,7 +476,7 @@ PHP_METHOD(gmagickdraw, point) - /* {{{ proto GmagickDraw GmagickDraw::polygon(array coordinates) - Draws a polygon using the current stroke, stroke width, and fill color or texture, using the specified array of coordinates. - */ --PHP_METHOD(gmagickdraw, polygon) -+PHP_METHOD(GmagickDraw, polygon) - { - zval *coordinate_array; - php_gmagickdraw_object *internd; -@@ -529,7 +506,7 @@ PHP_METHOD(gmagickdraw, polygon) - /* {{{ proto GmagickDraw GmagickDraw::polyline(array coordinates) - Draws a polyline using the current stroke, stroke width, and fill color or texture, using the specified array of coordinates. - */ --PHP_METHOD(gmagickdraw, polyline) -+PHP_METHOD(GmagickDraw, polyline) - { - zval *coordinate_array; - php_gmagickdraw_object *internd; -@@ -559,7 +536,7 @@ PHP_METHOD(gmagickdraw, polyline) - /* {{{ proto GmagickDraw GmagickDraw::rectangle(float x1, float y1, float x2, float y2) - Draws a rectangle given two coordinates and using the current stroke, stroke width, and fill settings. - */ --PHP_METHOD(gmagickdraw, rectangle) -+PHP_METHOD(GmagickDraw, rectangle) - { - double x1, y1, x2, y2; - php_gmagickdraw_object *internd; -@@ -579,7 +556,7 @@ PHP_METHOD(gmagickdraw, rectangle) - /* {{{ proto GmagickDraw GmagickDraw::rotate(float degrees) - Applies the specified rotation to the current coordinate space. - */ --PHP_METHOD(gmagickdraw, rotate) -+PHP_METHOD(GmagickDraw, rotate) - { - php_gmagickdraw_object *internd; - double degrees; -@@ -599,7 +576,7 @@ PHP_METHOD(gmagickdraw, rotate) - /* {{{ proto GmagickDraw GmagickDraw::roundRectangle(float x1, float y1, float x2, float y2, float rx, float ry) - Draws a rounted rectangle given two coordinates, x & y corner radiuses and using the current stroke, stroke width, and fill settings. - */ --PHP_METHOD(gmagickdraw, roundrectangle) -+PHP_METHOD(GmagickDraw, roundrectangle) - { - double x1, y1, x2, y2, rx, ry; - php_gmagickdraw_object *internd; -@@ -619,7 +596,7 @@ PHP_METHOD(gmagickdraw, roundrectangle) - /* {{{ proto GmagickDraw GmagickDraw::scale(float x, float y) - Adjusts the scaling factor to apply in the horizontal and vertical directions to the current coordinate space. - */ --PHP_METHOD(gmagickdraw, scale) -+PHP_METHOD(GmagickDraw, scale) - { - php_gmagickdraw_object *internd; - double x, y; -@@ -634,10 +611,10 @@ PHP_METHOD(gmagickdraw, scale) - DrawScale(internd->drawing_wand, x, y); - GMAGICK_CHAIN_METHOD; - } --/* {{{ proto GmagickDraw GmagickDraw::setFillColor(PixelWand fill_wand) -+/* {{{ proto GmagickDraw GmagickDraw::setFillColor(GmagickPixel|string color) - Sets the fill color to be used for drawing filled objects. - */ --PHP_METHOD(gmagickdraw, setfillcolor) -+PHP_METHOD(GmagickDraw, setfillcolor) - { - zval *param; - php_gmagickdraw_object *internd; -@@ -659,7 +636,7 @@ PHP_METHOD(gmagickdraw, setfillcolor) - /* {{{ proto GmagickDraw GmagickDraw::setFillOpacity(float fillOpacity) - Sets the opacity to use when drawing using the fill color or fill texture. Fully opaque is 1.0. - */ --PHP_METHOD(gmagickdraw, setfillopacity) -+PHP_METHOD(GmagickDraw, setfillopacity) - { - php_gmagickdraw_object *internd; - double fillOpacity; -@@ -679,7 +656,7 @@ PHP_METHOD(gmagickdraw, setfillopacity) - /* {{{ proto GmagickDraw GmagickDraw::setFont(string font_name) - Sets the fully-sepecified font to use when annotating with text. - */ --PHP_METHOD(gmagickdraw, setfont) -+PHP_METHOD(GmagickDraw, setfont) - { - php_gmagickdraw_object *internd; - char *font, *absolute; -@@ -731,7 +708,7 @@ PHP_METHOD(gmagickdraw, setfont) - /* {{{ proto GmagickDraw GmagickDraw::setFontSize(float pointsize) - Sets the font pointsize to use when annotating with text. - */ --PHP_METHOD(gmagickdraw, setfontsize) -+PHP_METHOD(GmagickDraw, setfontsize) - { - php_gmagickdraw_object *internd; - double font_size; -@@ -751,7 +728,7 @@ PHP_METHOD(gmagickdraw, setfontsize) - /* {{{ proto GmagickDraw GmagickDraw::setFontStyle(int style) - Sets the font style to use when annotating with text. The AnyStyle enumeration acts as a wild-card "don't care" option. - */ --PHP_METHOD(gmagickdraw, setfontstyle) -+PHP_METHOD(GmagickDraw, setfontstyle) - { - php_gmagickdraw_object *internd; - zend_long style_id = AnyStyle; -@@ -771,7 +748,7 @@ PHP_METHOD(gmagickdraw, setfontstyle) - /* {{{ proto GmagickDraw GmagickDraw::setFontWeight(int font_weight) - Sets the font weight to use when annotating with text. - */ --PHP_METHOD(gmagickdraw, setfontweight) -+PHP_METHOD(GmagickDraw, setfontweight) - { - php_gmagickdraw_object *internd; - zend_long weight; -@@ -797,7 +774,7 @@ PHP_METHOD(gmagickdraw, setfontweight) - /* {{{ proto GmagickDraw GmagickDraw::setStrokeOpacity(float stroke_opacity) - Specifies the opacity of stroked object outlines. - */ --PHP_METHOD(gmagickdraw, setstrokeopacity) -+PHP_METHOD(GmagickDraw, setstrokeopacity) - { - php_gmagickdraw_object *internd; - double opacity; -@@ -817,7 +794,7 @@ PHP_METHOD(gmagickdraw, setstrokeopacity) - /* {{{ proto GmagickDraw GmagickDraw::setTextDecoration(int decoration) - Specifies a decoration to be applied when annotating with text. - */ --PHP_METHOD(gmagickdraw, settextdecoration) -+PHP_METHOD(GmagickDraw, settextdecoration) - { - php_gmagickdraw_object *internd; - zend_long decoration; -@@ -838,7 +815,7 @@ PHP_METHOD(gmagickdraw, settextdecoration) - /* {{ proto GmagickDraw GmagickDraw::setGravity(int GRAVITY) - Sets the gravity value - */ --PHP_METHOD(gmagickdraw, setgravity) -+PHP_METHOD(GmagickDraw, setgravity) - { - php_gmagickdraw_object *internd; - zend_long gravity; -@@ -858,13 +835,11 @@ PHP_METHOD(gmagickdraw, setgravity) - /* {{ proto int GmagickDraw::getGravity() - Gets the gravity value - */ --PHP_METHOD(gmagickdraw, getgravity) -+PHP_METHOD(GmagickDraw, getgravity) - { - php_gmagickdraw_object *internd; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ ZEND_PARSE_PARAMETERS_NONE(); - - internd = Z_GMAGICKDRAW_OBJ_P(getThis()); - -@@ -875,7 +850,7 @@ PHP_METHOD(gmagickdraw, getgravity) - /* {{{ proto GmagickDraw GmagickDraw::setTextEncoding(string encoding) - Specifies specifies the code set to use for text annotations. The only character encoding which may be specified at this time is "UTF-8" for representing Unicode as a sequence of bytes. Specify an empty string to set text encoding to the system's default. Successful text annotation using Unicode may require fonts designed to support Unicode. - */ --PHP_METHOD(gmagickdraw, settextencoding) -+PHP_METHOD(GmagickDraw, settextencoding) - { - php_gmagickdraw_object *internd; - char *encoding; -@@ -895,7 +870,7 @@ PHP_METHOD(gmagickdraw, settextencoding) - /* {{{ proto GmagickDraw GmagickDraw::setStrokeAntialias(bool stroke_antialias) - Controls whether stroked outlines are antialiased. Stroked outlines are antialiased by default. When antialiasing is disabled stroked pixels are thresholded to determine if the stroke color or underlying canvas color should be used. - */ --PHP_METHOD(gmagickdraw, setstrokeantialias) -+PHP_METHOD(GmagickDraw, setstrokeantialias) - { - php_gmagickdraw_object *internd; - zend_bool antialias; -@@ -916,7 +891,7 @@ PHP_METHOD(gmagickdraw, setstrokeantialias) - /* {{{ proto GmagickDraw GmagickDraw::setStrokeDashOffset(float dash_offset) - Specifies the offset into the dash pattern to start the dash. - */ --PHP_METHOD(gmagickdraw, setstrokedashoffset) -+PHP_METHOD(GmagickDraw, setstrokedashoffset) - { - php_gmagickdraw_object *internd; - double offset; -@@ -936,7 +911,7 @@ PHP_METHOD(gmagickdraw, setstrokedashoffset) - /* {{{ proto GmagickDraw GmagickDraw::setStrokeLineCap(int linecap) - Specifies the shape to be used at the end of open subpaths when they are stroked. Values of LineCap are UndefinedCap, ButtCap, RoundCap, and SquareCap. - */ --PHP_METHOD(gmagickdraw, setstrokelinecap) -+PHP_METHOD(GmagickDraw, setstrokelinecap) - { - php_gmagickdraw_object *internd; - zend_long line_cap; -@@ -945,7 +920,7 @@ PHP_METHOD(gmagickdraw, setstrokelinecap) - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &line_cap) == FAILURE) { - return; - } -- -+ - internd = Z_GMAGICKDRAW_OBJ_P(getThis()); - - DrawSetStrokeLineCap(internd->drawing_wand, line_cap); -@@ -956,8 +931,8 @@ PHP_METHOD(gmagickdraw, setstrokelinecap) - /* {{{ proto GmagickDraw GmagickDraw::setStrokeLineJoin(int linejoin) - Specifies the shape to be used at the corners of paths (or other vector shapes) when they are stroked. Values of LineJoin are UndefinedJoin, MiterJoin, RoundJoin, and BevelJoin. - */ --PHP_METHOD(gmagickdraw, setstrokelinejoin) --{ -+PHP_METHOD(GmagickDraw, setstrokelinejoin) -+{ - php_gmagickdraw_object *internd; - zend_long line_join; - -@@ -965,7 +940,7 @@ PHP_METHOD(gmagickdraw, setstrokelinejoin) - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &line_join) == FAILURE) { - return; - } -- -+ - internd = Z_GMAGICKDRAW_OBJ_P(getThis()); - - DrawSetStrokeLineJoin(internd->drawing_wand, line_join); -@@ -976,7 +951,7 @@ PHP_METHOD(gmagickdraw, setstrokelinejoin) - /* {{{ proto GmagickDraw GmagickDraw::setStrokeMiterLimit(int miterlimit) - Specifies the miter limit. When two line segments meet at a sharp angle and miter joins have been specified for 'lineJoin', it is possible for the miter to extend far beyond the thickness of the line stroking the path. The miterLimit' imposes a limit on the ratio of the miter length to the 'lineWidth'. - */ --PHP_METHOD(gmagickdraw, setstrokemiterlimit) -+PHP_METHOD(GmagickDraw, setstrokemiterlimit) - { - php_gmagickdraw_object *internd; - zend_long miter_limit; -@@ -985,7 +960,7 @@ PHP_METHOD(gmagickdraw, setstrokemiterlimit) - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &miter_limit) == FAILURE) { - return; - } -- -+ - internd = Z_GMAGICKDRAW_OBJ_P(getThis()); - - DrawSetStrokeMiterLimit(internd->drawing_wand, miter_limit); -@@ -996,7 +971,7 @@ PHP_METHOD(gmagickdraw, setstrokemiterlimit) - /* {{{ proto bool GmagickDraw::getStrokeAntialias() - Returns the current stroke antialias setting. Stroked outlines are antialiased by default. When antialiasing is disabled stroked pixels are thresholded to determine if the stroke color or underlying canvas color should be used. - */ --PHP_METHOD(gmagickdraw, getstrokeantialias) -+PHP_METHOD(GmagickDraw, getstrokeantialias) - { - php_gmagickdraw_object *internd; - MagickBool status; -@@ -1004,7 +979,7 @@ PHP_METHOD(gmagickdraw, getstrokeantialias) - if (zend_parse_parameters_none() == FAILURE) { - return; - } -- -+ - internd = Z_GMAGICKDRAW_OBJ_P(getThis()); - status = DrawGetStrokeAntialias(internd->drawing_wand); - -@@ -1019,7 +994,7 @@ PHP_METHOD(gmagickdraw, getstrokeantialias) - /* {{{ proto float GmagickDraw::getStrokeDashOffset() - Returns the offset into the dash pattern to start the dash. - */ --PHP_METHOD(gmagickdraw, getstrokedashoffset) -+PHP_METHOD(GmagickDraw, getstrokedashoffset) - { - php_gmagickdraw_object *internd; - double offset; -@@ -1027,7 +1002,7 @@ PHP_METHOD(gmagickdraw, getstrokedashoffset) - if (zend_parse_parameters_none() == FAILURE) { - return; - } -- -+ - internd = Z_GMAGICKDRAW_OBJ_P(getThis()); - offset = DrawGetStrokeDashOffset(internd->drawing_wand); - -@@ -1038,7 +1013,7 @@ PHP_METHOD(gmagickdraw, getstrokedashoffset) - /* {{{ proto int GmagickDraw::getStrokeLineCap() - Returns the shape to be used at the end of open subpaths when they are stroked. Values of LineCap are UndefinedCap, ButtCap, RoundCap, and SquareCap. - */ --PHP_METHOD(gmagickdraw, getstrokelinecap) -+PHP_METHOD(GmagickDraw, getstrokelinecap) - { - php_gmagickdraw_object *internd; - long line_cap; -@@ -1046,7 +1021,7 @@ PHP_METHOD(gmagickdraw, getstrokelinecap) - if (zend_parse_parameters_none() == FAILURE) { - return; - } -- -+ - internd = Z_GMAGICKDRAW_OBJ_P(getThis()); - line_cap = DrawGetStrokeLineCap(internd->drawing_wand); - -@@ -1057,7 +1032,7 @@ PHP_METHOD(gmagickdraw, getstrokelinecap) - /* {{{ proto int GmagickDraw::getStrokeLineJoin() - Returns the shape to be used at the corners of paths (or other vector shapes) when they are stroked. Values of LineJoin are UndefinedJoin, MiterJoin, RoundJoin, and BevelJoin. - */ --PHP_METHOD(gmagickdraw, getstrokelinejoin) -+PHP_METHOD(GmagickDraw, getstrokelinejoin) - { - php_gmagickdraw_object *internd; - long line_join; -@@ -1065,7 +1040,7 @@ PHP_METHOD(gmagickdraw, getstrokelinejoin) - if (zend_parse_parameters_none() == FAILURE) { - return; - } -- -+ - internd = Z_GMAGICKDRAW_OBJ_P(getThis()); - line_join = DrawGetStrokeLineJoin(internd->drawing_wand); - -@@ -1076,7 +1051,7 @@ PHP_METHOD(gmagickdraw, getstrokelinejoin) - /* {{{ proto int GmagickDraw::getStrokeMiterLimit() - Returns the miter limit. When two line segments meet at a sharp angle and miter joins have been specified for 'lineJoin', it is possible for the miter to extend far beyond the thickness of the line stroking the path. The miterLimit' imposes a limit on the ratio of the miter length to the 'lineWidth'. - */ --PHP_METHOD(gmagickdraw, getstrokemiterlimit) -+PHP_METHOD(GmagickDraw, getstrokemiterlimit) - { - php_gmagickdraw_object *internd; - unsigned long miter_limit; -@@ -1084,7 +1059,7 @@ PHP_METHOD(gmagickdraw, getstrokemiterlimit) - if (zend_parse_parameters_none() == FAILURE) { - return; - } -- -+ - internd = Z_GMAGICKDRAW_OBJ_P(getThis()); - miter_limit = DrawGetStrokeMiterLimit(internd->drawing_wand); - -@@ -1093,11 +1068,11 @@ PHP_METHOD(gmagickdraw, getstrokemiterlimit) - /* }}} */ - - --#if GMAGICK_LIB_MASK >= 1003000 -+#if GMAGICK_LIB_MASK >= 1003000 - /* {{{ proto array GmagickDraw::getStrokeDashArray() - Returns an array representing the pattern of dashes and gaps used to stroke paths (see DrawSetStrokeDashArray). The array must be freed once it is no longer required by the user. - */ --PHP_METHOD(gmagickdraw, getstrokedasharray) -+PHP_METHOD(GmagickDraw, getstrokedasharray) - { - php_gmagickdraw_object *internd; - double *stroke_array; -@@ -1124,7 +1099,7 @@ PHP_METHOD(gmagickdraw, getstrokedasharray) - /* {{{ proto GmagickDraw GmagickDraw::setStrokeDashArray(array dashArray) - Specifies the pattern of dashes and gaps used to stroke paths. The strokeDashArray represents an array of numbers that specify the lengths of alternating dashes and gaps in pixels. If an odd number of values is provided, then the list of values is repeated to yield an even number of values. To remove an existing dash array, pass a zero number_elements argument and null dash_array. A typical strokeDashArray_ array might contain the members 5 3 2. - */ --PHP_METHOD(gmagickdraw, setstrokedasharray) -+PHP_METHOD(GmagickDraw, setstrokedasharray) - { - zval *param_array; - double *double_array; -@@ -1139,7 +1114,7 @@ PHP_METHOD(gmagickdraw, setstrokedasharray) - double_array = php_gmagick_zval_to_double_array(param_array, &elements TSRMLS_CC); - - if (!double_array) { -- GMAGICK_THROW_EXCEPTION_WITH_MESSAGE(GMAGICKDRAW_CLASS, "Cannot read stroke dash array parameter", 2); -+ GMAGICK_THROW_EXCEPTION_WITH_MESSAGE(GMAGICKDRAW_CLASS, "Cannot read stroke dash array parameter", 2); - return; - } - -@@ -1158,7 +1133,7 @@ PHP_METHOD(gmagickdraw, setstrokedasharray) - /* {{{ proto GmagickDraw GmagickDraw::circle(float ox, float oy, float px, float py) - Draws a circle on the image. - */ --PHP_METHOD(gmagickdraw, circle) -+PHP_METHOD(GmagickDraw, circle) - { - double ox, oy, px, py; - php_gmagickdraw_object *internd; -@@ -1175,11 +1150,11 @@ PHP_METHOD(gmagickdraw, circle) - } - /* }}} */ - -- -+ - /* {{{ proto string|bool GmagickDraw::getClipPath() - Obtains the current clipping path ID. The value returned must be deallocated by the user when it is no longer needed. - */ --PHP_METHOD(gmagickdraw, getclippath) -+PHP_METHOD(GmagickDraw, getclippath) - { - php_gmagickdraw_object *internd; - char *clip_path; -@@ -1187,7 +1162,7 @@ PHP_METHOD(gmagickdraw, getclippath) - if (zend_parse_parameters_none() == FAILURE) { - return; - } -- -+ - internd = Z_GMAGICKDRAW_OBJ_P(getThis());; - clip_path = DrawGetClipPath(internd->drawing_wand); - -@@ -1204,7 +1179,7 @@ PHP_METHOD(gmagickdraw, getclippath) - /* {{{ proto GmagickDraw GmagickDraw::setClipPath(string clip_mask) - Associates a named clipping path with the image. Only the areas drawn on by the clipping path will be modified as long as it remains in effect. - */ --PHP_METHOD(gmagickdraw, setclippath) -+PHP_METHOD(GmagickDraw, setclippath) - { - php_gmagickdraw_object *internd; - char *clip_mask; -@@ -1225,7 +1200,7 @@ PHP_METHOD(gmagickdraw, setclippath) - /* {{{ proto int GmagickDraw::getClipRule() - Returns the current polygon fill rule to be used by the clipping path. - */ --PHP_METHOD(gmagickdraw, getcliprule) -+PHP_METHOD(GmagickDraw, getcliprule) - { - php_gmagickdraw_object *internd; - long clip_rule; -@@ -1233,7 +1208,7 @@ PHP_METHOD(gmagickdraw, getcliprule) - if (zend_parse_parameters_none() == FAILURE) { - return; - } -- -+ - internd = Z_GMAGICKDRAW_OBJ_P(getThis());; - clip_rule = DrawGetClipRule(internd->drawing_wand); - -@@ -1244,7 +1219,7 @@ PHP_METHOD(gmagickdraw, getcliprule) - /* {{{ proto GmagickDraw GmagickDraw::setClipRule(int fill_rule) - Set the polygon fill rule to be used by the clipping path. - */ --PHP_METHOD(gmagickdraw, setcliprule) -+PHP_METHOD(GmagickDraw, setcliprule) - { - php_gmagickdraw_object *internd; - zend_long fill_rule; -@@ -1253,7 +1228,7 @@ PHP_METHOD(gmagickdraw, setcliprule) - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &fill_rule) == FAILURE) { - return; - } -- -+ - internd = Z_GMAGICKDRAW_OBJ_P(getThis()); - - DrawSetClipRule(internd->drawing_wand, fill_rule); -@@ -1264,7 +1239,7 @@ PHP_METHOD(gmagickdraw, setcliprule) - /* {{{ proto int GmagickDraw::getClipUnits() - Returns the interpretation of clip path units. - */ --PHP_METHOD(gmagickdraw, getclipunits) -+PHP_METHOD(GmagickDraw, getclipunits) - { - php_gmagickdraw_object *internd; - long units; -@@ -1272,7 +1247,7 @@ PHP_METHOD(gmagickdraw, getclipunits) - if (zend_parse_parameters_none() == FAILURE) { - return; - } -- -+ - internd = Z_GMAGICKDRAW_OBJ_P(getThis());; - units = DrawGetClipUnits(internd->drawing_wand); - -@@ -1283,8 +1258,8 @@ PHP_METHOD(gmagickdraw, getclipunits) - /* {{{ proto GmagickDraw GmagickDraw::setClipUnits(int clip_units) - Sets the interpretation of clip path units. - */ --PHP_METHOD(gmagickdraw, setclipunits) --{ -+PHP_METHOD(GmagickDraw, setclipunits) -+{ - php_gmagickdraw_object *internd; - zend_long units; - -@@ -1303,7 +1278,7 @@ PHP_METHOD(gmagickdraw, setclipunits) - /* {{{ proto GmagickDraw GmagickDraw::color(float x, float y, int paintMethod) - Draws color on image using the current fill color, starting at specified position, and using specified paint method. The available paint methods are: - */ --PHP_METHOD(gmagickdraw, color) -+PHP_METHOD(GmagickDraw, color) - { - php_gmagickdraw_object *internd; - double x, y; -@@ -1324,7 +1299,7 @@ PHP_METHOD(gmagickdraw, color) - /* {{{ proto GmagickDraw GmagickDraw::comment(string comment) - Adds a comment to a vector output stream. - */ --PHP_METHOD(gmagickdraw, comment) -+PHP_METHOD(GmagickDraw, comment) - { - php_gmagickdraw_object *internd; - char *comment; -@@ -1334,7 +1309,7 @@ PHP_METHOD(gmagickdraw, comment) - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &comment, &comment_len) == FAILURE) { - return; - } -- -+ - internd = Z_GMAGICKDRAW_OBJ_P(getThis()); - - DrawComment(internd->drawing_wand, comment); -@@ -1346,7 +1321,7 @@ PHP_METHOD(gmagickdraw, comment) - Sets the URL to use as a fill pattern for filling objects. Only local URLs ("#identifier") are supported at this time. - These local URLs are normally created by defining a named fill pattern with DrawPushPattern/DrawPopPattern. - */ --PHP_METHOD(gmagickdraw, setfillpatternurl) -+PHP_METHOD(GmagickDraw, setfillpatternurl) - { - php_gmagickdraw_object *internd; - char *url; -@@ -1364,10 +1339,10 @@ PHP_METHOD(gmagickdraw, setfillpatternurl) - } - /* }}} */ - --/* {{{ proto int GmagickDraw::getFillRule(const DrawingWand *wand) -+/* {{{ proto int GmagickDraw::getFillRule() - Returns the fill rule used while drawing polygons. - */ --PHP_METHOD(gmagickdraw, getfillrule) -+PHP_METHOD(GmagickDraw, getfillrule) - { - php_gmagickdraw_object *internd; - long fill_rule; -@@ -1375,7 +1350,7 @@ PHP_METHOD(gmagickdraw, getfillrule) - if (zend_parse_parameters_none() == FAILURE) { - return; - } -- -+ - internd = Z_GMAGICKDRAW_OBJ_P(getThis());; - fill_rule = DrawGetFillRule(internd->drawing_wand); - -@@ -1387,7 +1362,7 @@ PHP_METHOD(gmagickdraw, getfillrule) - /* {{{ proto GmagickDraw GmagickDraw::setFillRule(int fill_rule) - Sets the fill rule to use while drawing polygons. - */ --PHP_METHOD(gmagickdraw, setfillrule) -+PHP_METHOD(GmagickDraw, setfillrule) - { - php_gmagickdraw_object *internd; - zend_long fill_rule; -@@ -1396,7 +1371,7 @@ PHP_METHOD(gmagickdraw, setfillrule) - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &fill_rule) == FAILURE) { - return; - } -- -+ - internd = Z_GMAGICKDRAW_OBJ_P(getThis()); - - DrawSetFillRule(internd->drawing_wand, fill_rule); -@@ -1407,7 +1382,7 @@ PHP_METHOD(gmagickdraw, setfillrule) - /* {{{ proto string|bool GmagickDraw::getFontFamily() - Returns the font family to use when annotating with text. The value returned must be freed by the user when it is no longer needed. - */ --PHP_METHOD(gmagickdraw, getfontfamily) -+PHP_METHOD(GmagickDraw, getfontfamily) - { - php_gmagickdraw_object *internd; - char *font_family; -@@ -1456,7 +1431,7 @@ static zend_bool php_gmagick_check_font(char *font, int font_len TSRMLS_DC) - /* {{{ proto GmagickDraw GmagickDraw::setFontFamily(string font_family) - Sets the font family to use when annotating with text. - */ --PHP_METHOD(gmagickdraw, setfontfamily) -+PHP_METHOD(GmagickDraw, setfontfamily) - { - php_gmagickdraw_object *internd; - char *font_family; -@@ -1485,10 +1460,10 @@ PHP_METHOD(gmagickdraw, setfontfamily) - } - /* }}} */ - --/* {{{ proto int GmagickDraw::getFontStretch(int fontStretch) -+/* {{{ proto int GmagickDraw::getFontStretch() - Gets the font stretch to use when annotating with text - */ --PHP_METHOD(gmagickdraw, getfontstretch) -+PHP_METHOD(GmagickDraw, getfontstretch) - { - php_gmagickdraw_object *internd; - -@@ -1500,7 +1475,7 @@ PHP_METHOD(gmagickdraw, getfontstretch) - /* {{{ proto bool GmagickDraw::setFontStretch(int fontStretch) - Sets the font stretch to use when annotating with text. The AnyStretch enumeration acts as a wild-card "don't care" option. - */ --PHP_METHOD(gmagickdraw, setfontstretch) -+PHP_METHOD(GmagickDraw, setfontstretch) - { - php_gmagickdraw_object *internd; - zend_long stretch; -@@ -1523,7 +1498,7 @@ PHP_METHOD(gmagickdraw, setfontstretch) - ///* {{{ proto bool GmagickDraw::composite(int compose, float x, float y, float width, float height, MagickWand magick_wand) - // Composites an image onto the current image, using the specified composition operator, specified position, and at the specified size. - //*/ --// PHP_METHOD(gmagickdraw, composite) -+// PHP_METHOD(GmagickDraw, composite) - // { - // php_gmagickdraw_object *internd; - // php_gmagick_object *other_image; -@@ -1554,14 +1529,14 @@ PHP_METHOD(gmagickdraw, setfontstretch) - /* {{{ proto GmagickDraw GmagickDraw::pathClose() - Adds a path element to the current path which closes the current subpath by drawing a straight line from the current point to the current subpath's most recent starting point (usually, the most recent moveto point). - */ --PHP_METHOD(gmagickdraw, pathclose) -+PHP_METHOD(GmagickDraw, pathclose) - { - php_gmagickdraw_object *internd; - - if (zend_parse_parameters_none() == FAILURE) { - return; - } -- -+ - internd = Z_GMAGICKDRAW_OBJ_P(getThis());; - DrawPathClose(internd->drawing_wand); - GMAGICK_CHAIN_METHOD; -@@ -1571,7 +1546,7 @@ PHP_METHOD(gmagickdraw, pathclose) - /* {{{ proto GmagickDraw GmagickDraw::pathCurveToAbsolute(float x1, float y1, float x2, float y2, float x, float y) - Draws a cubic Bezier curve from the current point to (x,y) using (x1,y1) as the control point at the beginning of the curve and (x2,y2) as the control point at the end of the curve using absolute coordinates. At the end of the command, the new current point becomes the final (x,y) coordinate pair used in the polybezier. - */ --PHP_METHOD(gmagickdraw, pathcurvetoabsolute) -+PHP_METHOD(GmagickDraw, pathcurvetoabsolute) - { - php_gmagickdraw_object *internd; - double x1, y1, x2, y2, x, y; -@@ -1591,7 +1566,7 @@ PHP_METHOD(gmagickdraw, pathcurvetoabsolute) - /* {{{ proto GmagickDraw GmagickDraw::pathCurveToRelative(float x1, float y1, float x2, float y2, float x, float y) - Draws a cubic Bezier curve from the current point to (x,y) using (x1,y1) as the control point at the beginning of the curve and (x2,y2) as the control point at the end of the curve using relative coordinates. At the end of the command, the new current point becomes the final (x,y) coordinate pair used in the polybezier. - */ --PHP_METHOD(gmagickdraw, pathcurvetorelative) -+PHP_METHOD(GmagickDraw, pathcurvetorelative) - { - php_gmagickdraw_object *internd; - double x1, y1, x2, y2, x, y; -@@ -1611,7 +1586,7 @@ PHP_METHOD(gmagickdraw, pathcurvetorelative) - /* {{{ proto GmagickDraw GmagickDraw::pathCurveToQuadraticBezierAbsolute(float x1, float y1, float x, float y) - Draws a quadratic Bezier curve from the current point to (x,y) using (x1,y1) as the control point using absolute coordinates. At the end of the command, the new current point becomes the final (x,y) coordinate pair used in the polybezier. - */ --PHP_METHOD(gmagickdraw, pathcurvetoquadraticbezierabsolute) -+PHP_METHOD(GmagickDraw, pathcurvetoquadraticbezierabsolute) - { - php_gmagickdraw_object *internd; - double x1, y1, x, y; -@@ -1620,7 +1595,7 @@ PHP_METHOD(gmagickdraw, pathcurvetoquadraticbezierabsolute) - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "dddd", &x1, &y1, &x, &y) == FAILURE) { - return; - } -- -+ - internd = Z_GMAGICKDRAW_OBJ_P(getThis()); - - DrawPathCurveToQuadraticBezierAbsolute(internd->drawing_wand, x1, y1, x, y); -@@ -1631,7 +1606,7 @@ PHP_METHOD(gmagickdraw, pathcurvetoquadraticbezierabsolute) - /* {{{ proto GmagickDraw GmagickDraw::pathCurveToQuadraticBezierRelative(float x1, float y1, float x, float y) - Draws a quadratic Bezier curve from the current point to (x,y) using (x1,y1) as the control point using relative coordinates. At the end of the command, the new current point becomes the final (x,y) coordinate pair used in the polybezier. - */ --PHP_METHOD(gmagickdraw, pathcurvetoquadraticbezierrelative) -+PHP_METHOD(GmagickDraw, pathcurvetoquadraticbezierrelative) - { - php_gmagickdraw_object *internd; - double x1, y1, x, y; -@@ -1640,7 +1615,7 @@ PHP_METHOD(gmagickdraw, pathcurvetoquadraticbezierrelative) - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "dddd", &x1, &y1, &x, &y) == FAILURE) { - return; - } -- -+ - internd = Z_GMAGICKDRAW_OBJ_P(getThis()); - - DrawPathCurveToQuadraticBezierRelative(internd->drawing_wand, x1, y1, x, y); -@@ -1651,7 +1626,7 @@ PHP_METHOD(gmagickdraw, pathcurvetoquadraticbezierrelative) - /* {{{ proto GmagickDraw GmagickDraw::pathCurveToQuadraticBezierSmoothAbsolute(float x, float y) - Draws a quadratic Bezier curve (using relative coordinates) from the current point to (x,y). The control point is assumed to be the reflection of the control point on the previous command relative to the current point. (If there is no previous command or if the previous command was not a DrawPathCurveToQuadraticBezierAbsolute, DrawPathCurveToQuadraticBezierRelative, DrawPathCurveToQuadraticBezierSmoothAbsolut or DrawPathCurveToQuadraticBezierSmoothRelative, assume the control point is coincident with the current point.). At the end of the command, the new current point becomes the final (x,y) coordinate pair used in the polybezier. - */ --PHP_METHOD(gmagickdraw, pathcurvetoquadraticbeziersmoothabsolute) -+PHP_METHOD(GmagickDraw, pathcurvetoquadraticbeziersmoothabsolute) - { - php_gmagickdraw_object *internd; - double x, y; -@@ -1671,7 +1646,7 @@ PHP_METHOD(gmagickdraw, pathcurvetoquadraticbeziersmoothabsolute) - /* {{{ proto GmagickDraw GmagickDraw::pathCurveToQuadraticBezierSmoothRelative(float x, float y) - Draws a quadratic Bezier curve (using relative coordinates) from the current point to (x, y). The control point is assumed to be the reflection of the control point on the previous command relative to the current point. (If there is no previous command or if the previous command was not a DrawPathCurveToQuadraticBezierAbsolute, DrawPathCurveToQuadraticBezierRelative, DrawPathCurveToQuadraticBezierSmoothAbsolut or DrawPathCurveToQuadraticBezierSmoothRelative, assume the control point is coincident with the current point). At the end of the command, the new current point becomes the final (x, y) coordinate pair used in the polybezier. - */ --PHP_METHOD(gmagickdraw, pathcurvetoquadraticbeziersmoothrelative) -+PHP_METHOD(GmagickDraw, pathcurvetoquadraticbeziersmoothrelative) - { - php_gmagickdraw_object *internd; - double x, y; -@@ -1691,7 +1666,7 @@ PHP_METHOD(gmagickdraw, pathcurvetoquadraticbeziersmoothrelative) - /* {{{ proto GmagickDraw GmagickDraw::pathCurveToSmoothAbsolute(float x2, float y2, float x, float y) - Draws a cubic Bezier curve from the current point to (x,y) using absolute coordinates. The first control point is assumed to be the reflection of the second control point on the previous command relative to the current point. (If there is no previous command or if the previous command was not an DrawPathCurveToAbsolute, DrawPathCurveToRelative, DrawPathCurveToSmoothAbsolute or DrawPathCurveToSmoothRelative, assume the first control point is coincident with the current point.) (x2,y2) is the second control point (i.e., the control point at the end of the curve). At the end of the command, the new current point becomes the final (x,y) coordinate pair used in the polybezier. - */ --PHP_METHOD(gmagickdraw, pathcurvetosmoothabsolute) -+PHP_METHOD(GmagickDraw, pathcurvetosmoothabsolute) - { - php_gmagickdraw_object *internd; - double x1, y1, x, y; -@@ -1711,7 +1686,7 @@ PHP_METHOD(gmagickdraw, pathcurvetosmoothabsolute) - /* {{{ proto GmagickDraw GmagickDraw::pathCurveToSmoothRelative(float x2, float y2, float x, float y) - Draws a cubic Bezier curve from the current point to (x,y) using relative coordinates. The first control point is assumed to be the reflection of the second control point on the previous command relative to the current point. (If there is no previous command or if the previous command was not an DrawPathCurveToAbsolute, DrawPathCurveToRelative, DrawPathCurveToSmoothAbsolute or DrawPathCurveToSmoothRelative, assume the first control point is coincident with the current point.) (x2,y2) is the second control point (i.e., the control point at the end of the curve). At the end of the command, the new current point becomes the final (x,y) coordinate pair used in the polybezier. - */ --PHP_METHOD(gmagickdraw, pathcurvetosmoothrelative) -+PHP_METHOD(GmagickDraw, pathcurvetosmoothrelative) - { - php_gmagickdraw_object *internd; - double x1, y1, x, y; -@@ -1731,7 +1706,7 @@ PHP_METHOD(gmagickdraw, pathcurvetosmoothrelative) - /* {{{ proto GmagickDraw GmagickDraw::pathEllipticArcAbsolute(float rx, float ry, float x_axis_rotation, bool large_arc_flag, bool sweep_flag, float x, float y) - Draws an elliptical arc from the current point to (x, y) using absolute coordinates. The size and orientation of the ellipse are defined by two radii (rx, ry) and an xAxisRotation, which indicates how the ellipse as a whole is rotated relative to the current coordinate system. The center (cx, cy) of the ellipse is calculated automatically to satisfy the constraints imposed by the other parameters. largeArcFlag and sweepFlag contribute to the automatic calculations and help determine how the arc is drawn. If largeArcFlag is true then draw the larger of the available arcs. If sweepFlag is true, then draw the arc matching a clock-wise rotation. - */ --PHP_METHOD(gmagickdraw, pathellipticarcabsolute) -+PHP_METHOD(GmagickDraw, pathellipticarcabsolute) - { - php_gmagickdraw_object *internd; - double rx, ry, x_axis_rotation, x, y; -@@ -1741,7 +1716,7 @@ PHP_METHOD(gmagickdraw, pathellipticarcabsolute) - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "dddbbdd", &rx, &ry, &x_axis_rotation, &large_arc, &sweep, &x, &y) == FAILURE) { - return; - } -- -+ - internd = Z_GMAGICKDRAW_OBJ_P(getThis()); - DrawPathEllipticArcAbsolute(internd->drawing_wand, rx, ry, x_axis_rotation, large_arc, sweep, x, y); - -@@ -1752,7 +1727,7 @@ PHP_METHOD(gmagickdraw, pathellipticarcabsolute) - /* {{{ proto GmagickDraw GmagickDraw::pathEllipticArcRelative(float rx, float ry, float x_axis_rotation, bool large_arc_flag, bool sweep_flag, float x, float y) - Draws an elliptical arc from the current point to (x, y) using relative coordinates. The size and orientation of the ellipse are defined by two radii (rx, ry) and an xAxisRotation, which indicates how the ellipse as a whole is rotated relative to the current coordinate system. The center (cx, cy) of the ellipse is calculated automatically to satisfy the constraints imposed by the other parameters. largeArcFlag and sweepFlag contribute to the automatic calculations and help determine how the arc is drawn. If largeArcFlag is true then draw the larger of the available arcs. If sweepFlag is true, then draw the arc matching a clock-wise rotation. - */ --PHP_METHOD(gmagickdraw, pathellipticarcrelative) -+PHP_METHOD(GmagickDraw, pathellipticarcrelative) - { - php_gmagickdraw_object *internd; - double rx, ry, x_axis_rotation, x, y; -@@ -1762,7 +1737,7 @@ PHP_METHOD(gmagickdraw, pathellipticarcrelative) - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "dddbbdd", &rx, &ry, &x_axis_rotation, &large_arc, &sweep, &x, &y) == FAILURE) { - return; - } -- -+ - internd = Z_GMAGICKDRAW_OBJ_P(getThis()); - DrawPathEllipticArcRelative(internd->drawing_wand, rx, ry, x_axis_rotation, large_arc, sweep, x, y); - -@@ -1774,7 +1749,7 @@ PHP_METHOD(gmagickdraw, pathellipticarcrelative) - /* {{{ proto GmagickDraw GmagickDraw::pathMoveToAbsolute(float x, float y) - Starts a new sub-path at the given coordinate using absolute coordinates. The current point then becomes the specified coordinate. - */ --PHP_METHOD(gmagickdraw, pathmovetoabsolute) -+PHP_METHOD(GmagickDraw, pathmovetoabsolute) - { - php_gmagickdraw_object *internd; - double x, y; -@@ -1794,7 +1769,7 @@ PHP_METHOD(gmagickdraw, pathmovetoabsolute) - /* {{{ proto GmagickDraw GmagickDraw::pathMoveToRelative(float x, float y) - Starts a new sub-path at the given coordinate using relative coordinates. The current point then becomes the specified coordinate. - */ --PHP_METHOD(gmagickdraw, pathmovetorelative) -+PHP_METHOD(GmagickDraw, pathmovetorelative) - { - php_gmagickdraw_object *internd; - double x, y; -@@ -1815,7 +1790,7 @@ PHP_METHOD(gmagickdraw, pathmovetorelative) - /* {{{ proto GmagickDraw GmagickDraw::pathLineToAbsolute(float x, float y) - Draws a line path from the current point to the given coordinate using absolute coordinates. The coordinate then becomes the new current point. - */ --PHP_METHOD(gmagickdraw, pathlinetoabsolute) -+PHP_METHOD(GmagickDraw, pathlinetoabsolute) - { - php_gmagickdraw_object *internd; - double x, y; -@@ -1824,7 +1799,7 @@ PHP_METHOD(gmagickdraw, pathlinetoabsolute) - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "dd", &x, &y) == FAILURE) { - return; - } -- -+ - internd = Z_GMAGICKDRAW_OBJ_P(getThis()); - - DrawPathLineToAbsolute(internd->drawing_wand, x, y); -@@ -1835,7 +1810,7 @@ PHP_METHOD(gmagickdraw, pathlinetoabsolute) - /* {{{ proto GmagickDraw GmagickDraw::pathLineToRelative(float x, float y) - Draws a line path from the current point to the given coordinate using relative coordinates. The coordinate then becomes the new current point. - */ --PHP_METHOD(gmagickdraw, pathlinetorelative) -+PHP_METHOD(GmagickDraw, pathlinetorelative) - { - php_gmagickdraw_object *internd; - double x, y; -@@ -1856,7 +1831,7 @@ PHP_METHOD(gmagickdraw, pathlinetorelative) - /* {{{ proto GmagickDraw GmagickDraw::pathLineToHorizontalAbsolute(float x) - Draws a horizontal line path from the current point to the target point using absolute coordinates. The target point then becomes the new current point. - */ --PHP_METHOD(gmagickdraw, pathlinetohorizontalabsolute) -+PHP_METHOD(GmagickDraw, pathlinetohorizontalabsolute) - { - php_gmagickdraw_object *internd; - double y; -@@ -1865,7 +1840,7 @@ PHP_METHOD(gmagickdraw, pathlinetohorizontalabsolute) - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "d", &y) == FAILURE) { - return; - } -- -+ - internd = Z_GMAGICKDRAW_OBJ_P(getThis()); - - DrawPathLineToHorizontalAbsolute(internd->drawing_wand, y); -@@ -1876,7 +1851,7 @@ PHP_METHOD(gmagickdraw, pathlinetohorizontalabsolute) - /* {{{ proto GmagickDraw GmagickDraw::pathLineToHorizontalRelative(float x) - Draws a horizontal line path from the current point to the target point using relative coordinates. The target point then becomes the new current point. - */ --PHP_METHOD(gmagickdraw, pathlinetohorizontalrelative) -+PHP_METHOD(GmagickDraw, pathlinetohorizontalrelative) - { - php_gmagickdraw_object *internd; - double x; -@@ -1885,7 +1860,7 @@ PHP_METHOD(gmagickdraw, pathlinetohorizontalrelative) - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "d", &x) == FAILURE) { - return; - } -- -+ - internd = Z_GMAGICKDRAW_OBJ_P(getThis()); - - DrawPathLineToHorizontalRelative(internd->drawing_wand, x); -@@ -1898,7 +1873,7 @@ PHP_METHOD(gmagickdraw, pathlinetohorizontalrelative) - /* {{{ proto GmagickDraw GmagickDraw::pathLineToVerticalAbsolute(float y) - Draws a vertical line path from the current point to the target point using absolute coordinates. The target point then becomes the new current point. - */ --PHP_METHOD(gmagickdraw, pathlinetoverticalabsolute) -+PHP_METHOD(GmagickDraw, pathlinetoverticalabsolute) - { - php_gmagickdraw_object *internd; - double y; -@@ -1918,7 +1893,7 @@ PHP_METHOD(gmagickdraw, pathlinetoverticalabsolute) - /* {{{ proto GmagickDraw GmagickDraw::pathLineToVerticalRelative(float y) - Draws a vertical line path from the current point to the target point using relative coordinates. The target point then becomes the new current point. - */ --PHP_METHOD(gmagickdraw, pathlinetoverticalrelative) -+PHP_METHOD(GmagickDraw, pathlinetoverticalrelative) - { - php_gmagickdraw_object *internd; - double y; -@@ -1927,7 +1902,7 @@ PHP_METHOD(gmagickdraw, pathlinetoverticalrelative) - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "d", &y) == FAILURE) { - return; - } -- -+ - internd = Z_GMAGICKDRAW_OBJ_P(getThis()); - - DrawPathLineToVerticalRelative(internd->drawing_wand, y); -@@ -1940,14 +1915,14 @@ PHP_METHOD(gmagickdraw, pathlinetoverticalrelative) - /* {{{ proto GmagickDraw GmagickDraw::pathStart() - Declares the start of a path drawing list which is terminated by a matching DrawPathFinish() command. All other DrawPath commands must be enclosed between a and a DrawPathFinish() command. This is because path drawing commands are subordinate commands and they do not function by themselves. - */ --PHP_METHOD(gmagickdraw, pathstart) -+PHP_METHOD(GmagickDraw, pathstart) - { - php_gmagickdraw_object *internd; - - if (zend_parse_parameters_none() == FAILURE) { - return; - } -- -+ - internd = Z_GMAGICKDRAW_OBJ_P(getThis());; - DrawPathStart(internd->drawing_wand); - GMAGICK_CHAIN_METHOD; -@@ -1956,15 +1931,15 @@ PHP_METHOD(gmagickdraw, pathstart) - - /* {{{ proto GmagickDraw GmagickDraw::pathFinish() - Terminates the current path. --*/ --PHP_METHOD(gmagickdraw, pathfinish) -+*/ -+PHP_METHOD(GmagickDraw, pathfinish) - { - php_gmagickdraw_object *internd; - - if (zend_parse_parameters_none() == FAILURE) { - return; - } -- -+ - internd = Z_GMAGICKDRAW_OBJ_P(getThis());; - DrawPathFinish(internd->drawing_wand); - GMAGICK_CHAIN_METHOD; -@@ -1976,14 +1951,14 @@ PHP_METHOD(gmagickdraw, pathfinish) - /* {{{ proto GmagickDraw GmagickDraw::popClipPath() - Terminates a clip path definition. - */ --PHP_METHOD(gmagickdraw, popclippath) -+PHP_METHOD(GmagickDraw, popclippath) - { - php_gmagickdraw_object *internd; - - if (zend_parse_parameters_none() == FAILURE) { - return; - } -- -+ - internd = Z_GMAGICKDRAW_OBJ_P(getThis());; - DrawPopClipPath(internd->drawing_wand); - GMAGICK_CHAIN_METHOD; -@@ -1994,14 +1969,14 @@ PHP_METHOD(gmagickdraw, popclippath) - /* {{{ proto GmagickDraw GmagickDraw::popDefs() - Terminates a definition list - */ --PHP_METHOD(gmagickdraw, popdefs) -+PHP_METHOD(GmagickDraw, popdefs) - { - php_gmagickdraw_object *internd; - - if (zend_parse_parameters_none() == FAILURE) { - return; - } -- -+ - internd = Z_GMAGICKDRAW_OBJ_P(getThis());; - DrawPopDefs(internd->drawing_wand); - GMAGICK_CHAIN_METHOD; -@@ -2012,7 +1987,7 @@ PHP_METHOD(gmagickdraw, popdefs) - /* {{{ proto GmagickDraw GmagickDraw::popPattern() - Terminates a pattern definition. - */ --PHP_METHOD(gmagickdraw, poppattern) -+PHP_METHOD(GmagickDraw, poppattern) - { - php_gmagickdraw_object *internd; - -@@ -2030,7 +2005,7 @@ PHP_METHOD(gmagickdraw, poppattern) - /* {{{ proto GmagickDraw GmagickDraw::pushClipPath(string clip_mask_id) - Starts a clip path definition which is comprized of any number of drawing commands and terminated by a DrawPopClipPath() command. - */ --PHP_METHOD(gmagickdraw, pushclippath) -+PHP_METHOD(GmagickDraw, pushclippath) - { - php_gmagickdraw_object *internd; - char *clip_mask; -@@ -2051,14 +2026,14 @@ PHP_METHOD(gmagickdraw, pushclippath) - /* {{{ proto GmagickDraw GmagickDraw::pushDefs() - Indicates that commands up to a terminating DrawPopDefs() command create named elements (e.g. clip-paths, textures, etc.) which may safely be processed earlier for the sake of efficiency. - */ --PHP_METHOD(gmagickdraw, pushdefs) -+PHP_METHOD(GmagickDraw, pushdefs) - { - php_gmagickdraw_object *internd; - - if (zend_parse_parameters_none() == FAILURE) { - return; - } -- -+ - internd = Z_GMAGICKDRAW_OBJ_P(getThis());; - DrawPushDefs(internd->drawing_wand); - GMAGICK_CHAIN_METHOD; -@@ -2068,8 +2043,8 @@ PHP_METHOD(gmagickdraw, pushdefs) - /* {{{ proto GmagickDraw GmagickDraw::pushPattern(string pattern_id, float x, float y, float width, float height) - Indicates that subsequent commands up to a DrawPopPattern() command comprise the definition of a named pattern. The pattern space is assigned top left corner coordinates, a width and height, and becomes its own drawing space. Anything which can be drawn may be used in a pattern definition. Named patterns may be used as stroke or brush definitions. - */ --PHP_METHOD(gmagickdraw, pushpattern) --{ -+PHP_METHOD(GmagickDraw, pushpattern) -+{ - php_gmagickdraw_object *internd; - char *pattern_id; - size_t pattern_id_len; -@@ -2091,7 +2066,7 @@ PHP_METHOD(gmagickdraw, pushpattern) - /* {{{ proto GmagickDraw GmagickDraw::skewX(float degrees) - Skews the current coordinate system in the horizontal direction. - */ --PHP_METHOD(gmagickdraw, skewx) -+PHP_METHOD(GmagickDraw, skewx) - { - double degrees; - php_gmagickdraw_object *internd; -@@ -2111,7 +2086,7 @@ PHP_METHOD(gmagickdraw, skewx) - /* {{{ proto GmagickDraw GmagickDraw::skewY(float degrees) - Skews the current coordinate system in the vertical direction. - */ --PHP_METHOD(gmagickdraw, skewy) -+PHP_METHOD(GmagickDraw, skewy) - { - double degrees; - php_gmagickdraw_object *internd; -@@ -2132,7 +2107,7 @@ PHP_METHOD(gmagickdraw, skewy) - /* {{{ proto GmagickDraw GmagickDraw::setStrokePatternURL(string stroke_url) - Sets the pattern used for stroking object outlines. - */ --PHP_METHOD(gmagickdraw, setstrokepatternurl) -+PHP_METHOD(GmagickDraw, setstrokepatternurl) - { - php_gmagickdraw_object *internd; - char *url; -@@ -2153,7 +2128,7 @@ PHP_METHOD(gmagickdraw, setstrokepatternurl) - /* {{{ proto bool GmagickDraw::getTextAntialias() - Returns the current text antialias setting, which determines whether text is antialiased. Text is antialiased by default. - */ --PHP_METHOD(gmagickdraw, gettextantialias) -+PHP_METHOD(GmagickDraw, gettextantialias) - { - php_gmagickdraw_object *internd; - unsigned int text_anti_alias; -@@ -2170,10 +2145,10 @@ PHP_METHOD(gmagickdraw, gettextantialias) - /* }}} */ - - --/* {{{ proto bool GmagickDraw::getAntialias() -+/* {{{ proto bool GmagickDraw::setAntialias(bool anti_alias) - Returns the antialias property associated with the wand. - */ --PHP_METHOD(gmagickdraw, settextantialias) -+PHP_METHOD(GmagickDraw, settextantialias) - { - php_gmagickdraw_object *internd; - zend_bool antialias; -@@ -2189,10 +2164,10 @@ PHP_METHOD(gmagickdraw, settextantialias) - } - /* }}} */ - --/* {{{ proto ImagickPixel GmagickDraw::getTextUnderColor(PixelWand under_color) -+/* {{{ proto GmagickPixel GmagickDraw::getTextUnderColor() - Returns the color of a background rectangle to place under text annotations. - */ --PHP_METHOD(gmagickdraw, gettextundercolor) -+PHP_METHOD(GmagickDraw, gettextundercolor) - { - php_gmagickpixel_object *internp; - php_gmagickdraw_object *internd; -@@ -2220,10 +2195,10 @@ PHP_METHOD(gmagickdraw, gettextundercolor) - } - /* }}} */ - --/* {{{ proto GmagickDraw GmagickDraw::setTextUnderColor(PixelWand under_wand) -+/* {{{ proto GmagickDraw GmagickDraw::setTextUnderColor(GmagickPixel|string color) - Specifies the color of a background rectangle to place under text annotations. - */ --PHP_METHOD(gmagickdraw, settextundercolor) -+PHP_METHOD(GmagickDraw, settextundercolor) - { - zval *param; - php_gmagickdraw_object *internd; -@@ -2247,7 +2222,7 @@ PHP_METHOD(gmagickdraw, settextundercolor) - /* {{{ proto GmagickDraw GmagickDraw::translate(float x, float y) - Applies a translation to the current coordinate system which moves the coordinate system origin to the specified coordinate. - */ --PHP_METHOD(gmagickdraw, translate) -+PHP_METHOD(GmagickDraw, translate) - { - double x, y; - php_gmagickdraw_object *internd; -@@ -2267,7 +2242,7 @@ PHP_METHOD(gmagickdraw, translate) - /* {{{ proto GmagickDraw GmagickDraw::setViewbox(float x1, float y1, float x2, float y2 ) - Sets the overall canvas size to be recorded with the drawing vector data. Usually this will be specified using the same size as the canvas image. When the vector data is saved to SVG or MVG formats, the viewbox is use to specify the size of the canvas image that a viewer will render the vector data on. - */ --PHP_METHOD(gmagickdraw, setviewbox) -+PHP_METHOD(GmagickDraw, setviewbox) - { - php_gmagickdraw_object *internd; - zend_long x1, y1, x2, y2; -@@ -2286,7 +2261,7 @@ PHP_METHOD(gmagickdraw, setviewbox) - /* {{{ proto GmagickDraw GmagickDraw::popGraphicContext() - Destroys the current DrawingWand in the stack, and returns to the previously pushed DrawingWand. Multiple DrawingWands may exist. It is an error to attempt to pop more DrawingWands than have been pushed, and it is proper form to pop all DrawingWands which have been pushed. - */ --PHP_METHOD(gmagickdraw, popGraphicContext) -+PHP_METHOD(GmagickDraw, popGraphicContext) - { - php_gmagickdraw_object *internd; - -@@ -2305,7 +2280,7 @@ PHP_METHOD(gmagickdraw, popGraphicContext) - /* {{{ proto GmagickDraw GmagickDraw::pushGraphicContext() - Clones the current DrawingWand to create a new DrawingWand, which is then added to the DrawingWand stack. The original drawing DrawingWand(s) may be returned to by invoking PopDrawingWand(). The DrawingWands are stored on a DrawingWand stack. For every Pop there must have already been an equivalent Push. - */ --PHP_METHOD(gmagickdraw, pushGraphicContext) -+PHP_METHOD(GmagickDraw, pushGraphicContext) - { - php_gmagickdraw_object *internd; - -diff --git a/gmagickpixel_methods.c b/gmagickpixel_methods.c -index 121a8fb..8471e5c 100644 ---- a/gmagickpixel_methods.c -+++ b/gmagickpixel_methods.c -@@ -1,6 +1,6 @@ - /* - +----------------------------------------------------------------------+ -- | PHP Version 5 / Gmagick | -+ | PHP Version 5 / Gmagick | - +----------------------------------------------------------------------+ - | Copyright (c) 2009 Vito Chin, Mikko Koppanen | - +----------------------------------------------------------------------+ -@@ -13,7 +13,7 @@ - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Mikko Kopppanen <mkoppanen@php.net> | -- | Vito Chin <vito@php.net> | -+ | Vito Chin <vito@php.net> | - +----------------------------------------------------------------------+ - */ - -@@ -21,22 +21,22 @@ - #include "php_gmagick_macros.h" - #include "php_gmagick_helpers.h" - --/* {{{ GmagickPixel Gmagick::__construct([string filename]) -- Constructs a new Gmagick object -+/* {{{ GmagickPixel GmagickPixel::__construct([string color]) -+ Constructs a new GmagickPixel object - */ --PHP_METHOD(gmagickpixel, __construct) -+PHP_METHOD(GmagickPixel, __construct) - { - php_gmagickpixel_object *internp; - MagickBool status; // Graphicmagick's boolean type - char *color_name = NULL; - size_t color_name_len = 0; -- -+ - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!", &color_name, &color_name_len) == FAILURE) { - return; - } - - internp = Z_GMAGICKPIXEL_OBJ_P(getThis()); -- -+ - /* If color was given as parameter, set it here.*/ - if (color_name != NULL && internp->pixel_wand != NULL) { - status = PixelSetColor(internp->pixel_wand, color_name); -@@ -44,7 +44,7 @@ PHP_METHOD(gmagickpixel, __construct) - GMAGICK_THROW_GMAGICKPIXEL_EXCEPTION(internp->pixel_wand, "Unable to construct GmagickPixel"); - } - } -- -+ - RETURN_TRUE; - } - /* }}} */ -@@ -52,13 +52,13 @@ PHP_METHOD(gmagickpixel, __construct) - /* {{{ proto GmagickPixel GmagickPixel::setColor(string color) - Sets the color of the pixel - */ --PHP_METHOD(gmagickpixel, setcolor) -+PHP_METHOD(GmagickPixel, setcolor) - { - php_gmagickpixel_object *internp; - char *color_name; - size_t color_name_len; - MagickBool status; -- -+ - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &color_name, &color_name_len) == FAILURE) { - return; - } -@@ -70,14 +70,14 @@ PHP_METHOD(gmagickpixel, setcolor) - GMAGICK_THROW_GMAGICKPIXEL_EXCEPTION(internp->pixel_wand, "Unable to set GmagickPixel color"); - } - -- GMAGICK_CHAIN_METHOD; -+ GMAGICK_CHAIN_METHOD; - } - /* }}} */ - - /* {{{ proto GmagickPixel GmagickPixel::setColorCount(int colorCount) - Sets the color count associated with this color. - */ --PHP_METHOD(gmagickpixel, setcolorcount) -+PHP_METHOD(GmagickPixel, setcolorcount) - { - php_gmagickpixel_object *internp; - zend_long color_count; -@@ -97,7 +97,7 @@ PHP_METHOD(gmagickpixel, setcolorcount) - /* {{{ proto array|string GmagickPixel::getColor([boolean as_array = false, normalise_array = false]) - Returns the color of the pixel - */ --PHP_METHOD(gmagickpixel, getcolor) -+PHP_METHOD(GmagickPixel, getcolor) - { - php_gmagickpixel_object *internp; - zend_bool as_array = 0, normalise_array = 0; -@@ -112,9 +112,9 @@ PHP_METHOD(gmagickpixel, getcolor) - if (!as_array) { - char *buffer, *color_string; - int len; -- -+ - color_string = PixelGetColorAsString(internp->pixel_wand); -- -+ - len = spprintf(&buffer, 50, "rgb(%s)", color_string); - GMAGICK_FREE_MEMORY(char *, color_string); - RETVAL_STRINGL(buffer, len); -@@ -122,14 +122,14 @@ PHP_METHOD(gmagickpixel, getcolor) - return; - } else { - array_init(return_value); -- -+ - if (normalise_array == 1) { - add_assoc_double(return_value, "r", PixelGetRed(internp->pixel_wand)); - add_assoc_double(return_value, "g", PixelGetGreen(internp->pixel_wand)); - add_assoc_double(return_value, "b", PixelGetBlue(internp->pixel_wand)); - } else { - double red, green, blue; -- -+ - red = PixelGetRed(internp->pixel_wand ) * 255; - green = PixelGetGreen(internp->pixel_wand ) * 255; - blue = PixelGetBlue(internp->pixel_wand ) * 255; -@@ -146,14 +146,12 @@ PHP_METHOD(gmagickpixel, getcolor) - /* {{{ proto int GmagickPixel::getColorCount() - Returns the color count associated with this color. - */ --PHP_METHOD(gmagickpixel, getcolorcount) -+PHP_METHOD(GmagickPixel, getcolorcount) - { - php_gmagickpixel_object *internp; - zend_long color_count; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) { -- return; -- } -+ -+ ZEND_PARSE_PARAMETERS_NONE(); - - internp = Z_GMAGICKPIXEL_OBJ_P(getThis()); - -@@ -165,7 +163,7 @@ PHP_METHOD(gmagickpixel, getcolorcount) - /* {{{ proto float GmagickPixel::getColorValue(int color ) - Gets the normalized color of the GmagickPixel. - */ --PHP_METHOD(gmagickpixel, getcolorvalue) -+PHP_METHOD(GmagickPixel, getcolorvalue) - { - php_gmagickpixel_object *internp; - zend_long color; -@@ -223,7 +221,7 @@ PHP_METHOD(gmagickpixel, getcolorvalue) - /* {{{ proto GmagickPixel GmagickPixel::setColorValue(int color, float value ) - Sets the normalized color of the GmagickPixel. - */ --PHP_METHOD(gmagickpixel, setcolorvalue) -+PHP_METHOD(GmagickPixel, setcolorvalue) - { - php_gmagickpixel_object *internp; - zend_long color; -@@ -273,7 +271,7 @@ PHP_METHOD(gmagickpixel, setcolorvalue) - default: - GMAGICK_THROW_GMAGICKPIXEL_EXCEPTION(internp->pixel_wand, "Unknown color type"); - break; -- -+ - } - GMAGICK_CHAIN_METHOD; - } -@@ -282,7 +280,7 @@ PHP_METHOD(gmagickpixel, setcolorvalue) - /* {{{ proto int GmagickPixel::getColorValueQuantum(int color ) - Gets the quantum color of the GmagickPixel. - */ --PHP_METHOD(gmagickpixel, getcolorvaluequantum) -+PHP_METHOD(GmagickPixel, getcolorvaluequantum) - { - php_gmagickpixel_object *internp; - zend_long color_quantum; -@@ -340,7 +338,7 @@ PHP_METHOD(gmagickpixel, getcolorvaluequantum) - /* {{{ proto GmagickPixel GmagickPixel::setColorValueQuantum(int color, float value) - Sets the normalized color quantum of the GmagickPixel. - */ --PHP_METHOD(gmagickpixel, setcolorvaluequantum) -+PHP_METHOD(GmagickPixel, setcolorvaluequantum) - { - php_gmagickpixel_object *internp; - zend_long color_quantum; -diff --git a/php_gmagick.h b/php_gmagick.h -index 7ad64a1..a380197 100644 ---- a/php_gmagick.h -+++ b/php_gmagick.h -@@ -114,6 +114,11 @@ typedef long ssize_t; - ZEND_ARG_TYPE_INFO(pass_by_ref, name, 0, 0) - #endif - -+#ifndef ZEND_ARG_OBJ_TYPE_MASK -+# define ZEND_ARG_OBJ_TYPE_MASK(pass_by_ref, name, class_name, type_mask, default_value) \ -+ ZEND_ARG_TYPE_INFO(pass_by_ref, name, 0, 0) -+#endif -+ - #ifndef ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE - # define ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(pass_by_ref, name, type_hint, allow_null, default_value) \ - ZEND_ARG_TYPE_INFO(pass_by_ref, name, type_hint, allow_null) diff --git a/skipif.inc b/skipif.inc deleted file mode 100644 index f759ced..0000000 --- a/skipif.inc +++ /dev/null @@ -1,12 +0,0 @@ -<?php - -if (!extension_loaded("gmagick")) die("skip"); - -function checkClassMethods($class, $methods) -{ - foreach ($methods as $method) { - if (method_exists($class, $method) == false) { - die("skip Class method $class::$method not present"); - } - } -} |