From 4ddecf3740147abaabe288c81d0a69f5c878f32b Mon Sep 17 00:00:00 2001 From: Danack Date: Wed, 26 Jun 2024 18:33:41 +0100 Subject: [PATCH] Correct return types. --- Imagick.stub.php | 2 +- ImagickDraw_arginfo.h | 1327 +++++++++++++++++++++++++++++++++++---- ImagickKernel_arginfo.h | 91 ++- ImagickPixel_arginfo.h | 251 +++++++- Imagick_arginfo.h | 1145 ++++++++++++--------------------- imagick_class.c | 2 +- 6 files changed, 1910 insertions(+), 908 deletions(-) diff --git a/Imagick.stub.php b/Imagick.stub.php index f67f10b1..1551affb 100644 --- a/Imagick.stub.php +++ b/Imagick.stub.php @@ -7,7 +7,7 @@ class Imagick { - public function optimizeImageLayers(): bool {} + public function optimizeImageLayers(): Imagick {} // METRIC_* public function compareImageLayers(int $metric): Imagick {} diff --git a/ImagickDraw_arginfo.h b/ImagickDraw_arginfo.h index 8221cacd..295d04d8 100644 --- a/ImagickDraw_arginfo.h +++ b/ImagickDraw_arginfo.h @@ -1,19 +1,43 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 43190bf1bedc3b561cfd4c2258a651f6bd559232 */ +* Stub hash: regen with 'sh regen_arginfo.sh' +* file has been fixedup for different versions */ #if MagickLibVersion > 0x628 + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_resetVectorGraphics, 0, 0, _IS_BOOL, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_resetVectorGraphics, 0, 0, 0) +#endif + ZEND_END_ARG_INFO() #endif #if MagickLibVersion > 0x649 + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_getTextKerning, 0, 0, IS_DOUBLE, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_getTextKerning, 0, 0, 0) +#endif + ZEND_END_ARG_INFO() #endif #if MagickLibVersion > 0x649 + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setTextKerning, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, kerning, IS_DOUBLE, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setTextKerning, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, kerning, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, kerning) +#endif ZEND_END_ARG_INFO() #endif @@ -22,177 +46,643 @@ ZEND_END_ARG_INFO() #endif #if MagickLibVersion > 0x649 + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setTextInterwordSpacing, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, spacing, IS_DOUBLE, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setTextInterwordSpacing, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, spacing, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, spacing) +#endif ZEND_END_ARG_INFO() #endif #if MagickLibVersion > 0x655 + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_getTextInterlineSpacing, 0, 0, IS_DOUBLE, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_getTextInterlineSpacing, 0, 0, 0) +#endif + ZEND_END_ARG_INFO() #endif #if MagickLibVersion > 0x655 + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setTextInterlineSpacing, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, spacing, IS_DOUBLE, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setTextInterlineSpacing, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, spacing, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, spacing) +#endif ZEND_END_ARG_INFO() #endif ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw___construct, 0, 0, 0) ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setFillColor, 0, 1, _IS_BOOL, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setFillColor, 0, 0, 1) +#endif + ZEND_ARG_OBJ_TYPE_MASK(0, fill_color, ImagickPixel, MAY_BE_STRING, NULL) ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setFillAlpha, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, alpha, IS_DOUBLE, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setFillAlpha, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, alpha, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, alpha) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setResolution, 0, 2, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, resolution_x, IS_DOUBLE, 0) - ZEND_ARG_TYPE_INFO(0, resolution_y, IS_DOUBLE, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setResolution, 0, 0, 2) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, resolution_x, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, resolution_x) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, resolution_y, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, resolution_y) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setStrokeColor, 0, 1, _IS_BOOL, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setStrokeColor, 0, 0, 1) +#endif + ZEND_ARG_OBJ_TYPE_MASK(0, color, ImagickPixel, MAY_BE_STRING, NULL) ZEND_END_ARG_INFO() #define arginfo_class_ImagickDraw_setStrokeAlpha arginfo_class_ImagickDraw_setFillAlpha + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setStrokeWidth, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, width, IS_DOUBLE, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setStrokeWidth, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, width, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, width) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_clear, 0, 0, _IS_BOOL, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_clear, 0, 0, 0) +#endif + ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_circle, 0, 4, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, origin_x, IS_DOUBLE, 0) - ZEND_ARG_TYPE_INFO(0, origin_y, IS_DOUBLE, 0) - ZEND_ARG_TYPE_INFO(0, perimeter_x, IS_DOUBLE, 0) - ZEND_ARG_TYPE_INFO(0, perimeter_y, IS_DOUBLE, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_circle, 0, 0, 4) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, origin_x, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, origin_x) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, origin_y, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, origin_y) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, perimeter_x, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, perimeter_x) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, perimeter_y, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, perimeter_y) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_annotation, 0, 3, _IS_BOOL, 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) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_annotation, 0, 0, 3) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, x, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, x) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, y, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, y) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, text, IS_STRING, 0) +#else + ZEND_ARG_INFO(0, text) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setTextAntialias, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, antialias, _IS_BOOL, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setTextAntialias, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, antialias, _IS_BOOL, 0) +#else + ZEND_ARG_INFO(0, antialias) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setTextEncoding, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, encoding, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setTextEncoding, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, encoding, IS_STRING, 0) +#else + ZEND_ARG_INFO(0, encoding) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setFont, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, font_name, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setFont, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, font_name, IS_STRING, 0) +#else + ZEND_ARG_INFO(0, font_name) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setFontFamily, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, font_family, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setFontFamily, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, font_family, IS_STRING, 0) +#else + ZEND_ARG_INFO(0, font_family) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setFontSize, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, point_size, IS_DOUBLE, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setFontSize, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, point_size, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, point_size) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setFontStyle, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, style, IS_LONG, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setFontStyle, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, style, IS_LONG, 0) +#else + ZEND_ARG_INFO(0, style) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setFontWeight, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, weight, IS_LONG, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setFontWeight, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, weight, IS_LONG, 0) +#else + ZEND_ARG_INFO(0, weight) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_getFont, 0, 0, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_getFont, 0, 0, 0) +#endif + ZEND_END_ARG_INFO() #define arginfo_class_ImagickDraw_getFontFamily arginfo_class_ImagickDraw_getFont + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_getFontSize, 0, 0, IS_DOUBLE, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_getFontSize, 0, 0, 0) +#endif + ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_getFontStyle, 0, 0, IS_LONG, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_getFontStyle, 0, 0, 0) +#endif + ZEND_END_ARG_INFO() #define arginfo_class_ImagickDraw_getFontWeight arginfo_class_ImagickDraw_getFontStyle #define arginfo_class_ImagickDraw_destroy arginfo_class_ImagickDraw_clear + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_rectangle, 0, 4, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, top_left_x, IS_DOUBLE, 0) - ZEND_ARG_TYPE_INFO(0, top_left_y, IS_DOUBLE, 0) - ZEND_ARG_TYPE_INFO(0, bottom_right_x, IS_DOUBLE, 0) - ZEND_ARG_TYPE_INFO(0, bottom_right_y, IS_DOUBLE, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_rectangle, 0, 0, 4) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, top_left_x, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, top_left_x) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, top_left_y, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, top_left_y) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, bottom_right_x, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, bottom_right_x) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, bottom_right_y, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, bottom_right_y) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_roundRectangle, 0, 6, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, top_left_x, IS_DOUBLE, 0) - ZEND_ARG_TYPE_INFO(0, top_left_y, IS_DOUBLE, 0) - ZEND_ARG_TYPE_INFO(0, bottom_right_x, IS_DOUBLE, 0) - ZEND_ARG_TYPE_INFO(0, bottom_right_y, IS_DOUBLE, 0) - ZEND_ARG_TYPE_INFO(0, rounding_x, IS_DOUBLE, 0) - ZEND_ARG_TYPE_INFO(0, rounding_y, IS_DOUBLE, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_roundRectangle, 0, 0, 6) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, top_left_x, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, top_left_x) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, top_left_y, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, top_left_y) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, bottom_right_x, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, bottom_right_x) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, bottom_right_y, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, bottom_right_y) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, rounding_x, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, rounding_x) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, rounding_y, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, rounding_y) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_ellipse, 0, 6, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, origin_x, IS_DOUBLE, 0) - ZEND_ARG_TYPE_INFO(0, origin_y, IS_DOUBLE, 0) - ZEND_ARG_TYPE_INFO(0, radius_x, IS_DOUBLE, 0) - ZEND_ARG_TYPE_INFO(0, radius_y, IS_DOUBLE, 0) - ZEND_ARG_TYPE_INFO(0, angle_start, IS_DOUBLE, 0) - ZEND_ARG_TYPE_INFO(0, angle_end, IS_DOUBLE, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_ellipse, 0, 0, 6) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, origin_x, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, origin_x) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, origin_y, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, origin_y) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, radius_x, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, radius_x) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, radius_y, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, radius_y) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, angle_start, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, angle_start) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, angle_end, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, angle_end) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_skewX, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, degrees, IS_DOUBLE, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_skewX, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, degrees, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, degrees) +#endif ZEND_END_ARG_INFO() #define arginfo_class_ImagickDraw_skewY arginfo_class_ImagickDraw_skewX + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_translate, 0, 2, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, x, IS_DOUBLE, 0) - ZEND_ARG_TYPE_INFO(0, y, IS_DOUBLE, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_translate, 0, 0, 2) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, x, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, x) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, y, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, y) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_line, 0, 4, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, start_x, IS_DOUBLE, 0) - ZEND_ARG_TYPE_INFO(0, start_y, IS_DOUBLE, 0) - ZEND_ARG_TYPE_INFO(0, end_x, IS_DOUBLE, 0) - ZEND_ARG_TYPE_INFO(0, end_y, IS_DOUBLE, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_line, 0, 0, 4) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, start_x, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, start_x) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, start_y, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, start_y) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, end_x, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, end_x) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, end_y, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, end_y) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_arc, 0, 6, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, start_x, IS_DOUBLE, 0) - ZEND_ARG_TYPE_INFO(0, start_y, IS_DOUBLE, 0) - ZEND_ARG_TYPE_INFO(0, end_x, IS_DOUBLE, 0) - ZEND_ARG_TYPE_INFO(0, end_y, IS_DOUBLE, 0) - ZEND_ARG_TYPE_INFO(0, start_angle, IS_DOUBLE, 0) - ZEND_ARG_TYPE_INFO(0, end_angle, IS_DOUBLE, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_arc, 0, 0, 6) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, start_x, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, start_x) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, start_y, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, start_y) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, end_x, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, end_x) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, end_y, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, end_y) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, start_angle, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, start_angle) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, end_angle, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, end_angle) +#endif ZEND_END_ARG_INFO() #if MagickLibVersion >= 0x700 + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_alpha, 0, 3, _IS_BOOL, 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, IS_LONG, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_alpha, 0, 0, 3) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, x, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, x) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, y, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, y) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, paint, IS_LONG, 0) +#else + ZEND_ARG_INFO(0, paint) +#endif ZEND_END_ARG_INFO() #endif #if !(MagickLibVersion >= 0x700) + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_matte, 0, 3, _IS_BOOL, 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, IS_LONG, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_matte, 0, 0, 3) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, x, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, x) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, y, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, y) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, paint, IS_LONG, 0) +#else + ZEND_ARG_INFO(0, paint) +#endif ZEND_END_ARG_INFO() #endif + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_polygon, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, coordinates, IS_ARRAY, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_polygon, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, coordinates, IS_ARRAY, 0) +#else + ZEND_ARG_INFO(0, coordinates) +#endif ZEND_END_ARG_INFO() #define arginfo_class_ImagickDraw_point arginfo_class_ImagickDraw_translate @@ -203,59 +693,215 @@ ZEND_END_ARG_INFO() #define arginfo_class_ImagickDraw_getFontStretch arginfo_class_ImagickDraw_getFontStyle + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setFontStretch, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, stretch, IS_LONG, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setFontStretch, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, stretch, IS_LONG, 0) +#else + ZEND_ARG_INFO(0, stretch) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setStrokeAntialias, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, enabled, _IS_BOOL, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setStrokeAntialias, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, enabled, _IS_BOOL, 0) +#else + ZEND_ARG_INFO(0, enabled) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setTextAlignment, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, align, IS_LONG, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setTextAlignment, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, align, IS_LONG, 0) +#else + ZEND_ARG_INFO(0, align) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setTextDecoration, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, decoration, IS_LONG, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setTextDecoration, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, decoration, IS_LONG, 0) +#else + ZEND_ARG_INFO(0, decoration) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setTextUnderColor, 0, 1, _IS_BOOL, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setTextUnderColor, 0, 0, 1) +#endif + ZEND_ARG_OBJ_TYPE_MASK(0, under_color, ImagickPixel, MAY_BE_STRING, NULL) ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setViewbox, 0, 4, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, left_x, IS_LONG, 0) - ZEND_ARG_TYPE_INFO(0, top_y, IS_LONG, 0) - ZEND_ARG_TYPE_INFO(0, right_x, IS_LONG, 0) - ZEND_ARG_TYPE_INFO(0, bottom_y, IS_LONG, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setViewbox, 0, 0, 4) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, left_x, IS_LONG, 0) +#else + ZEND_ARG_INFO(0, left_x) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, top_y, IS_LONG, 0) +#else + ZEND_ARG_INFO(0, top_y) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, right_x, IS_LONG, 0) +#else + ZEND_ARG_INFO(0, right_x) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, bottom_y, IS_LONG, 0) +#else + ZEND_ARG_INFO(0, bottom_y) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_ImagickDraw_clone, 0, 0, ImagickDraw, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_clone, 0, 0, 0) +#endif + ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_affine, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, affine, IS_ARRAY, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_affine, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, affine, IS_ARRAY, 0) +#else + ZEND_ARG_INFO(0, affine) +#endif ZEND_END_ARG_INFO() #define arginfo_class_ImagickDraw_bezier arginfo_class_ImagickDraw_polygon + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_composite, 0, 6, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, composite, IS_LONG, 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) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_composite, 0, 0, 6) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, composite, IS_LONG, 0) +#else + ZEND_ARG_INFO(0, composite) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, x, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, x) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, y, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, y) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, width, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, width) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, height, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, height) +#endif ZEND_ARG_OBJ_INFO(0, image, Imagick, 0) ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_color, 0, 3, _IS_BOOL, 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, IS_LONG, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_color, 0, 0, 3) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, x, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, x) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, y, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, y) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, paint, IS_LONG, 0) +#else + ZEND_ARG_INFO(0, paint) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_comment, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, comment, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_comment, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, comment, IS_STRING, 0) +#else + ZEND_ARG_INFO(0, comment) +#endif ZEND_END_ARG_INFO() #define arginfo_class_ImagickDraw_getClipPath arginfo_class_ImagickDraw_getFont @@ -264,7 +910,13 @@ ZEND_END_ARG_INFO() #define arginfo_class_ImagickDraw_getClipUnits arginfo_class_ImagickDraw_getFontStyle + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_ImagickDraw_getFillColor, 0, 0, ImagickPixel, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_getFillColor, 0, 0, 0) +#endif + ZEND_END_ARG_INFO() #define arginfo_class_ImagickDraw_getFillOpacity arginfo_class_ImagickDraw_getFontSize @@ -277,7 +929,13 @@ ZEND_END_ARG_INFO() #define arginfo_class_ImagickDraw_getStrokeColor arginfo_class_ImagickDraw_getFillColor + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_getStrokeDashArray, 0, 0, IS_ARRAY, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_getStrokeDashArray, 0, 0, 0) +#endif + ZEND_END_ARG_INFO() #define arginfo_class_ImagickDraw_getStrokeDashOffset arginfo_class_ImagickDraw_getFontSize @@ -302,22 +960,84 @@ ZEND_END_ARG_INFO() #define arginfo_class_ImagickDraw_pathClose arginfo_class_ImagickDraw_clear + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_pathCurveToAbsolute, 0, 6, _IS_BOOL, 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) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_pathCurveToAbsolute, 0, 0, 6) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, x1, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, x1) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, y1, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, y1) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, x2, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, x2) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, y2, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, y2) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, x, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, x) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, y, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, y) +#endif ZEND_END_ARG_INFO() #define arginfo_class_ImagickDraw_pathCurveToRelative arginfo_class_ImagickDraw_pathCurveToAbsolute + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_pathCurveToQuadraticBezierAbsolute, 0, 4, _IS_BOOL, 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_end, IS_DOUBLE, 0) - ZEND_ARG_TYPE_INFO(0, y, IS_DOUBLE, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_pathCurveToQuadraticBezierAbsolute, 0, 0, 4) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, x1, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, x1) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, y1, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, y1) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, x_end, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, x_end) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, y, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, y) +#endif ZEND_END_ARG_INFO() #define arginfo_class_ImagickDraw_pathCurveToQuadraticBezierRelative arginfo_class_ImagickDraw_pathCurveToQuadraticBezierAbsolute @@ -326,23 +1046,90 @@ ZEND_END_ARG_INFO() #define arginfo_class_ImagickDraw_pathCurveToQuadraticBezierSmoothRelative arginfo_class_ImagickDraw_translate + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_pathCurveToSmoothAbsolute, 0, 4, _IS_BOOL, 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) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_pathCurveToSmoothAbsolute, 0, 0, 4) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, x2, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, x2) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, y2, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, y2) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, x, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, x) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, y, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, y) +#endif ZEND_END_ARG_INFO() #define arginfo_class_ImagickDraw_pathCurveToSmoothRelative arginfo_class_ImagickDraw_pathCurveToSmoothAbsolute + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_pathEllipticArcAbsolute, 0, 7, _IS_BOOL, 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, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, sweep, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, x, IS_DOUBLE, 0) - ZEND_ARG_TYPE_INFO(0, y, IS_DOUBLE, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_pathEllipticArcAbsolute, 0, 0, 7) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, rx, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, rx) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, ry, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, ry) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, x_axis_rotation, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, x_axis_rotation) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, large_arc, _IS_BOOL, 0) +#else + ZEND_ARG_INFO(0, large_arc) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, sweep, _IS_BOOL, 0) +#else + ZEND_ARG_INFO(0, sweep) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, x, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, x) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, y, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, y) +#endif ZEND_END_ARG_INFO() #define arginfo_class_ImagickDraw_pathEllipticArcRelative arginfo_class_ImagickDraw_pathEllipticArcAbsolute @@ -353,14 +1140,36 @@ ZEND_END_ARG_INFO() #define arginfo_class_ImagickDraw_pathLineToRelative arginfo_class_ImagickDraw_translate + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_pathLineToHorizontalAbsolute, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, x, IS_DOUBLE, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_pathLineToHorizontalAbsolute, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, x, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, x) +#endif ZEND_END_ARG_INFO() #define arginfo_class_ImagickDraw_pathLineToHorizontalRelative arginfo_class_ImagickDraw_pathLineToHorizontalAbsolute + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_pathLineToVerticalAbsolute, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, y, IS_DOUBLE, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_pathLineToVerticalAbsolute, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, y, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, y) +#endif ZEND_END_ARG_INFO() #define arginfo_class_ImagickDraw_pathLineToVerticalRelative arginfo_class_ImagickDraw_pathLineToVerticalAbsolute @@ -379,18 +1188,60 @@ ZEND_END_ARG_INFO() #define arginfo_class_ImagickDraw_popPattern arginfo_class_ImagickDraw_clear + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_pushClipPath, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, clip_mask_id, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_pushClipPath, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, clip_mask_id, IS_STRING, 0) +#else + ZEND_ARG_INFO(0, clip_mask_id) +#endif ZEND_END_ARG_INFO() #define arginfo_class_ImagickDraw_pushDefs arginfo_class_ImagickDraw_clear + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_pushPattern, 0, 5, _IS_BOOL, 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) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_pushPattern, 0, 0, 5) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, pattern_id, IS_STRING, 0) +#else + ZEND_ARG_INFO(0, pattern_id) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, x, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, x) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, y, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, y) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, width, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, width) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, height, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, height) +#endif ZEND_END_ARG_INFO() #define arginfo_class_ImagickDraw_render arginfo_class_ImagickDraw_clear @@ -399,119 +1250,347 @@ ZEND_END_ARG_INFO() #define arginfo_class_ImagickDraw_scale arginfo_class_ImagickDraw_translate + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setClipPath, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, clip_mask, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setClipPath, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, clip_mask, IS_STRING, 0) +#else + ZEND_ARG_INFO(0, clip_mask) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setClipRule, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, fillrule, IS_LONG, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setClipRule, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, fillrule, IS_LONG, 0) +#else + ZEND_ARG_INFO(0, fillrule) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setClipUnits, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, pathunits, IS_LONG, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setClipUnits, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, pathunits, IS_LONG, 0) +#else + ZEND_ARG_INFO(0, pathunits) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setFillOpacity, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, opacity, IS_DOUBLE, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setFillOpacity, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, opacity, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, opacity) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setFillPatternUrl, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, fill_url, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setFillPatternUrl, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, fill_url, IS_STRING, 0) +#else + ZEND_ARG_INFO(0, fill_url) +#endif ZEND_END_ARG_INFO() #define arginfo_class_ImagickDraw_setFillRule arginfo_class_ImagickDraw_setClipRule + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setGravity, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, gravity, IS_LONG, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setGravity, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, gravity, IS_LONG, 0) +#else + ZEND_ARG_INFO(0, gravity) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setStrokePatternUrl, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, stroke_url, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setStrokePatternUrl, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, stroke_url, IS_STRING, 0) +#else + ZEND_ARG_INFO(0, stroke_url) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setStrokeDashOffset, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, dash_offset, IS_DOUBLE, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setStrokeDashOffset, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, dash_offset, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, dash_offset) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setStrokeLineCap, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, linecap, IS_LONG, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setStrokeLineCap, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, linecap, IS_LONG, 0) +#else + ZEND_ARG_INFO(0, linecap) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setStrokeLineJoin, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, linejoin, IS_LONG, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setStrokeLineJoin, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, linejoin, IS_LONG, 0) +#else + ZEND_ARG_INFO(0, linejoin) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setStrokeMiterLimit, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, miterlimit, IS_LONG, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setStrokeMiterLimit, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, miterlimit, IS_LONG, 0) +#else + ZEND_ARG_INFO(0, miterlimit) +#endif ZEND_END_ARG_INFO() #define arginfo_class_ImagickDraw_setStrokeOpacity arginfo_class_ImagickDraw_setFillOpacity + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setVectorGraphics, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, xml, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setVectorGraphics, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, xml, IS_STRING, 0) +#else + ZEND_ARG_INFO(0, xml) +#endif ZEND_END_ARG_INFO() #define arginfo_class_ImagickDraw_pop arginfo_class_ImagickDraw_clear #define arginfo_class_ImagickDraw_push arginfo_class_ImagickDraw_clear + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setStrokeDashArray, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, dashes, IS_ARRAY, 1) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setStrokeDashArray, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, dashes, IS_ARRAY, 1) +#else + ZEND_ARG_INFO(0, dashes) +#endif ZEND_END_ARG_INFO() #if MagickLibVersion >= 0x693 + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_getOpacity, 0, 0, IS_DOUBLE, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_getOpacity, 0, 0, 0) +#endif + ZEND_END_ARG_INFO() #endif #if MagickLibVersion >= 0x693 + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setOpacity, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, opacity, IS_DOUBLE, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setOpacity, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, opacity, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, opacity) +#endif ZEND_END_ARG_INFO() #endif #if MagickLibVersion >= 0x675 + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_getFontResolution, 0, 0, IS_ARRAY, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_getFontResolution, 0, 0, 0) +#endif + ZEND_END_ARG_INFO() #endif #if MagickLibVersion >= 0x675 + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setFontResolution, 0, 2, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, x, IS_DOUBLE, 0) - ZEND_ARG_TYPE_INFO(0, y, IS_DOUBLE, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setFontResolution, 0, 0, 2) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, x, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, x) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, y, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, y) +#endif ZEND_END_ARG_INFO() #endif #if MagickLibVersion >= 0x675 + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_ImagickDraw_getBorderColor, 0, 0, ImagickPixel, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_getBorderColor, 0, 0, 0) +#endif + ZEND_END_ARG_INFO() #endif #if MagickLibVersion >= 0x675 + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setBorderColor, 0, 1, _IS_BOOL, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setBorderColor, 0, 0, 1) +#endif + ZEND_ARG_OBJ_TYPE_MASK(0, color, ImagickPixel, MAY_BE_STRING, NULL) ZEND_END_ARG_INFO() #endif #if MagickLibVersion >= 0x693 + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setDensity, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, density, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setDensity, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, density, IS_STRING, 0) +#else + ZEND_ARG_INFO(0, density) +#endif ZEND_END_ARG_INFO() #endif #if MagickLibVersion >= 0x693 + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_getDensity, 0, 0, IS_STRING, 1) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_getDensity, 0, 0, 0) +#endif + ZEND_END_ARG_INFO() #endif #if MagickLibVersion >= 0x692 + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_getTextDirection, 0, 0, IS_LONG, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_getTextDirection, 0, 0, 0) +#endif + ZEND_END_ARG_INFO() #endif #if MagickLibVersion >= 0x692 + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickDraw_setTextDirection, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, direction, IS_LONG, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickDraw_setTextDirection, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, direction, IS_LONG, 0) +#else + ZEND_ARG_INFO(0, direction) +#endif ZEND_END_ARG_INFO() #endif @@ -865,4 +1944,4 @@ static const zend_function_entry class_ImagickDraw_methods[] = { ZEND_ME(ImagickDraw, setTextDirection, arginfo_class_ImagickDraw_setTextDirection, ZEND_ACC_PUBLIC) #endif ZEND_FE_END -}; +}; \ No newline at end of file diff --git a/ImagickKernel_arginfo.h b/ImagickKernel_arginfo.h index f43363e8..67ddbfaa 100644 --- a/ImagickKernel_arginfo.h +++ b/ImagickKernel_arginfo.h @@ -1,41 +1,114 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 5e9422ceb911da581dbea87f9ab973a059883494 */ +* Stub hash: regen with 'sh regen_arginfo.sh' +* file has been fixedup for different versions */ #if defined(IMAGICK_WITH_KERNEL) + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickKernel_addKernel, 0, 1, IS_VOID, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickKernel_addKernel, 0, 0, 1) +#endif + ZEND_ARG_OBJ_INFO(0, kernel, ImagickKernel, 0) ZEND_END_ARG_INFO() #endif #if defined(IMAGICK_WITH_KERNEL) + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickKernel_addUnityKernel, 0, 1, IS_VOID, 0) - ZEND_ARG_TYPE_INFO(0, scale, IS_DOUBLE, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickKernel_addUnityKernel, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, scale, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, scale) +#endif ZEND_END_ARG_INFO() #endif #if defined(IMAGICK_WITH_KERNEL) + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_ImagickKernel_fromBuiltin, 0, 2, ImagickKernel, 0) - ZEND_ARG_TYPE_INFO(0, kernel, IS_LONG, 0) - ZEND_ARG_TYPE_INFO(0, shape, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickKernel_fromBuiltin, 0, 0, 2) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, kernel, IS_LONG, 0) +#else + ZEND_ARG_INFO(0, kernel) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, shape, IS_STRING, 0) +#else + ZEND_ARG_INFO(0, shape) +#endif ZEND_END_ARG_INFO() #endif #if defined(IMAGICK_WITH_KERNEL) + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_ImagickKernel_fromMatrix, 0, 2, ImagickKernel, 0) - ZEND_ARG_TYPE_INFO(0, matrix, IS_ARRAY, 0) - ZEND_ARG_TYPE_INFO(0, origin, IS_ARRAY, 1) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickKernel_fromMatrix, 0, 0, 2) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, matrix, IS_ARRAY, 0) +#else + ZEND_ARG_INFO(0, matrix) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, origin, IS_ARRAY, 1) +#else + ZEND_ARG_INFO(0, origin) +#endif ZEND_END_ARG_INFO() #endif #if defined(IMAGICK_WITH_KERNEL) + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickKernel_getMatrix, 0, 0, IS_ARRAY, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickKernel_getMatrix, 0, 0, 0) +#endif + ZEND_END_ARG_INFO() #endif #if defined(IMAGICK_WITH_KERNEL) + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickKernel_scale, 0, 1, IS_VOID, 0) - ZEND_ARG_TYPE_INFO(0, scale, IS_DOUBLE, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, normalize_kernel, IS_LONG, 1, "null") +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickKernel_scale, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, scale, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, scale) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, normalize_kernel, IS_LONG, 1, "null") +#else + ZEND_ARG_INFO(0, normalize_kernel) +#endif + ZEND_END_ARG_INFO() #endif @@ -78,4 +151,4 @@ static const zend_function_entry class_ImagickKernel_methods[] = { ZEND_ME(ImagickKernel, separate, arginfo_class_ImagickKernel_separate, ZEND_ACC_PUBLIC) ZEND_FE_END }; -#endif +#endif \ No newline at end of file diff --git a/ImagickPixel_arginfo.h b/ImagickPixel_arginfo.h index 004c944e..951841af 100644 --- a/ImagickPixel_arginfo.h +++ b/ImagickPixel_arginfo.h @@ -1,82 +1,295 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: ae453335ccec9914ae0aa6ae920a62a6bd78f972 */ +* Stub hash: regen with 'sh regen_arginfo.sh' +* file has been fixedup for different versions */ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickPixel___construct, 0, 0, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, color, IS_STRING, 1, "null") + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, color, IS_STRING, 1, "null") +#else + ZEND_ARG_INFO(0, color) +#endif + ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickPixel_clear, 0, 0, _IS_BOOL, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickPixel_clear, 0, 0, 0) +#endif + ZEND_END_ARG_INFO() #define arginfo_class_ImagickPixel_destroy arginfo_class_ImagickPixel_clear + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickPixel_getColor, 0, 0, IS_ARRAY, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, normalized, IS_LONG, 0, "0") +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickPixel_getColor, 0, 0, 0) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, normalized, IS_LONG, 0, "0") +#else + ZEND_ARG_INFO(0, normalized) +#endif + ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickPixel_getColorAsString, 0, 0, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickPixel_getColorAsString, 0, 0, 0) +#endif + ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickPixel_getColorCount, 0, 0, IS_LONG, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickPixel_getColorCount, 0, 0, 0) +#endif + ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickPixel_getColorQuantum, 0, 0, IS_ARRAY, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickPixel_getColorQuantum, 0, 0, 0) +#endif + ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickPixel_getColorValue, 0, 1, IS_DOUBLE, 0) - ZEND_ARG_TYPE_INFO(0, color, IS_LONG, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickPixel_getColorValue, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, color, IS_LONG, 0) +#else + ZEND_ARG_INFO(0, color) +#endif ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_ImagickPixel_getColorValueQuantum, 0, 1, IMAGICK_QUANTUM_TYPE, 0) - ZEND_ARG_TYPE_INFO(0, color, IS_LONG, 0) + +#if MAGICKCORE_HDRI_ENABLE + +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickPixel_getColorValueQuantum, 0, 1, IS_DOUBLE, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickPixel_getColorValueQuantum, 0, 0, 1) +#endif + +#else + +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickPixel_getColorValueQuantum, 0, 1, IS_LONG, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickPixel_getColorValueQuantum, 0, 0, 1) +#endif + +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, color, IS_LONG, 0) +#else + ZEND_ARG_INFO(0, color) +#endif ZEND_END_ARG_INFO() #define arginfo_class_ImagickPixel_getHSL arginfo_class_ImagickPixel_getColorQuantum #define arginfo_class_ImagickPixel_getIndex arginfo_class_ImagickPixel_getColorCount + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickPixel_isPixelSimilar, 0, 2, _IS_BOOL, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickPixel_isPixelSimilar, 0, 0, 2) +#endif + ZEND_ARG_OBJ_TYPE_MASK(0, color, ImagickPixel, MAY_BE_STRING, NULL) - ZEND_ARG_TYPE_INFO(0, fuzz, IS_DOUBLE, 0) + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, fuzz, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, fuzz) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickPixel_isPixelSimilarQuantum, 0, 2, _IS_BOOL, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickPixel_isPixelSimilarQuantum, 0, 0, 2) +#endif + ZEND_ARG_OBJ_TYPE_MASK(0, color, ImagickPixel, MAY_BE_STRING, NULL) - ZEND_ARG_TYPE_INFO(0, fuzz_quantum_range_scaled_by_square_root_of_three, IS_DOUBLE, 0) + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, fuzz_quantum_range_scaled_by_square_root_of_three, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, fuzz_quantum_range_scaled_by_square_root_of_three) +#endif ZEND_END_ARG_INFO() #define arginfo_class_ImagickPixel_isSimilar arginfo_class_ImagickPixel_isPixelSimilarQuantum + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickPixel_setColor, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, color, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickPixel_setColor, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, color, IS_STRING, 0) +#else + ZEND_ARG_INFO(0, color) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickPixel_setColorCount, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, color_count, IS_LONG, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickPixel_setColorCount, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, color_count, IS_LONG, 0) +#else + ZEND_ARG_INFO(0, color_count) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickPixel_setColorValue, 0, 2, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, color, IS_LONG, 0) - ZEND_ARG_TYPE_INFO(0, value, IS_DOUBLE, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickPixel_setColorValue, 0, 0, 2) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, color, IS_LONG, 0) +#else + ZEND_ARG_INFO(0, color) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, value, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, value) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickPixel_setColorValueQuantum, 0, 2, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, color, IS_LONG, 0) - ZEND_ARG_OBJ_INFO(0, value, IMAGICK_QUANTUM_TYPE, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickPixel_setColorValueQuantum, 0, 0, 2) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, color, IS_LONG, 0) +#else + ZEND_ARG_INFO(0, color) +#endif + +#if MAGICKCORE_HDRI_ENABLE + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, value, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, value) +#endif +#else + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, value, IS_LONG, 0) +#else + ZEND_ARG_INFO(0, value) +#endif +#endif + ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickPixel_setHSL, 0, 3, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, hue, IS_DOUBLE, 0) - ZEND_ARG_TYPE_INFO(0, saturation, IS_DOUBLE, 0) - ZEND_ARG_TYPE_INFO(0, luminosity, IS_DOUBLE, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickPixel_setHSL, 0, 0, 3) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, hue, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, hue) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, saturation, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, saturation) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, luminosity, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, luminosity) +#endif ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickPixel_setIndex, 0, 1, _IS_BOOL, 0) - ZEND_ARG_OBJ_INFO(0, index, IMAGICK_QUANTUM_TYPE, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickPixel_setIndex, 0, 0, 1) +#endif + + +#if MAGICKCORE_HDRI_ENABLE + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, index, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, index) +#endif +#else + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0) +#else + ZEND_ARG_INFO(0, index) +#endif +#endif + ZEND_END_ARG_INFO() #if MagickLibVersion >= 0x693 + +#if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ImagickPixel_setColorFromPixel, 0, 1, _IS_BOOL, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ImagickPixel_setColorFromPixel, 0, 0, 1) +#endif + ZEND_ARG_OBJ_INFO(0, pixel, ImagickPixel, 0) ZEND_END_ARG_INFO() #endif @@ -130,4 +343,4 @@ static const zend_function_entry class_ImagickPixel_methods[] = { ZEND_ME(ImagickPixel, setColorFromPixel, arginfo_class_ImagickPixel_setColorFromPixel, ZEND_ACC_PUBLIC) #endif ZEND_FE_END -}; +}; \ No newline at end of file diff --git a/Imagick_arginfo.h b/Imagick_arginfo.h index 13d1aba4..96e96043 100644 --- a/Imagick_arginfo.h +++ b/Imagick_arginfo.h @@ -2,18 +2,15 @@ * Stub hash: regen with 'sh regen_arginfo.sh' * file has been fixedup for different versions */ -#if MagickLibVersion > 0x628 #if PHP_VERSION_ID >= 80000 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_optimizeImageLayers, 0, 0, _IS_BOOL, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Imagick_optimizeImageLayers, 0, 0, Imagick, 0) #else ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_optimizeImageLayers, 0, 0, 0) #endif ZEND_END_ARG_INFO() -#endif -#if MagickLibVersion > 0x628 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Imagick_compareImageLayers, 0, 1, Imagick, 0) @@ -28,9 +25,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_compareImageLayers, 0, 0, 1) ZEND_ARG_INFO(0, metric) #endif ZEND_END_ARG_INFO() -#endif -#if MagickLibVersion > 0x628 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_pingImageBlob, 0, 1, _IS_BOOL, 0) @@ -45,9 +40,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_pingImageBlob, 0, 0, 1) ZEND_ARG_INFO(0, image) #endif ZEND_END_ARG_INFO() -#endif -#if MagickLibVersion > 0x628 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_pingImageFile, 0, 1, _IS_BOOL, 0) @@ -69,17 +62,18 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_pingImageFile, 0, 0, 1) #endif ZEND_END_ARG_INFO() -#endif -#if MagickLibVersion > 0x628 -#define arginfo_class_Imagick_transposeImage arginfo_class_Imagick_optimizeImageLayers -#endif -#if MagickLibVersion > 0x628 -#define arginfo_class_Imagick_transverseImage arginfo_class_Imagick_optimizeImageLayers +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_transposeImage, 0, 0, _IS_BOOL, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_transposeImage, 0, 0, 0) #endif -#if MagickLibVersion > 0x628 +ZEND_END_ARG_INFO() + +#define arginfo_class_Imagick_transverseImage arginfo_class_Imagick_transposeImage + #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_trimImage, 0, 1, _IS_BOOL, 0) @@ -94,9 +88,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_trimImage, 0, 0, 1) ZEND_ARG_INFO(0, fuzz) #endif ZEND_END_ARG_INFO() -#endif -#if MagickLibVersion > 0x628 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_waveImage, 0, 2, _IS_BOOL, 0) @@ -117,9 +109,8 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_waveImage, 0, 0, 2) ZEND_ARG_INFO(0, length) #endif ZEND_END_ARG_INFO() -#endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x700 +#if MagickLibVersion >= 0x700 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_waveImageWithMethod, 0, 3, _IS_BOOL, 0) @@ -148,7 +139,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_waveImageWithMethod, 0, 0, 3) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_vignetteImage, 0, 4, _IS_BOOL, 0) @@ -181,13 +171,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_vignetteImage, 0, 0, 4) ZEND_ARG_INFO(0, y) #endif ZEND_END_ARG_INFO() -#endif -#if MagickLibVersion > 0x628 -#define arginfo_class_Imagick_uniqueImageColors arginfo_class_Imagick_optimizeImageLayers -#endif +#define arginfo_class_Imagick_uniqueImageColors arginfo_class_Imagick_transposeImage -#if MagickLibVersion > 0x628 && !defined(MAGICKCORE_EXCLUDE_DEPRECATED) && MagickLibVersion < 0x700 +#if !defined(MAGICKCORE_EXCLUDE_DEPRECATED) && MagickLibVersion < 0x700 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_getImageMatte, 0, 0, _IS_BOOL, 0) @@ -198,7 +185,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_getImageMatte, 0, 0, 0) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_setImageMatte, 0, 1, _IS_BOOL, 0) @@ -213,9 +199,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setImageMatte, 0, 0, 1) ZEND_ARG_INFO(0, matte) #endif ZEND_END_ARG_INFO() -#endif -#if MagickLibVersion > 0x628 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_adaptiveResizeImage, 0, 2, _IS_BOOL, 0) @@ -250,9 +234,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_adaptiveResizeImage, 0, 0, 2) #endif ZEND_END_ARG_INFO() -#endif -#if MagickLibVersion > 0x628 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_sketchImage, 0, 3, _IS_BOOL, 0) @@ -279,9 +261,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_sketchImage, 0, 0, 3) ZEND_ARG_INFO(0, angle) #endif ZEND_END_ARG_INFO() -#endif -#if MagickLibVersion > 0x628 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_shadeImage, 0, 3, _IS_BOOL, 0) @@ -308,9 +288,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_shadeImage, 0, 0, 3) ZEND_ARG_INFO(0, elevation) #endif ZEND_END_ARG_INFO() -#endif -#if MagickLibVersion > 0x628 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_getSizeOffset, 0, 0, IS_LONG, 0) @@ -319,9 +297,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_getSizeOffset, 0, 0, 0) #endif ZEND_END_ARG_INFO() -#endif -#if MagickLibVersion > 0x628 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_setSizeOffset, 0, 3, _IS_BOOL, 0) @@ -348,9 +324,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setSizeOffset, 0, 0, 3) ZEND_ARG_INFO(0, offset) #endif ZEND_END_ARG_INFO() -#endif -#if MagickLibVersion > 0x628 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_adaptiveBlurImage, 0, 2, _IS_BOOL, 0) @@ -372,9 +346,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_adaptiveBlurImage, 0, 0, 2) #endif ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, channel, IS_LONG, 0, "Imagick::CHANNEL_DEFAULT") ZEND_END_ARG_INFO() -#endif -#if MagickLibVersion > 0x628 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_contrastStretchImage, 0, 2, _IS_BOOL, 0) @@ -396,13 +368,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_contrastStretchImage, 0, 0, 2) #endif ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, channel, IS_LONG, 0, "Imagick::CHANNEL_DEFAULT") ZEND_END_ARG_INFO() -#endif -#if MagickLibVersion > 0x628 #define arginfo_class_Imagick_adaptiveSharpenImage arginfo_class_Imagick_adaptiveBlurImage -#endif -#if MagickLibVersion > 0x628 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_randomThresholdImage, 0, 2, _IS_BOOL, 0) @@ -424,9 +392,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_randomThresholdImage, 0, 0, 2) #endif ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, channel, IS_LONG, 0, "Imagick::CHANNEL_DEFAULT") ZEND_END_ARG_INFO() -#endif -#if MagickLibVersion > 0x628 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_roundCornersImage, 0, 2, _IS_BOOL, 0) @@ -462,13 +428,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_roundCornersImage, 0, 0, 2) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, size_correction, IS_DOUBLE, 0, "-6") ZEND_END_ARG_INFO() -#endif -#if MagickLibVersion > 0x628 #define arginfo_class_Imagick_roundCorners arginfo_class_Imagick_roundCornersImage -#endif -#if MagickLibVersion > 0x628 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_setIteratorIndex, 0, 1, _IS_BOOL, 0) @@ -483,13 +445,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setIteratorIndex, 0, 0, 1) ZEND_ARG_INFO(0, index) #endif ZEND_END_ARG_INFO() -#endif -#if MagickLibVersion > 0x628 #define arginfo_class_Imagick_getIteratorIndex arginfo_class_Imagick_getSizeOffset -#endif -#if MagickLibVersion > 0x628 && MagickLibVersion < 0x700 +#if MagickLibVersion < 0x700 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Imagick_transformImage, 0, 2, Imagick, 0) @@ -529,7 +488,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setImageOpacity, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x630 && MagickLibVersion >= 0x700 +#if MagickLibVersion >= 0x700 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_setImageAlpha, 0, 1, _IS_BOOL, 0) @@ -546,7 +505,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setImageAlpha, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x630 && MagickLibVersion < 0x700 +#if MagickLibVersion < 0x700 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_orderedPosterizeImage, 0, 1, _IS_BOOL, 0) @@ -594,7 +553,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_polaroidWithTextAndMethod, 0, 0, 4) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x631 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_polaroidImage, 0, 2, _IS_BOOL, 0) @@ -610,9 +568,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_polaroidImage, 0, 0, 2) ZEND_ARG_INFO(0, angle) #endif ZEND_END_ARG_INFO() -#endif -#if MagickLibVersion > 0x631 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_getImageProperty, 0, 1, IS_STRING, 0) @@ -627,9 +583,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_getImageProperty, 0, 0, 1) ZEND_ARG_INFO(0, name) #endif ZEND_END_ARG_INFO() -#endif -#if MagickLibVersion > 0x631 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_setImageProperty, 0, 2, _IS_BOOL, 0) @@ -650,9 +604,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setImageProperty, 0, 0, 2) ZEND_ARG_INFO(0, value) #endif ZEND_END_ARG_INFO() -#endif -#if MagickLibVersion > 0x631 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_deleteImageProperty, 0, 1, _IS_BOOL, 0) @@ -667,9 +619,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_deleteImageProperty, 0, 0, 1) ZEND_ARG_INFO(0, name) #endif ZEND_END_ARG_INFO() -#endif -#if MagickLibVersion > 0x631 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_identifyFormat, 0, 1, IS_STRING, 0) @@ -684,9 +634,8 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_identifyFormat, 0, 0, 1) ZEND_ARG_INFO(0, format) #endif ZEND_END_ARG_INFO() -#endif -#if MagickLibVersion > 0x631 && IM_HAVE_IMAGICK_SETIMAGEINTERPOLATEMETHOD +#if IM_HAVE_IMAGICK_SETIMAGEINTERPOLATEMETHOD #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_setImageInterpolateMethod, 0, 1, _IS_BOOL, 0) @@ -703,18 +652,8 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setImageInterpolateMethod, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x631 - -#if PHP_VERSION_ID >= 80000 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_getImageInterpolateMethod, 0, 0, IS_LONG, 0) -#else -ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_getImageInterpolateMethod, 0, 0, 0) -#endif - -ZEND_END_ARG_INFO() -#endif +#define arginfo_class_Imagick_getImageInterpolateMethod arginfo_class_Imagick_getSizeOffset -#if MagickLibVersion > 0x631 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_linearStretchImage, 0, 2, _IS_BOOL, 0) @@ -735,13 +674,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_linearStretchImage, 0, 0, 2) ZEND_ARG_INFO(0, white_point) #endif ZEND_END_ARG_INFO() -#endif -#if MagickLibVersion > 0x631 -#define arginfo_class_Imagick_getImageLength arginfo_class_Imagick_getImageInterpolateMethod -#endif +#define arginfo_class_Imagick_getImageLength arginfo_class_Imagick_getSizeOffset -#if MagickLibVersion > 0x631 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_extentImage, 0, 4, _IS_BOOL, 0) @@ -774,7 +709,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_extentImage, 0, 0, 4) ZEND_ARG_INFO(0, y) #endif ZEND_END_ARG_INFO() -#endif #if MagickLibVersion > 0x633 @@ -836,7 +770,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_paintFloodfillImage, 0, 0, 5) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x635 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_clutImage, 0, 1, _IS_BOOL, 0) @@ -847,9 +780,25 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_clutImage, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, lookup_table, Imagick, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, channel, IS_LONG, 0, "Imagick::CHANNEL_DEFAULT") ZEND_END_ARG_INFO() + +#if MagickLibVersion >= 0x700 + +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_clutImageWithInterpolate, 0, 2, _IS_BOOL, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_clutImageWithInterpolate, 0, 0, 2) +#endif + + ZEND_ARG_OBJ_INFO(0, lookup_table, Imagick, 0) + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, pixel_interpolate_method, IS_LONG, 0) +#else + ZEND_ARG_INFO(0, pixel_interpolate_method) +#endif +ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x635 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_getImageProperties, 0, 0, IS_ARRAY, 0) @@ -866,13 +815,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_getImageProperties, 0, 0, 0) #endif ZEND_END_ARG_INFO() -#endif -#if MagickLibVersion > 0x635 #define arginfo_class_Imagick_getImageProfiles arginfo_class_Imagick_getImageProperties -#endif -#if MagickLibVersion > 0x635 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_distortImage, 0, 3, _IS_BOOL, 0) @@ -899,9 +844,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_distortImage, 0, 0, 3) ZEND_ARG_INFO(0, bestfit) #endif ZEND_END_ARG_INFO() -#endif -#if MagickLibVersion > 0x635 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_writeImageFile, 0, 1, _IS_BOOL, 0) @@ -923,13 +866,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_writeImageFile, 0, 0, 1) #endif ZEND_END_ARG_INFO() -#endif -#if MagickLibVersion > 0x635 #define arginfo_class_Imagick_writeImagesFile arginfo_class_Imagick_writeImageFile -#endif -#if MagickLibVersion > 0x635 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_resetImagePage, 0, 1, _IS_BOOL, 0) @@ -944,9 +883,8 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_resetImagePage, 0, 0, 1) ZEND_ARG_INFO(0, page) #endif ZEND_END_ARG_INFO() -#endif -#if MagickLibVersion > 0x635 && MagickLibVersion < 0x700 +#if MagickLibVersion < 0x700 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_setImageClipMask, 0, 1, _IS_BOOL, 0) @@ -958,7 +896,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setImageClipMask, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x635 && MagickLibVersion < 0x700 +#if MagickLibVersion < 0x700 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Imagick_getImageClipMask, 0, 0, Imagick, 0) @@ -969,7 +907,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_getImageClipMask, 0, 0, 0) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x635 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_animateImages, 0, 1, _IS_BOOL, 0) @@ -984,9 +921,8 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_animateImages, 0, 0, 1) ZEND_ARG_INFO(0, x_server) #endif ZEND_END_ARG_INFO() -#endif -#if MagickLibVersion > 0x635 && !defined(MAGICKCORE_EXCLUDE_DEPRECATED) && MagickLibVersion < 0x700 +#if !defined(MAGICKCORE_EXCLUDE_DEPRECATED) && MagickLibVersion < 0x700 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_recolorImage, 0, 1, _IS_BOOL, 0) @@ -1937,40 +1873,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setImageFormat, 0, 0, 1) #endif ZEND_END_ARG_INFO() - -#if PHP_VERSION_ID >= 80000 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_scaleImage, 0, 2, _IS_BOOL, 0) -#else -ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_scaleImage, 0, 0, 2) -#endif - - -#if PHP_VERSION_ID >= 80000 - ZEND_ARG_TYPE_INFO(0, columns, IS_LONG, 0) -#else - ZEND_ARG_INFO(0, columns) -#endif - -#if PHP_VERSION_ID >= 80000 - ZEND_ARG_TYPE_INFO(0, rows, IS_LONG, 0) -#else - ZEND_ARG_INFO(0, rows) -#endif - -#if PHP_VERSION_ID >= 80000 - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, bestfit, _IS_BOOL, 0, "false") -#else - ZEND_ARG_INFO(0, bestfit) -#endif - - -#if PHP_VERSION_ID >= 80000 - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, legacy, _IS_BOOL, 0, "false") -#else - ZEND_ARG_INFO(0, legacy) -#endif - -ZEND_END_ARG_INFO() +#define arginfo_class_Imagick_scaleImage arginfo_class_Imagick_adaptiveResizeImage #if PHP_VERSION_ID >= 80000 @@ -2009,27 +1912,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_writeImages, 0, 0, 2) #endif ZEND_END_ARG_INFO() - -#if PHP_VERSION_ID >= 80000 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_blurImage, 0, 2, _IS_BOOL, 0) -#else -ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_blurImage, 0, 0, 2) -#endif - - -#if PHP_VERSION_ID >= 80000 - ZEND_ARG_TYPE_INFO(0, radius, IS_DOUBLE, 0) -#else - ZEND_ARG_INFO(0, radius) -#endif - -#if PHP_VERSION_ID >= 80000 - ZEND_ARG_TYPE_INFO(0, sigma, IS_DOUBLE, 0) -#else - ZEND_ARG_INFO(0, sigma) -#endif - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, channel, IS_LONG, 0, "Imagick::CHANNEL_DEFAULT") -ZEND_END_ARG_INFO() +#define arginfo_class_Imagick_blurImage arginfo_class_Imagick_adaptiveBlurImage #if PHP_VERSION_ID >= 80000 @@ -2109,44 +1992,23 @@ ZEND_END_ARG_INFO() #define arginfo_class_Imagick_getImageMimeType arginfo_class_Imagick___toString +#define arginfo_class_Imagick_removeImage arginfo_class_Imagick_transposeImage -#if PHP_VERSION_ID >= 80000 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_removeImage, 0, 0, _IS_BOOL, 0) -#else -ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_removeImage, 0, 0, 0) -#endif - -ZEND_END_ARG_INFO() - -#define arginfo_class_Imagick_destroy arginfo_class_Imagick_removeImage - -#define arginfo_class_Imagick_clear arginfo_class_Imagick_removeImage - - -#if PHP_VERSION_ID >= 80000 -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Imagick_clone, 0, 0, Imagick, 0) -#else -ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_clone, 0, 0, 0) -#endif - -ZEND_END_ARG_INFO() +#define arginfo_class_Imagick_destroy arginfo_class_Imagick_transposeImage +#define arginfo_class_Imagick_clear arginfo_class_Imagick_transposeImage -#if PHP_VERSION_ID >= 80000 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_getImageSize, 0, 0, IS_LONG, 0) -#else -ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_getImageSize, 0, 0, 0) -#endif +#define arginfo_class_Imagick_clone arginfo_class_Imagick_optimizeImageLayers -ZEND_END_ARG_INFO() +#define arginfo_class_Imagick_getImageSize arginfo_class_Imagick_getSizeOffset #define arginfo_class_Imagick_getImageBlob arginfo_class_Imagick___toString #define arginfo_class_Imagick_getImagesBlob arginfo_class_Imagick___toString -#define arginfo_class_Imagick_setFirstIterator arginfo_class_Imagick_removeImage +#define arginfo_class_Imagick_setFirstIterator arginfo_class_Imagick_transposeImage -#define arginfo_class_Imagick_setLastIterator arginfo_class_Imagick_removeImage +#define arginfo_class_Imagick_setLastIterator arginfo_class_Imagick_transposeImage #if PHP_VERSION_ID >= 80000 @@ -2157,30 +2019,17 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_resetIterator, 0, 0, 0) ZEND_END_ARG_INFO() -#define arginfo_class_Imagick_previousImage arginfo_class_Imagick_removeImage - -#define arginfo_class_Imagick_nextImage arginfo_class_Imagick_removeImage +#define arginfo_class_Imagick_previousImage arginfo_class_Imagick_transposeImage -#define arginfo_class_Imagick_hasPreviousImage arginfo_class_Imagick_removeImage +#define arginfo_class_Imagick_nextImage arginfo_class_Imagick_transposeImage -#define arginfo_class_Imagick_hasNextImage arginfo_class_Imagick_removeImage +#define arginfo_class_Imagick_hasPreviousImage arginfo_class_Imagick_transposeImage +#define arginfo_class_Imagick_hasNextImage arginfo_class_Imagick_transposeImage -#if PHP_VERSION_ID >= 80000 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_setImageIndex, 0, 1, _IS_BOOL, 0) -#else -ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setImageIndex, 0, 0, 1) -#endif - - -#if PHP_VERSION_ID >= 80000 - ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0) -#else - ZEND_ARG_INFO(0, index) -#endif -ZEND_END_ARG_INFO() +#define arginfo_class_Imagick_setImageIndex arginfo_class_Imagick_setIteratorIndex -#define arginfo_class_Imagick_getImageIndex arginfo_class_Imagick_getImageSize +#define arginfo_class_Imagick_getImageIndex arginfo_class_Imagick_getSizeOffset #if PHP_VERSION_ID >= 80000 @@ -2197,38 +2046,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_commentImage, 0, 0, 1) #endif ZEND_END_ARG_INFO() - -#if PHP_VERSION_ID >= 80000 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_cropImage, 0, 4, _IS_BOOL, 0) -#else -ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_cropImage, 0, 0, 4) -#endif - - -#if PHP_VERSION_ID >= 80000 - ZEND_ARG_TYPE_INFO(0, width, IS_LONG, 0) -#else - ZEND_ARG_INFO(0, width) -#endif - -#if PHP_VERSION_ID >= 80000 - ZEND_ARG_TYPE_INFO(0, height, IS_LONG, 0) -#else - ZEND_ARG_INFO(0, height) -#endif - -#if PHP_VERSION_ID >= 80000 - ZEND_ARG_TYPE_INFO(0, x, IS_LONG, 0) -#else - ZEND_ARG_INFO(0, x) -#endif - -#if PHP_VERSION_ID >= 80000 - ZEND_ARG_TYPE_INFO(0, y, IS_LONG, 0) -#else - ZEND_ARG_INFO(0, y) -#endif -ZEND_END_ARG_INFO() +#define arginfo_class_Imagick_cropImage arginfo_class_Imagick_extentImage #if PHP_VERSION_ID >= 80000 @@ -2279,7 +2097,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setImageCompressionQuality, 0, 0, 1 #endif ZEND_END_ARG_INFO() -#define arginfo_class_Imagick_getImageCompressionQuality arginfo_class_Imagick_getImageSize +#define arginfo_class_Imagick_getImageCompressionQuality arginfo_class_Imagick_getSizeOffset #if PHP_VERSION_ID >= 80000 @@ -2296,7 +2114,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setImageCompression, 0, 0, 1) #endif ZEND_END_ARG_INFO() -#define arginfo_class_Imagick_getImageCompression arginfo_class_Imagick_getImageSize +#define arginfo_class_Imagick_getImageCompression arginfo_class_Imagick_getSizeOffset #if PHP_VERSION_ID >= 80000 @@ -2388,7 +2206,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_modulateImage, 0, 0, 3) #endif ZEND_END_ARG_INFO() -#define arginfo_class_Imagick_getImageColors arginfo_class_Imagick_getImageSize +#define arginfo_class_Imagick_getImageColors arginfo_class_Imagick_getSizeOffset #if PHP_VERSION_ID >= 80000 @@ -2980,7 +2798,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setImageMatteColor, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#define arginfo_class_Imagick_setImagePage arginfo_class_Imagick_cropImage +#define arginfo_class_Imagick_setImagePage arginfo_class_Imagick_extentImage #define arginfo_class_Imagick_setImageProgressMonitor arginfo_class_Imagick_readImage @@ -3082,7 +2900,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setImageUnits, 0, 0, 1) #endif ZEND_END_ARG_INFO() -#define arginfo_class_Imagick_sharpenImage arginfo_class_Imagick_blurImage +#define arginfo_class_Imagick_sharpenImage arginfo_class_Imagick_adaptiveBlurImage #define arginfo_class_Imagick_shaveImage arginfo_class_Imagick_sampleImage @@ -3108,31 +2926,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_shearImage, 0, 0, 3) #endif ZEND_END_ARG_INFO() -#define arginfo_class_Imagick_spliceImage arginfo_class_Imagick_cropImage +#define arginfo_class_Imagick_spliceImage arginfo_class_Imagick_extentImage #define arginfo_class_Imagick_pingImage arginfo_class_Imagick_readImage - -#if PHP_VERSION_ID >= 80000 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_readImageFile, 0, 1, _IS_BOOL, 0) -#else -ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_readImageFile, 0, 0, 1) -#endif - - -#if PHP_VERSION_ID >= 80000 - ZEND_ARG_TYPE_INFO(0, filehandle, IS_MIXED, 0) -#else - ZEND_ARG_INFO(0, filehandle) -#endif - -#if PHP_VERSION_ID >= 80000 - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, filename, IS_STRING, 1, "null") -#else - ZEND_ARG_INFO(0, filename) -#endif - -ZEND_END_ARG_INFO() +#define arginfo_class_Imagick_readImageFile arginfo_class_Imagick_pingImageFile #if PHP_VERSION_ID >= 80000 @@ -3214,7 +3012,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_swirlImageWithMethod, 0, 0, 2) ZEND_END_ARG_INFO() #endif -#define arginfo_class_Imagick_stripImage arginfo_class_Imagick_removeImage +#define arginfo_class_Imagick_stripImage arginfo_class_Imagick_transposeImage #if PHP_VERSION_ID >= 80000 @@ -3361,7 +3159,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_morphImages, 0, 0, 1) #endif ZEND_END_ARG_INFO() -#define arginfo_class_Imagick_minifyImage arginfo_class_Imagick_removeImage +#define arginfo_class_Imagick_minifyImage arginfo_class_Imagick_transposeImage #if PHP_VERSION_ID >= 80000 @@ -3373,7 +3171,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_affineTransformImage, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, settings, ImagickDraw, 0) ZEND_END_ARG_INFO() -#define arginfo_class_Imagick_averageImages arginfo_class_Imagick_clone +#define arginfo_class_Imagick_averageImages arginfo_class_Imagick_optimizeImageLayers #if PHP_VERSION_ID >= 80000 @@ -3467,9 +3265,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_calculateCrop, 0, 0, 4) ZEND_END_ARG_INFO() -#define arginfo_class_Imagick_chopImage arginfo_class_Imagick_cropImage +#define arginfo_class_Imagick_chopImage arginfo_class_Imagick_extentImage -#define arginfo_class_Imagick_clipImage arginfo_class_Imagick_removeImage +#define arginfo_class_Imagick_clipImage arginfo_class_Imagick_transposeImage #if PHP_VERSION_ID >= 80000 @@ -3513,7 +3311,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_clipImagePath, 0, 0, 2) #endif ZEND_END_ARG_INFO() -#define arginfo_class_Imagick_coalesceImages arginfo_class_Imagick_clone +#define arginfo_class_Imagick_coalesceImages arginfo_class_Imagick_optimizeImageLayers #if !defined(MAGICKCORE_EXCLUDE_DEPRECATED) && MagickLibVersion < 0x700 @@ -3663,17 +3461,17 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_cycleColormapImage, 0, 0, 1) #endif ZEND_END_ARG_INFO() -#define arginfo_class_Imagick_deconstructImages arginfo_class_Imagick_clone +#define arginfo_class_Imagick_deconstructImages arginfo_class_Imagick_optimizeImageLayers -#define arginfo_class_Imagick_despeckleImage arginfo_class_Imagick_removeImage +#define arginfo_class_Imagick_despeckleImage arginfo_class_Imagick_transposeImage #define arginfo_class_Imagick_edgeImage arginfo_class_Imagick_oilPaintImage #define arginfo_class_Imagick_embossImage arginfo_class_Imagick_charcoalImage -#define arginfo_class_Imagick_enhanceImage arginfo_class_Imagick_removeImage +#define arginfo_class_Imagick_enhanceImage arginfo_class_Imagick_transposeImage -#define arginfo_class_Imagick_equalizeImage arginfo_class_Imagick_removeImage +#define arginfo_class_Imagick_equalizeImage arginfo_class_Imagick_transposeImage #if PHP_VERSION_ID >= 80000 @@ -3714,11 +3512,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_evaluateImages, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#define arginfo_class_Imagick_flattenImages arginfo_class_Imagick_clone +#define arginfo_class_Imagick_flattenImages arginfo_class_Imagick_optimizeImageLayers -#define arginfo_class_Imagick_flipImage arginfo_class_Imagick_removeImage +#define arginfo_class_Imagick_flipImage arginfo_class_Imagick_transposeImage -#define arginfo_class_Imagick_flopImage arginfo_class_Imagick_removeImage +#define arginfo_class_Imagick_flopImage arginfo_class_Imagick_transposeImage #if MagickLibVersion >= 0x655 @@ -3845,7 +3643,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_gammaImage, 0, 0, 1) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, channel, IS_LONG, 0, "Imagick::CHANNEL_DEFAULT") ZEND_END_ARG_INFO() -#define arginfo_class_Imagick_gaussianBlurImage arginfo_class_Imagick_blurImage +#define arginfo_class_Imagick_gaussianBlurImage arginfo_class_Imagick_adaptiveBlurImage #if MagickLibVersion < 0x700 && !defined(MAGICKCORE_EXCLUDE_DEPRECATED) @@ -3963,13 +3761,13 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_getImageColormapColor, 0, 0, 1) #endif ZEND_END_ARG_INFO() -#define arginfo_class_Imagick_getImageColorspace arginfo_class_Imagick_getImageSize +#define arginfo_class_Imagick_getImageColorspace arginfo_class_Imagick_getSizeOffset -#define arginfo_class_Imagick_getImageCompose arginfo_class_Imagick_getImageSize +#define arginfo_class_Imagick_getImageCompose arginfo_class_Imagick_getSizeOffset -#define arginfo_class_Imagick_getImageDelay arginfo_class_Imagick_getImageSize +#define arginfo_class_Imagick_getImageDelay arginfo_class_Imagick_getSizeOffset -#define arginfo_class_Imagick_getImageDepth arginfo_class_Imagick_getImageSize +#define arginfo_class_Imagick_getImageDepth arginfo_class_Imagick_getSizeOffset #if PHP_VERSION_ID >= 80000 @@ -3998,7 +3796,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_getImageExtrema, 0, 0, 0) ZEND_END_ARG_INFO() #endif -#define arginfo_class_Imagick_getImageDispose arginfo_class_Imagick_getImageSize +#define arginfo_class_Imagick_getImageDispose arginfo_class_Imagick_getSizeOffset #if PHP_VERSION_ID >= 80000 @@ -4011,13 +3809,13 @@ ZEND_END_ARG_INFO() #define arginfo_class_Imagick_getImageGreenPrimary arginfo_class_Imagick_getImageGeometry -#define arginfo_class_Imagick_getImageHeight arginfo_class_Imagick_getImageSize +#define arginfo_class_Imagick_getImageHeight arginfo_class_Imagick_getSizeOffset #define arginfo_class_Imagick_getImageHistogram arginfo_class_Imagick_getImageGeometry -#define arginfo_class_Imagick_getImageInterlaceScheme arginfo_class_Imagick_getImageSize +#define arginfo_class_Imagick_getImageInterlaceScheme arginfo_class_Imagick_getSizeOffset -#define arginfo_class_Imagick_getImageIterations arginfo_class_Imagick_getImageSize +#define arginfo_class_Imagick_getImageIterations arginfo_class_Imagick_getSizeOffset #if MagickLibVersion < 0x700 @@ -4077,44 +3875,31 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setImagePixelColor, 0, 0, 3) ZEND_END_ARG_INFO() #endif - -#if PHP_VERSION_ID >= 80000 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_getImageProfile, 0, 1, IS_STRING, 0) -#else -ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_getImageProfile, 0, 0, 1) -#endif - - -#if PHP_VERSION_ID >= 80000 - ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) -#else - ZEND_ARG_INFO(0, name) -#endif -ZEND_END_ARG_INFO() +#define arginfo_class_Imagick_getImageProfile arginfo_class_Imagick_getImageProperty #define arginfo_class_Imagick_getImageRedPrimary arginfo_class_Imagick_getImageGeometry -#define arginfo_class_Imagick_getImageRenderingIntent arginfo_class_Imagick_getImageSize +#define arginfo_class_Imagick_getImageRenderingIntent arginfo_class_Imagick_getSizeOffset #define arginfo_class_Imagick_getImageResolution arginfo_class_Imagick_getImageGeometry -#define arginfo_class_Imagick_getImageScene arginfo_class_Imagick_getImageSize +#define arginfo_class_Imagick_getImageScene arginfo_class_Imagick_getSizeOffset #define arginfo_class_Imagick_getImageSignature arginfo_class_Imagick___toString -#define arginfo_class_Imagick_getImageTicksPerSecond arginfo_class_Imagick_getImageSize +#define arginfo_class_Imagick_getImageTicksPerSecond arginfo_class_Imagick_getSizeOffset -#define arginfo_class_Imagick_getImageType arginfo_class_Imagick_getImageSize +#define arginfo_class_Imagick_getImageType arginfo_class_Imagick_getSizeOffset -#define arginfo_class_Imagick_getImageUnits arginfo_class_Imagick_getImageSize +#define arginfo_class_Imagick_getImageUnits arginfo_class_Imagick_getSizeOffset -#define arginfo_class_Imagick_getImageVirtualPixelMethod arginfo_class_Imagick_getImageSize +#define arginfo_class_Imagick_getImageVirtualPixelMethod arginfo_class_Imagick_getSizeOffset #define arginfo_class_Imagick_getImageWhitePoint arginfo_class_Imagick_getImageGeometry -#define arginfo_class_Imagick_getImageWidth arginfo_class_Imagick_getImageSize +#define arginfo_class_Imagick_getImageWidth arginfo_class_Imagick_getSizeOffset -#define arginfo_class_Imagick_getNumberImages arginfo_class_Imagick_getImageSize +#define arginfo_class_Imagick_getNumberImages arginfo_class_Imagick_getSizeOffset #define arginfo_class_Imagick_getImageTotalInkDensity arginfo_class_Imagick_getImageGamma @@ -4222,7 +4007,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_levelImage, 0, 0, 3) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, channel, IS_LONG, 0, "Imagick::CHANNEL_DEFAULT") ZEND_END_ARG_INFO() -#define arginfo_class_Imagick_magnifyImage arginfo_class_Imagick_removeImage +#define arginfo_class_Imagick_magnifyImage arginfo_class_Imagick_transposeImage #if !defined(MAGICKCORE_EXCLUDE_DEPRECATED) && MagickLibVersion < 0x700 @@ -4449,7 +4234,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_reduceNoiseImage, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#define arginfo_class_Imagick_removeImageProfile arginfo_class_Imagick_getImageProfile +#define arginfo_class_Imagick_removeImageProfile arginfo_class_Imagick_getImageProperty #if PHP_VERSION_ID >= 80000 @@ -4515,11 +4300,12 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setImageBiasQuantum, 0, 0, 1) ZEND_END_ARG_INFO() #endif +#if MagickLibVersion >= 0x700 #if PHP_VERSION_ID >= 80000 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_setImageBluePrimary, 0, 2, _IS_BOOL, 0) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_setImageBluePrimary, 0, 3, _IS_BOOL, 0) #else -ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setImageBluePrimary, 0, 0, 2) +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setImageBluePrimary, 0, 0, 3) #endif @@ -4534,23 +4320,53 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setImageBluePrimary, 0, 0, 2) #else ZEND_ARG_INFO(0, y) #endif -ZEND_END_ARG_INFO() - - + #if PHP_VERSION_ID >= 80000 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_setImageBorderColor, 0, 1, _IS_BOOL, 0) + ZEND_ARG_TYPE_INFO(0, z, IS_DOUBLE, 0) #else -ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setImageBorderColor, 0, 0, 1) + ZEND_ARG_INFO(0, z) #endif - - ZEND_ARG_OBJ_TYPE_MASK(0, border_color, ImagickPixel, MAY_BE_STRING, NULL) ZEND_END_ARG_INFO() +#endif +#if !(MagickLibVersion >= 0x700) #if PHP_VERSION_ID >= 80000 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_setImageChannelDepth, 0, 2, _IS_BOOL, 0) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_setImageBluePrimary, 0, 2, _IS_BOOL, 0) #else -ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setImageChannelDepth, 0, 0, 2) +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setImageBluePrimary, 0, 0, 2) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, x, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, x) +#endif + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, y, IS_DOUBLE, 0) +#else + ZEND_ARG_INFO(0, y) +#endif +ZEND_END_ARG_INFO() +#endif + + +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_setImageBorderColor, 0, 1, _IS_BOOL, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setImageBorderColor, 0, 0, 1) +#endif + + ZEND_ARG_OBJ_TYPE_MASK(0, border_color, ImagickPixel, MAY_BE_STRING, NULL) +ZEND_END_ARG_INFO() + + +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_setImageChannelDepth, 0, 2, _IS_BOOL, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setImageChannelDepth, 0, 0, 2) #endif @@ -4615,7 +4431,13 @@ ZEND_END_ARG_INFO() #define arginfo_class_Imagick_setImageExtent arginfo_class_Imagick_sampleImage +#if MagickLibVersion >= 0x700 +#define arginfo_class_Imagick_setImageGreenPrimary arginfo_class_Imagick_setImageBluePrimary +#endif + +#if !(MagickLibVersion >= 0x700) #define arginfo_class_Imagick_setImageGreenPrimary arginfo_class_Imagick_setImageBluePrimary +#endif #if PHP_VERSION_ID >= 80000 @@ -4653,7 +4475,13 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setImageProfile, 0, 0, 2) #endif ZEND_END_ARG_INFO() +#if MagickLibVersion >= 0x700 +#define arginfo_class_Imagick_setImageRedPrimary arginfo_class_Imagick_setImageBluePrimary +#endif + +#if !(MagickLibVersion >= 0x700) #define arginfo_class_Imagick_setImageRedPrimary arginfo_class_Imagick_setImageBluePrimary +#endif #if PHP_VERSION_ID >= 80000 @@ -4685,7 +4513,13 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setImageVirtualPixelMethod, 0, 0, 1 #endif ZEND_END_ARG_INFO() +#if MagickLibVersion >= 0x700 +#define arginfo_class_Imagick_setImageWhitePoint arginfo_class_Imagick_setImageBluePrimary +#endif + +#if !(MagickLibVersion >= 0x700) #define arginfo_class_Imagick_setImageWhitePoint arginfo_class_Imagick_setImageBluePrimary +#endif #if PHP_VERSION_ID >= 80000 @@ -4787,7 +4621,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_unsharpMaskImage, 0, 0, 4) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, channel, IS_LONG, 0, "Imagick::CHANNEL_DEFAULT") ZEND_END_ARG_INFO() -#define arginfo_class_Imagick_getImage arginfo_class_Imagick_clone +#define arginfo_class_Imagick_getImage arginfo_class_Imagick_optimizeImageLayers #if PHP_VERSION_ID >= 80000 @@ -4857,9 +4691,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_newPseudoImage, 0, 0, 3) #endif ZEND_END_ARG_INFO() -#define arginfo_class_Imagick_getCompression arginfo_class_Imagick_getImageSize +#define arginfo_class_Imagick_getCompression arginfo_class_Imagick_getSizeOffset -#define arginfo_class_Imagick_getCompressionQuality arginfo_class_Imagick_getImageSize +#define arginfo_class_Imagick_getCompressionQuality arginfo_class_Imagick_getSizeOffset #define arginfo_class_Imagick_getCopyright arginfo_class_Imagick___toString @@ -4882,7 +4716,7 @@ ZEND_END_ARG_INFO() #define arginfo_class_Imagick_getHomeURL arginfo_class_Imagick___toString -#define arginfo_class_Imagick_getInterlaceScheme arginfo_class_Imagick_getImageSize +#define arginfo_class_Imagick_getInterlaceScheme arginfo_class_Imagick_getSizeOffset #if PHP_VERSION_ID >= 80000 @@ -4903,9 +4737,9 @@ ZEND_END_ARG_INFO() #define arginfo_class_Imagick_getPage arginfo_class_Imagick_getImageGeometry -#define arginfo_class_Imagick_getQuantum arginfo_class_Imagick_getImageSize +#define arginfo_class_Imagick_getQuantum arginfo_class_Imagick_getSizeOffset -#define arginfo_class_Imagick_getHdriEnabled arginfo_class_Imagick_removeImage +#define arginfo_class_Imagick_getHdriEnabled arginfo_class_Imagick_transposeImage #define arginfo_class_Imagick_getQuantumDepth arginfo_class_Imagick_getImageGeometry @@ -4969,7 +4803,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setOption, 0, 0, 2) #endif ZEND_END_ARG_INFO() -#define arginfo_class_Imagick_setPage arginfo_class_Imagick_cropImage +#define arginfo_class_Imagick_setPage arginfo_class_Imagick_extentImage #if PHP_VERSION_ID >= 80000 @@ -5027,34 +4861,30 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setType, 0, 0, 1) ZEND_END_ARG_INFO() #if MagickLibVersion > 0x628 -#define arginfo_class_Imagick_key arginfo_class_Imagick_getSizeOffset + +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_key, 0, 0, IS_LONG, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_key, 0, 0, 0) #endif -#if MagickLibVersion > 0x628 -ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_next, 0, 0, IS_VOID, 0) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 -#define arginfo_class_Imagick_rewind arginfo_class_Imagick_next +#if (PHP_VERSION_ID >= 80100) +ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_next, 0, 0, IS_VOID, 0) +#else +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_next, 0, 0, 0) #endif +ZEND_END_ARG_INFO() -#if MagickLibVersion > 0x628 -#define arginfo_class_Imagick_valid arginfo_class_Imagick_optimizeImageLayers -#endif +#define arginfo_class_Imagick_rewind arginfo_class_Imagick_next -#if MagickLibVersion > 0x628 +#define arginfo_class_Imagick_valid arginfo_class_Imagick_transposeImage -#if PHP_VERSION_ID >= 80000 -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Imagick_current, 0, 0, Imagick, 0) -#else -ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_current, 0, 0, 0) -#endif - -ZEND_END_ARG_INFO() -#endif +#define arginfo_class_Imagick_current arginfo_class_Imagick_optimizeImageLayers -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x659 +#if MagickLibVersion >= 0x659 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_brightnessContrastImage, 0, 2, _IS_BOOL, 0) @@ -5078,7 +4908,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_brightnessContrastImage, 0, 0, 2) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && MagickLibVersion > 0x661 +#if MagickLibVersion > 0x661 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_colorMatrixImage, 0, 1, _IS_BOOL, 0) @@ -5095,7 +4925,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_colorMatrixImage, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_selectiveBlurImage, 0, 3, _IS_BOOL, 0) @@ -5123,9 +4952,8 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_selectiveBlurImage, 0, 0, 3) #endif ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, channel, IS_LONG, 0, "Imagick::CHANNEL_DEFAULT") ZEND_END_ARG_INFO() -#endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x689 +#if MagickLibVersion >= 0x689 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_rotationalBlurImage, 0, 1, _IS_BOOL, 0) @@ -5143,7 +4971,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_rotationalBlurImage, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x683 +#if MagickLibVersion >= 0x683 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_statisticImage, 0, 3, _IS_BOOL, 0) @@ -5173,7 +5001,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_statisticImage, 0, 0, 3) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x652 +#if MagickLibVersion >= 0x652 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Imagick_subimageMatch, 0, 1, Imagick, 0) @@ -5207,34 +5035,12 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_subimageMatch, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x652 +#if MagickLibVersion >= 0x652 #define arginfo_class_Imagick_similarityImage arginfo_class_Imagick_subimageMatch #endif -#if MagickLibVersion > 0x628 - -#if PHP_VERSION_ID >= 80000 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_setRegistry, 0, 2, _IS_BOOL, 0) -#else -ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setRegistry, 0, 0, 2) -#endif - - -#if PHP_VERSION_ID >= 80000 - ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) -#else - ZEND_ARG_INFO(0, key) -#endif - -#if PHP_VERSION_ID >= 80000 - ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0) -#else - ZEND_ARG_INFO(0, value) -#endif -ZEND_END_ARG_INFO() -#endif +#define arginfo_class_Imagick_setRegistry arginfo_class_Imagick_setOption -#if MagickLibVersion > 0x628 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_class_Imagick_getRegistry, 0, 1, MAY_BE_STRING|MAY_BE_FALSE) @@ -5249,20 +5055,10 @@ ZEND_END_ARG_INFO() ZEND_ARG_INFO(0, key) #endif ZEND_END_ARG_INFO() -#endif -#if MagickLibVersion > 0x628 +#define arginfo_class_Imagick_listRegistry arginfo_class_Imagick_getImageGeometry -#if PHP_VERSION_ID >= 80000 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_listRegistry, 0, 0, IS_ARRAY, 0) -#else -ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_listRegistry, 0, 0, 0) -#endif - -ZEND_END_ARG_INFO() -#endif - -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x680 +#if MagickLibVersion >= 0x680 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_morphology, 0, 3, _IS_BOOL, 0) @@ -5287,7 +5083,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_morphology, 0, 0, 3) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && defined(IMAGICK_WITH_KERNEL) && MagickLibVersion < 0x700 +#if defined(IMAGICK_WITH_KERNEL) && MagickLibVersion < 0x700 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_filter, 0, 1, _IS_BOOL, 0) @@ -5300,7 +5096,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_filter, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_setAntialias, 0, 1, IS_VOID, 0) @@ -5315,13 +5110,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setAntialias, 0, 0, 1) ZEND_ARG_INFO(0, antialias) #endif ZEND_END_ARG_INFO() -#endif -#if MagickLibVersion > 0x628 -#define arginfo_class_Imagick_getAntialias arginfo_class_Imagick_optimizeImageLayers -#endif +#define arginfo_class_Imagick_getAntialias arginfo_class_Imagick_transposeImage -#if MagickLibVersion > 0x628 && MagickLibVersion > 0x676 +#if MagickLibVersion > 0x676 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_colorDecisionListImage, 0, 1, _IS_BOOL, 0) @@ -5338,7 +5130,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_colorDecisionListImage, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x687 +#if MagickLibVersion >= 0x687 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_optimizeImageTransparency, 0, 0, IS_VOID, 0) @@ -5349,7 +5141,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_optimizeImageTransparency, 0, 0, 0) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x660 +#if MagickLibVersion >= 0x660 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_autoGammaImage, 0, 0, IS_VOID, 0) @@ -5361,7 +5153,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_autoGammaImage, 0, 0, 0) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x692 +#if MagickLibVersion >= 0x692 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_autoOrient, 0, 0, IS_VOID, 0) @@ -5372,11 +5164,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_autoOrient, 0, 0, 0) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x692 +#if MagickLibVersion >= 0x692 #define arginfo_class_Imagick_autoOrientate arginfo_class_Imagick_autoOrient #endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x692 +#if MagickLibVersion >= 0x692 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_compositeImageGravity, 0, 3, _IS_BOOL, 0) @@ -5400,7 +5192,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_compositeImageGravity, 0, 0, 3) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x693 +#if MagickLibVersion >= 0x693 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_localContrastImage, 0, 2, IS_VOID, 0) @@ -5423,7 +5215,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_localContrastImage, 0, 0, 2) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x700 +#if MagickLibVersion >= 0x700 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_identifyImageType, 0, 0, IS_LONG, 0) @@ -5434,7 +5226,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_identifyImageType, 0, 0, 0) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GETSETIMAGEMASK +#if IM_HAVE_IMAGICK_GETSETIMAGEMASK #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Imagick_getImageMask, 0, 1, Imagick, 1) @@ -5451,7 +5243,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_getImageMask, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GETSETIMAGEMASK +#if IM_HAVE_IMAGICK_GETSETIMAGEMASK #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_setImageMask, 0, 2, IS_VOID, 0) @@ -5469,7 +5261,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setImageMask, 0, 0, 2) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x709 +#if IM_HAVE_IMAGICK_CANNYEDGEIMAGE #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_cannyEdgeImage, 0, 4, _IS_BOOL, 0) @@ -5504,7 +5296,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_cannyEdgeImage, 0, 0, 4) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_SETSEED +#if IM_HAVE_IMAGICK_SETSEED #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_setSeed, 0, 1, IS_VOID, 0) @@ -5521,7 +5313,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setSeed, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_WAVELETDENOISEIMAGE +#if IM_HAVE_IMAGICK_WAVELETDENOISEIMAGE #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_waveletDenoiseImage, 0, 2, _IS_BOOL, 0) @@ -5544,7 +5336,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_waveletDenoiseImage, 0, 0, 2) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_MEANSHIFTIMAGE +#if IM_HAVE_IMAGICK_MEANSHIFTIMAGE #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_meanShiftImage, 0, 3, _IS_BOOL, 0) @@ -5573,7 +5365,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_meanShiftImage, 0, 0, 3) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_KMEANSIMAGE +#if IM_HAVE_IMAGICK_KMEANSIMAGE #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_kmeansImage, 0, 3, _IS_BOOL, 0) @@ -5602,7 +5394,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_kmeansImage, 0, 0, 3) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_RANGETHRESHOLDIMAGE +#if IM_HAVE_IMAGICK_RANGETHRESHOLDIMAGE #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_rangeThresholdImage, 0, 4, _IS_BOOL, 0) @@ -5637,7 +5429,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_rangeThresholdImage, 0, 0, 4) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_AUTOTHRESHOLDIMAGE +#if IM_HAVE_IMAGICK_AUTOTHRESHOLDIMAGE #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_autoThresholdImage, 0, 1, _IS_BOOL, 0) @@ -5654,7 +5446,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_autoThresholdImage, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_BILATERALBLURIMAGE +#if IM_HAVE_IMAGICK_BILATERALBLURIMAGE #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_bilateralBlurImage, 0, 4, _IS_BOOL, 0) @@ -5689,7 +5481,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_bilateralBlurImage, 0, 0, 4) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_CLAHEIMAGE +#if IM_HAVE_IMAGICK_CLAHEIMAGE #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_claheImage, 0, 4, _IS_BOOL, 0) @@ -5724,7 +5516,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_claheImage, 0, 0, 4) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_CHANNELFXIMAGE +#if IM_HAVE_IMAGICK_CHANNELFXIMAGE #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Imagick_channelFxImage, 0, 1, Imagick, 0) @@ -5741,7 +5533,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_channelFxImage, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_COLORTHRESHOLDIMAGE +#if IM_HAVE_IMAGICK_COLORTHRESHOLDIMAGE #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_colorThresholdImage, 0, 2, _IS_BOOL, 0) @@ -5754,7 +5546,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_colorThresholdImage, 0, 0, 2) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_COMPLEXIMAGES +#if IM_HAVE_IMAGICK_COMPLEXIMAGES #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Imagick_complexImages, 0, 1, Imagick, 0) @@ -5771,7 +5563,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_complexImages, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_INTERPOLATIVERESIZEIMAGE +#if IM_HAVE_IMAGICK_INTERPOLATIVERESIZEIMAGE #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_interpolativeResizeImage, 0, 3, _IS_BOOL, 0) @@ -5800,7 +5592,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_interpolativeResizeImage, 0, 0, 3) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_LEVELIMAGECOLORS +#if IM_HAVE_IMAGICK_LEVELIMAGECOLORS #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_levelImageColors, 0, 3, _IS_BOOL, 0) @@ -5819,7 +5611,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_levelImageColors, 0, 0, 3) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_LEVELIZEIMAGE +#if IM_HAVE_IMAGICK_LEVELIZEIMAGE #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_levelizeImage, 0, 3, _IS_BOOL, 0) @@ -5848,7 +5640,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_levelizeImage, 0, 0, 3) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_ORDEREDDITHERIMAGE +#if IM_HAVE_IMAGICK_ORDEREDDITHERIMAGE #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_orderedDitherImage, 0, 1, _IS_BOOL, 0) @@ -5865,7 +5657,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_orderedDitherImage, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_WHITEBALANCEIMAGE +#if IM_HAVE_IMAGICK_WHITEBALANCEIMAGE #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_whiteBalanceImage, 0, 0, _IS_BOOL, 0) @@ -5876,7 +5668,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_whiteBalanceImage, 0, 0, 0) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_DELETE_OPTION +#if IM_HAVE_IMAGICK_DELETE_OPTION #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_deleteOption, 0, 1, _IS_BOOL, 0) @@ -5893,7 +5685,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_deleteOption, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_BACKGROUND_COLOR +#if IM_HAVE_IMAGICK_GET_BACKGROUND_COLOR #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Imagick_getBackgroundColor, 0, 0, ImagickPixel, 0) @@ -5904,7 +5696,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_getBackgroundColor, 0, 0, 0) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_IMAGE_ARTIFACTS +#if IM_HAVE_IMAGICK_GET_IMAGE_ARTIFACTS #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_getImageArtifacts, 0, 0, IS_ARRAY, 0) @@ -5916,7 +5708,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_getImageArtifacts, 0, 0, 0) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_IMAGE_KURTOSIS +#if IM_HAVE_IMAGICK_GET_IMAGE_KURTOSIS #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_getImageKurtosis, 0, 0, IS_ARRAY, 0) @@ -5927,7 +5719,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_getImageKurtosis, 0, 0, 0) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_IMAGE_MEAN +#if IM_HAVE_IMAGICK_GET_IMAGE_MEAN #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_getImageMean, 0, 0, IS_ARRAY, 0) @@ -5938,7 +5730,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_getImageMean, 0, 0, 0) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_IMAGE_RANGE +#if IM_HAVE_IMAGICK_GET_IMAGE_RANGE #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_getImageRange, 0, 0, IS_ARRAY, 0) @@ -5949,7 +5741,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_getImageRange, 0, 0, 0) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_INTERPOLATE_METHOD +#if IM_HAVE_IMAGICK_GET_INTERPOLATE_METHOD #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_getInterpolateMethod, 0, 0, IS_LONG, 0) @@ -5960,7 +5752,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_getInterpolateMethod, 0, 0, 0) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_OPTIONS +#if IM_HAVE_IMAGICK_GET_OPTIONS #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_getOptions, 0, 0, IS_ARRAY, 0) @@ -5972,7 +5764,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_getOptions, 0, 0, 0) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_ORIENTATION +#if IM_HAVE_IMAGICK_GET_ORIENTATION #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_getOrientation, 0, 0, IS_LONG, 0) @@ -5983,7 +5775,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_getOrientation, 0, 0, 0) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_RESOLUTION +#if IM_HAVE_IMAGICK_GET_RESOLUTION #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_getResolution, 0, 0, IS_ARRAY, 0) @@ -5994,7 +5786,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_getResolution, 0, 0, 0) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_TYPE +#if IM_HAVE_IMAGICK_GET_TYPE #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_getType, 0, 0, IS_LONG, 0) @@ -6005,7 +5797,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_getType, 0, 0, 0) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_POLYNOMIAL_IMAGE +#if IM_HAVE_IMAGICK_POLYNOMIAL_IMAGE #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_polynomialImage, 0, 1, _IS_BOOL, 0) @@ -6022,7 +5814,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_polynomialImage, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_SET_DEPTH +#if IM_HAVE_IMAGICK_SET_DEPTH #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_setDepth, 0, 1, _IS_BOOL, 0) @@ -6039,7 +5831,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setDepth, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_SET_EXTRACT +#if IM_HAVE_IMAGICK_SET_EXTRACT #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_setExtract, 0, 1, _IS_BOOL, 0) @@ -6056,7 +5848,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setExtract, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_SET_INTERPOLATE_METHOD +#if IM_HAVE_IMAGICK_SET_INTERPOLATE_METHOD #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_setInterpolateMethod, 0, 1, _IS_BOOL, 0) @@ -6073,7 +5865,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setInterpolateMethod, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_SET_ORIENTATION +#if IM_HAVE_IMAGICK_SET_ORIENTATION #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_setOrientation, 0, 1, _IS_BOOL, 0) @@ -6091,126 +5883,62 @@ ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x628 ZEND_METHOD(Imagick, optimizeImageLayers); -#endif -#if MagickLibVersion > 0x628 ZEND_METHOD(Imagick, compareImageLayers); -#endif -#if MagickLibVersion > 0x628 ZEND_METHOD(Imagick, pingImageBlob); -#endif -#if MagickLibVersion > 0x628 ZEND_METHOD(Imagick, pingImageFile); -#endif -#if MagickLibVersion > 0x628 ZEND_METHOD(Imagick, transposeImage); -#endif -#if MagickLibVersion > 0x628 ZEND_METHOD(Imagick, transverseImage); -#endif -#if MagickLibVersion > 0x628 ZEND_METHOD(Imagick, trimImage); -#endif -#if MagickLibVersion > 0x628 ZEND_METHOD(Imagick, waveImage); -#endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x700 +#if MagickLibVersion >= 0x700 ZEND_METHOD(Imagick, waveImageWithMethod); #endif -#if MagickLibVersion > 0x628 ZEND_METHOD(Imagick, vignetteImage); -#endif -#if MagickLibVersion > 0x628 ZEND_METHOD(Imagick, uniqueImageColors); -#endif -#if MagickLibVersion > 0x628 && !defined(MAGICKCORE_EXCLUDE_DEPRECATED) && MagickLibVersion < 0x700 +#if !defined(MAGICKCORE_EXCLUDE_DEPRECATED) && MagickLibVersion < 0x700 ZEND_METHOD(Imagick, getImageMatte); #endif -#if MagickLibVersion > 0x628 ZEND_METHOD(Imagick, setImageMatte); -#endif -#if MagickLibVersion > 0x628 ZEND_METHOD(Imagick, adaptiveResizeImage); -#endif -#if MagickLibVersion > 0x628 ZEND_METHOD(Imagick, sketchImage); -#endif -#if MagickLibVersion > 0x628 ZEND_METHOD(Imagick, shadeImage); -#endif -#if MagickLibVersion > 0x628 ZEND_METHOD(Imagick, getSizeOffset); -#endif -#if MagickLibVersion > 0x628 ZEND_METHOD(Imagick, setSizeOffset); -#endif -#if MagickLibVersion > 0x628 ZEND_METHOD(Imagick, adaptiveBlurImage); -#endif -#if MagickLibVersion > 0x628 ZEND_METHOD(Imagick, contrastStretchImage); -#endif -#if MagickLibVersion > 0x628 ZEND_METHOD(Imagick, adaptiveSharpenImage); -#endif -#if MagickLibVersion > 0x628 ZEND_METHOD(Imagick, randomThresholdImage); -#endif -#if MagickLibVersion > 0x628 ZEND_METHOD(Imagick, roundCornersImage); -#endif -#if MagickLibVersion > 0x628 ZEND_METHOD(Imagick, setIteratorIndex); -#endif -#if MagickLibVersion > 0x628 ZEND_METHOD(Imagick, getIteratorIndex); -#endif -#if MagickLibVersion > 0x628 && MagickLibVersion < 0x700 +#if MagickLibVersion < 0x700 ZEND_METHOD(Imagick, transformImage); #endif #if MagickLibVersion > 0x630 && MagickLibVersion < 0x700 ZEND_METHOD(Imagick, setImageOpacity); #endif -#if MagickLibVersion > 0x630 && MagickLibVersion >= 0x700 +#if MagickLibVersion >= 0x700 ZEND_METHOD(Imagick, setImageAlpha); #endif -#if MagickLibVersion > 0x630 && MagickLibVersion < 0x700 +#if MagickLibVersion < 0x700 ZEND_METHOD(Imagick, orderedPosterizeImage); #endif #if MagickLibVersion >= 0x700 ZEND_METHOD(Imagick, polaroidWithTextAndMethod); #endif -#if MagickLibVersion > 0x631 ZEND_METHOD(Imagick, polaroidImage); -#endif -#if MagickLibVersion > 0x631 ZEND_METHOD(Imagick, getImageProperty); -#endif -#if MagickLibVersion > 0x631 ZEND_METHOD(Imagick, setImageProperty); -#endif -#if MagickLibVersion > 0x631 ZEND_METHOD(Imagick, deleteImageProperty); -#endif -#if MagickLibVersion > 0x631 ZEND_METHOD(Imagick, identifyFormat); -#endif -#if MagickLibVersion > 0x631 && IM_HAVE_IMAGICK_SETIMAGEINTERPOLATEMETHOD +#if IM_HAVE_IMAGICK_SETIMAGEINTERPOLATEMETHOD ZEND_METHOD(Imagick, setImageInterpolateMethod); #endif -#if MagickLibVersion > 0x631 ZEND_METHOD(Imagick, getImageInterpolateMethod); -#endif -#if MagickLibVersion > 0x631 ZEND_METHOD(Imagick, linearStretchImage); -#endif -#if MagickLibVersion > 0x631 ZEND_METHOD(Imagick, getImageLength); -#endif -#if MagickLibVersion > 0x631 ZEND_METHOD(Imagick, extentImage); -#endif #if MagickLibVersion > 0x633 ZEND_METHOD(Imagick, getImageOrientation); #endif @@ -6220,37 +5948,24 @@ ZEND_METHOD(Imagick, setImageOrientation); #if !defined(MAGICKCORE_EXCLUDE_DEPRECATED) && MagickLibVersion > 0x634 && MagickLibVersion < 0x700 ZEND_METHOD(Imagick, paintFloodfillImage); #endif -#if MagickLibVersion > 0x635 ZEND_METHOD(Imagick, clutImage); +#if MagickLibVersion >= 0x700 +ZEND_METHOD(Imagick, clutImageWithInterpolate); #endif -#if MagickLibVersion > 0x635 ZEND_METHOD(Imagick, getImageProperties); -#endif -#if MagickLibVersion > 0x635 ZEND_METHOD(Imagick, getImageProfiles); -#endif -#if MagickLibVersion > 0x635 ZEND_METHOD(Imagick, distortImage); -#endif -#if MagickLibVersion > 0x635 ZEND_METHOD(Imagick, writeImageFile); -#endif -#if MagickLibVersion > 0x635 ZEND_METHOD(Imagick, writeImagesFile); -#endif -#if MagickLibVersion > 0x635 ZEND_METHOD(Imagick, resetImagePage); -#endif -#if MagickLibVersion > 0x635 && MagickLibVersion < 0x700 +#if MagickLibVersion < 0x700 ZEND_METHOD(Imagick, setImageClipMask); #endif -#if MagickLibVersion > 0x635 && MagickLibVersion < 0x700 +#if MagickLibVersion < 0x700 ZEND_METHOD(Imagick, getImageClipMask); #endif -#if MagickLibVersion > 0x635 ZEND_METHOD(Imagick, animateImages); -#endif -#if MagickLibVersion > 0x635 && !defined(MAGICKCORE_EXCLUDE_DEPRECATED) && MagickLibVersion < 0x700 +#if !defined(MAGICKCORE_EXCLUDE_DEPRECATED) && MagickLibVersion < 0x700 ZEND_METHOD(Imagick, recolorImage); #endif #if MagickLibVersion > 0x636 @@ -6640,20 +6355,40 @@ ZEND_METHOD(Imagick, setImageBias); #if MagickLibVersion < 0x700 ZEND_METHOD(Imagick, setImageBiasQuantum); #endif +#if MagickLibVersion >= 0x700 +ZEND_METHOD(Imagick, setImageBluePrimary); +#endif +#if !(MagickLibVersion >= 0x700) ZEND_METHOD(Imagick, setImageBluePrimary); +#endif ZEND_METHOD(Imagick, setImageBorderColor); ZEND_METHOD(Imagick, setImageChannelDepth); ZEND_METHOD(Imagick, setImageColormapColor); ZEND_METHOD(Imagick, setImageColorspace); ZEND_METHOD(Imagick, setImageDispose); ZEND_METHOD(Imagick, setImageExtent); +#if MagickLibVersion >= 0x700 ZEND_METHOD(Imagick, setImageGreenPrimary); +#endif +#if !(MagickLibVersion >= 0x700) +ZEND_METHOD(Imagick, setImageGreenPrimary); +#endif ZEND_METHOD(Imagick, setImageInterlaceScheme); ZEND_METHOD(Imagick, setImageProfile); +#if MagickLibVersion >= 0x700 +ZEND_METHOD(Imagick, setImageRedPrimary); +#endif +#if !(MagickLibVersion >= 0x700) ZEND_METHOD(Imagick, setImageRedPrimary); +#endif ZEND_METHOD(Imagick, setImageRenderingIntent); ZEND_METHOD(Imagick, setImageVirtualPixelMethod); +#if MagickLibVersion >= 0x700 ZEND_METHOD(Imagick, setImageWhitePoint); +#endif +#if !(MagickLibVersion >= 0x700) +ZEND_METHOD(Imagick, setImageWhitePoint); +#endif ZEND_METHOD(Imagick, sigmoidalContrastImage); ZEND_METHOD(Imagick, stereoImage); ZEND_METHOD(Imagick, textureImage); @@ -6702,308 +6437,223 @@ ZEND_METHOD(Imagick, setSamplingFactors); ZEND_METHOD(Imagick, setSize); ZEND_METHOD(Imagick, setType); #if MagickLibVersion > 0x628 -ZEND_METHOD(Imagick, nextImage); -#endif -#if MagickLibVersion > 0x628 -ZEND_METHOD(Imagick, setFirstIterator); +ZEND_METHOD(Imagick, getIteratorIndex); #endif -#if MagickLibVersion > 0x628 ZEND_METHOD(Imagick, valid); -#endif -#if MagickLibVersion > 0x628 ZEND_METHOD(Imagick, current); -#endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x659 +#if MagickLibVersion >= 0x659 ZEND_METHOD(Imagick, brightnessContrastImage); #endif -#if MagickLibVersion > 0x628 && MagickLibVersion > 0x661 +#if MagickLibVersion > 0x661 ZEND_METHOD(Imagick, colorMatrixImage); #endif -#if MagickLibVersion > 0x628 ZEND_METHOD(Imagick, selectiveBlurImage); -#endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x689 +#if MagickLibVersion >= 0x689 ZEND_METHOD(Imagick, rotationalBlurImage); #endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x683 +#if MagickLibVersion >= 0x683 ZEND_METHOD(Imagick, statisticImage); #endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x652 +#if MagickLibVersion >= 0x652 ZEND_METHOD(Imagick, subimageMatch); #endif -#if MagickLibVersion > 0x628 ZEND_METHOD(Imagick, setRegistry); -#endif -#if MagickLibVersion > 0x628 ZEND_METHOD(Imagick, getRegistry); -#endif -#if MagickLibVersion > 0x628 ZEND_METHOD(Imagick, listRegistry); -#endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x680 +#if MagickLibVersion >= 0x680 ZEND_METHOD(Imagick, morphology); #endif -#if MagickLibVersion > 0x628 && defined(IMAGICK_WITH_KERNEL) && MagickLibVersion < 0x700 +#if defined(IMAGICK_WITH_KERNEL) && MagickLibVersion < 0x700 ZEND_METHOD(Imagick, filter); #endif -#if MagickLibVersion > 0x628 ZEND_METHOD(Imagick, setAntialias); -#endif -#if MagickLibVersion > 0x628 ZEND_METHOD(Imagick, getAntialias); -#endif -#if MagickLibVersion > 0x628 && MagickLibVersion > 0x676 +#if MagickLibVersion > 0x676 ZEND_METHOD(Imagick, colorDecisionListImage); #endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x687 +#if MagickLibVersion >= 0x687 ZEND_METHOD(Imagick, optimizeImageTransparency); #endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x660 +#if MagickLibVersion >= 0x660 ZEND_METHOD(Imagick, autoGammaImage); #endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x692 +#if MagickLibVersion >= 0x692 ZEND_METHOD(Imagick, autoOrient); #endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x692 +#if MagickLibVersion >= 0x692 ZEND_METHOD(Imagick, compositeImageGravity); #endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x693 +#if MagickLibVersion >= 0x693 ZEND_METHOD(Imagick, localContrastImage); #endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x700 +#if MagickLibVersion >= 0x700 ZEND_METHOD(Imagick, identifyImageType); #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GETSETIMAGEMASK +#if IM_HAVE_IMAGICK_GETSETIMAGEMASK ZEND_METHOD(Imagick, getImageMask); #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GETSETIMAGEMASK +#if IM_HAVE_IMAGICK_GETSETIMAGEMASK ZEND_METHOD(Imagick, setImageMask); #endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x709 +#if IM_HAVE_IMAGICK_CANNYEDGEIMAGE ZEND_METHOD(Imagick, cannyEdgeImage); #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_SETSEED +#if IM_HAVE_IMAGICK_SETSEED ZEND_METHOD(Imagick, setSeed); #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_WAVELETDENOISEIMAGE +#if IM_HAVE_IMAGICK_WAVELETDENOISEIMAGE ZEND_METHOD(Imagick, waveletDenoiseImage); #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_MEANSHIFTIMAGE +#if IM_HAVE_IMAGICK_MEANSHIFTIMAGE ZEND_METHOD(Imagick, meanShiftImage); #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_KMEANSIMAGE +#if IM_HAVE_IMAGICK_KMEANSIMAGE ZEND_METHOD(Imagick, kmeansImage); #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_RANGETHRESHOLDIMAGE +#if IM_HAVE_IMAGICK_RANGETHRESHOLDIMAGE ZEND_METHOD(Imagick, rangeThresholdImage); #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_AUTOTHRESHOLDIMAGE +#if IM_HAVE_IMAGICK_AUTOTHRESHOLDIMAGE ZEND_METHOD(Imagick, autoThresholdImage); #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_BILATERALBLURIMAGE +#if IM_HAVE_IMAGICK_BILATERALBLURIMAGE ZEND_METHOD(Imagick, bilateralBlurImage); #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_CLAHEIMAGE +#if IM_HAVE_IMAGICK_CLAHEIMAGE ZEND_METHOD(Imagick, claheImage); #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_CHANNELFXIMAGE +#if IM_HAVE_IMAGICK_CHANNELFXIMAGE ZEND_METHOD(Imagick, channelFxImage); #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_COLORTHRESHOLDIMAGE +#if IM_HAVE_IMAGICK_COLORTHRESHOLDIMAGE ZEND_METHOD(Imagick, colorThresholdImage); #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_COMPLEXIMAGES +#if IM_HAVE_IMAGICK_COMPLEXIMAGES ZEND_METHOD(Imagick, complexImages); #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_INTERPOLATIVERESIZEIMAGE +#if IM_HAVE_IMAGICK_INTERPOLATIVERESIZEIMAGE ZEND_METHOD(Imagick, interpolativeResizeImage); #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_LEVELIMAGECOLORS +#if IM_HAVE_IMAGICK_LEVELIMAGECOLORS ZEND_METHOD(Imagick, levelImageColors); #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_LEVELIZEIMAGE +#if IM_HAVE_IMAGICK_LEVELIZEIMAGE ZEND_METHOD(Imagick, levelizeImage); #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_ORDEREDDITHERIMAGE +#if IM_HAVE_IMAGICK_ORDEREDDITHERIMAGE ZEND_METHOD(Imagick, orderedDitherImage); #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_WHITEBALANCEIMAGE +#if IM_HAVE_IMAGICK_WHITEBALANCEIMAGE ZEND_METHOD(Imagick, whiteBalanceImage); #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_DELETE_OPTION +#if IM_HAVE_IMAGICK_DELETE_OPTION ZEND_METHOD(Imagick, deleteOption); #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_BACKGROUND_COLOR +#if IM_HAVE_IMAGICK_GET_BACKGROUND_COLOR ZEND_METHOD(Imagick, getBackgroundColor); #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_IMAGE_ARTIFACTS +#if IM_HAVE_IMAGICK_GET_IMAGE_ARTIFACTS ZEND_METHOD(Imagick, getImageArtifacts); #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_IMAGE_KURTOSIS +#if IM_HAVE_IMAGICK_GET_IMAGE_KURTOSIS ZEND_METHOD(Imagick, getImageKurtosis); #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_IMAGE_MEAN +#if IM_HAVE_IMAGICK_GET_IMAGE_MEAN ZEND_METHOD(Imagick, getImageMean); #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_IMAGE_RANGE +#if IM_HAVE_IMAGICK_GET_IMAGE_RANGE ZEND_METHOD(Imagick, getImageRange); #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_INTERPOLATE_METHOD +#if IM_HAVE_IMAGICK_GET_INTERPOLATE_METHOD ZEND_METHOD(Imagick, getInterpolateMethod); #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_OPTIONS +#if IM_HAVE_IMAGICK_GET_OPTIONS ZEND_METHOD(Imagick, getOptions); #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_ORIENTATION +#if IM_HAVE_IMAGICK_GET_ORIENTATION ZEND_METHOD(Imagick, getOrientation); #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_RESOLUTION +#if IM_HAVE_IMAGICK_GET_RESOLUTION ZEND_METHOD(Imagick, getResolution); #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_TYPE +#if IM_HAVE_IMAGICK_GET_TYPE ZEND_METHOD(Imagick, getType); #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_POLYNOMIAL_IMAGE +#if IM_HAVE_IMAGICK_POLYNOMIAL_IMAGE ZEND_METHOD(Imagick, polynomialImage); #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_SET_DEPTH +#if IM_HAVE_IMAGICK_SET_DEPTH ZEND_METHOD(Imagick, setDepth); #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_SET_EXTRACT +#if IM_HAVE_IMAGICK_SET_EXTRACT ZEND_METHOD(Imagick, setExtract); #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_SET_INTERPOLATE_METHOD +#if IM_HAVE_IMAGICK_SET_INTERPOLATE_METHOD ZEND_METHOD(Imagick, setInterpolateMethod); #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_SET_ORIENTATION +#if IM_HAVE_IMAGICK_SET_ORIENTATION ZEND_METHOD(Imagick, setOrientation); #endif static const zend_function_entry class_Imagick_methods[] = { -#if MagickLibVersion > 0x628 ZEND_ME(Imagick, optimizeImageLayers, arginfo_class_Imagick_optimizeImageLayers, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x628 ZEND_ME(Imagick, compareImageLayers, arginfo_class_Imagick_compareImageLayers, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x628 ZEND_ME(Imagick, pingImageBlob, arginfo_class_Imagick_pingImageBlob, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x628 ZEND_ME(Imagick, pingImageFile, arginfo_class_Imagick_pingImageFile, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x628 ZEND_ME(Imagick, transposeImage, arginfo_class_Imagick_transposeImage, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x628 ZEND_ME(Imagick, transverseImage, arginfo_class_Imagick_transverseImage, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x628 ZEND_ME(Imagick, trimImage, arginfo_class_Imagick_trimImage, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x628 ZEND_ME(Imagick, waveImage, arginfo_class_Imagick_waveImage, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x700 +#if MagickLibVersion >= 0x700 ZEND_ME(Imagick, waveImageWithMethod, arginfo_class_Imagick_waveImageWithMethod, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 ZEND_ME(Imagick, vignetteImage, arginfo_class_Imagick_vignetteImage, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x628 ZEND_ME(Imagick, uniqueImageColors, arginfo_class_Imagick_uniqueImageColors, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x628 && !defined(MAGICKCORE_EXCLUDE_DEPRECATED) && MagickLibVersion < 0x700 +#if !defined(MAGICKCORE_EXCLUDE_DEPRECATED) && MagickLibVersion < 0x700 ZEND_ME(Imagick, getImageMatte, arginfo_class_Imagick_getImageMatte, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED) #endif -#if MagickLibVersion > 0x628 ZEND_ME(Imagick, setImageMatte, arginfo_class_Imagick_setImageMatte, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x628 ZEND_ME(Imagick, adaptiveResizeImage, arginfo_class_Imagick_adaptiveResizeImage, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x628 ZEND_ME(Imagick, sketchImage, arginfo_class_Imagick_sketchImage, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x628 ZEND_ME(Imagick, shadeImage, arginfo_class_Imagick_shadeImage, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x628 ZEND_ME(Imagick, getSizeOffset, arginfo_class_Imagick_getSizeOffset, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x628 ZEND_ME(Imagick, setSizeOffset, arginfo_class_Imagick_setSizeOffset, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x628 ZEND_ME(Imagick, adaptiveBlurImage, arginfo_class_Imagick_adaptiveBlurImage, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x628 ZEND_ME(Imagick, contrastStretchImage, arginfo_class_Imagick_contrastStretchImage, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x628 ZEND_ME(Imagick, adaptiveSharpenImage, arginfo_class_Imagick_adaptiveSharpenImage, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x628 ZEND_ME(Imagick, randomThresholdImage, arginfo_class_Imagick_randomThresholdImage, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x628 ZEND_ME(Imagick, roundCornersImage, arginfo_class_Imagick_roundCornersImage, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x628 ZEND_MALIAS(Imagick, roundCorners, roundCornersImage, arginfo_class_Imagick_roundCorners, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x628 ZEND_ME(Imagick, setIteratorIndex, arginfo_class_Imagick_setIteratorIndex, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x628 ZEND_ME(Imagick, getIteratorIndex, arginfo_class_Imagick_getIteratorIndex, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x628 && MagickLibVersion < 0x700 +#if MagickLibVersion < 0x700 ZEND_ME(Imagick, transformImage, arginfo_class_Imagick_transformImage, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED) #endif #if MagickLibVersion > 0x630 && MagickLibVersion < 0x700 ZEND_ME(Imagick, setImageOpacity, arginfo_class_Imagick_setImageOpacity, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED) #endif -#if MagickLibVersion > 0x630 && MagickLibVersion >= 0x700 +#if MagickLibVersion >= 0x700 ZEND_ME(Imagick, setImageAlpha, arginfo_class_Imagick_setImageAlpha, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x630 && MagickLibVersion < 0x700 +#if MagickLibVersion < 0x700 ZEND_ME(Imagick, orderedPosterizeImage, arginfo_class_Imagick_orderedPosterizeImage, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED) #endif #if MagickLibVersion >= 0x700 ZEND_ME(Imagick, polaroidWithTextAndMethod, arginfo_class_Imagick_polaroidWithTextAndMethod, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x631 ZEND_ME(Imagick, polaroidImage, arginfo_class_Imagick_polaroidImage, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x631 ZEND_ME(Imagick, getImageProperty, arginfo_class_Imagick_getImageProperty, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x631 ZEND_ME(Imagick, setImageProperty, arginfo_class_Imagick_setImageProperty, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x631 ZEND_ME(Imagick, deleteImageProperty, arginfo_class_Imagick_deleteImageProperty, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x631 ZEND_ME(Imagick, identifyFormat, arginfo_class_Imagick_identifyFormat, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x631 && IM_HAVE_IMAGICK_SETIMAGEINTERPOLATEMETHOD +#if IM_HAVE_IMAGICK_SETIMAGEINTERPOLATEMETHOD ZEND_ME(Imagick, setImageInterpolateMethod, arginfo_class_Imagick_setImageInterpolateMethod, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x631 ZEND_ME(Imagick, getImageInterpolateMethod, arginfo_class_Imagick_getImageInterpolateMethod, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x631 ZEND_ME(Imagick, linearStretchImage, arginfo_class_Imagick_linearStretchImage, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x631 ZEND_ME(Imagick, getImageLength, arginfo_class_Imagick_getImageLength, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x631 ZEND_ME(Imagick, extentImage, arginfo_class_Imagick_extentImage, ZEND_ACC_PUBLIC) -#endif #if MagickLibVersion > 0x633 ZEND_ME(Imagick, getImageOrientation, arginfo_class_Imagick_getImageOrientation, ZEND_ACC_PUBLIC) #endif @@ -7013,37 +6663,24 @@ static const zend_function_entry class_Imagick_methods[] = { #if !defined(MAGICKCORE_EXCLUDE_DEPRECATED) && MagickLibVersion > 0x634 && MagickLibVersion < 0x700 ZEND_ME(Imagick, paintFloodfillImage, arginfo_class_Imagick_paintFloodfillImage, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED) #endif -#if MagickLibVersion > 0x635 ZEND_ME(Imagick, clutImage, arginfo_class_Imagick_clutImage, ZEND_ACC_PUBLIC) +#if MagickLibVersion >= 0x700 + ZEND_ME(Imagick, clutImageWithInterpolate, arginfo_class_Imagick_clutImageWithInterpolate, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x635 ZEND_ME(Imagick, getImageProperties, arginfo_class_Imagick_getImageProperties, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x635 ZEND_ME(Imagick, getImageProfiles, arginfo_class_Imagick_getImageProfiles, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x635 ZEND_ME(Imagick, distortImage, arginfo_class_Imagick_distortImage, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x635 ZEND_ME(Imagick, writeImageFile, arginfo_class_Imagick_writeImageFile, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x635 ZEND_ME(Imagick, writeImagesFile, arginfo_class_Imagick_writeImagesFile, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x635 ZEND_ME(Imagick, resetImagePage, arginfo_class_Imagick_resetImagePage, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x635 && MagickLibVersion < 0x700 +#if MagickLibVersion < 0x700 ZEND_ME(Imagick, setImageClipMask, arginfo_class_Imagick_setImageClipMask, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED) #endif -#if MagickLibVersion > 0x635 && MagickLibVersion < 0x700 +#if MagickLibVersion < 0x700 ZEND_ME(Imagick, getImageClipMask, arginfo_class_Imagick_getImageClipMask, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED) #endif -#if MagickLibVersion > 0x635 ZEND_ME(Imagick, animateImages, arginfo_class_Imagick_animateImages, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x635 && !defined(MAGICKCORE_EXCLUDE_DEPRECATED) && MagickLibVersion < 0x700 +#if !defined(MAGICKCORE_EXCLUDE_DEPRECATED) && MagickLibVersion < 0x700 ZEND_ME(Imagick, recolorImage, arginfo_class_Imagick_recolorImage, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED) #endif #if MagickLibVersion > 0x636 @@ -7435,20 +7072,40 @@ static const zend_function_entry class_Imagick_methods[] = { #if MagickLibVersion < 0x700 ZEND_ME(Imagick, setImageBiasQuantum, arginfo_class_Imagick_setImageBiasQuantum, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED) #endif +#if MagickLibVersion >= 0x700 + ZEND_ME(Imagick, setImageBluePrimary, arginfo_class_Imagick_setImageBluePrimary, ZEND_ACC_PUBLIC) +#endif +#if !(MagickLibVersion >= 0x700) ZEND_ME(Imagick, setImageBluePrimary, arginfo_class_Imagick_setImageBluePrimary, ZEND_ACC_PUBLIC) +#endif ZEND_ME(Imagick, setImageBorderColor, arginfo_class_Imagick_setImageBorderColor, ZEND_ACC_PUBLIC) ZEND_ME(Imagick, setImageChannelDepth, arginfo_class_Imagick_setImageChannelDepth, ZEND_ACC_PUBLIC) ZEND_ME(Imagick, setImageColormapColor, arginfo_class_Imagick_setImageColormapColor, ZEND_ACC_PUBLIC) ZEND_ME(Imagick, setImageColorspace, arginfo_class_Imagick_setImageColorspace, ZEND_ACC_PUBLIC) ZEND_ME(Imagick, setImageDispose, arginfo_class_Imagick_setImageDispose, ZEND_ACC_PUBLIC) ZEND_ME(Imagick, setImageExtent, arginfo_class_Imagick_setImageExtent, ZEND_ACC_PUBLIC) +#if MagickLibVersion >= 0x700 ZEND_ME(Imagick, setImageGreenPrimary, arginfo_class_Imagick_setImageGreenPrimary, ZEND_ACC_PUBLIC) +#endif +#if !(MagickLibVersion >= 0x700) + ZEND_ME(Imagick, setImageGreenPrimary, arginfo_class_Imagick_setImageGreenPrimary, ZEND_ACC_PUBLIC) +#endif ZEND_ME(Imagick, setImageInterlaceScheme, arginfo_class_Imagick_setImageInterlaceScheme, ZEND_ACC_PUBLIC) ZEND_ME(Imagick, setImageProfile, arginfo_class_Imagick_setImageProfile, ZEND_ACC_PUBLIC) +#if MagickLibVersion >= 0x700 + ZEND_ME(Imagick, setImageRedPrimary, arginfo_class_Imagick_setImageRedPrimary, ZEND_ACC_PUBLIC) +#endif +#if !(MagickLibVersion >= 0x700) ZEND_ME(Imagick, setImageRedPrimary, arginfo_class_Imagick_setImageRedPrimary, ZEND_ACC_PUBLIC) +#endif ZEND_ME(Imagick, setImageRenderingIntent, arginfo_class_Imagick_setImageRenderingIntent, ZEND_ACC_PUBLIC) ZEND_ME(Imagick, setImageVirtualPixelMethod, arginfo_class_Imagick_setImageVirtualPixelMethod, ZEND_ACC_PUBLIC) +#if MagickLibVersion >= 0x700 ZEND_ME(Imagick, setImageWhitePoint, arginfo_class_Imagick_setImageWhitePoint, ZEND_ACC_PUBLIC) +#endif +#if !(MagickLibVersion >= 0x700) + ZEND_ME(Imagick, setImageWhitePoint, arginfo_class_Imagick_setImageWhitePoint, ZEND_ACC_PUBLIC) +#endif ZEND_ME(Imagick, sigmoidalContrastImage, arginfo_class_Imagick_sigmoidalContrastImage, ZEND_ACC_PUBLIC) ZEND_ME(Imagick, stereoImage, arginfo_class_Imagick_stereoImage, ZEND_ACC_PUBLIC) ZEND_ME(Imagick, textureImage, arginfo_class_Imagick_textureImage, ZEND_ACC_PUBLIC) @@ -7499,187 +7156,167 @@ static const zend_function_entry class_Imagick_methods[] = { #if MagickLibVersion > 0x628 ZEND_MALIAS(Imagick, key, getIteratorIndex, arginfo_class_Imagick_key, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 ZEND_MALIAS(Imagick, next, nextImage, arginfo_class_Imagick_next, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x628 ZEND_MALIAS(Imagick, rewind, setFirstIterator, arginfo_class_Imagick_rewind, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x628 ZEND_ME(Imagick, valid, arginfo_class_Imagick_valid, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x628 ZEND_ME(Imagick, current, arginfo_class_Imagick_current, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x659 +#if MagickLibVersion >= 0x659 ZEND_ME(Imagick, brightnessContrastImage, arginfo_class_Imagick_brightnessContrastImage, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && MagickLibVersion > 0x661 +#if MagickLibVersion > 0x661 ZEND_ME(Imagick, colorMatrixImage, arginfo_class_Imagick_colorMatrixImage, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 ZEND_ME(Imagick, selectiveBlurImage, arginfo_class_Imagick_selectiveBlurImage, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x689 +#if MagickLibVersion >= 0x689 ZEND_ME(Imagick, rotationalBlurImage, arginfo_class_Imagick_rotationalBlurImage, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x683 +#if MagickLibVersion >= 0x683 ZEND_ME(Imagick, statisticImage, arginfo_class_Imagick_statisticImage, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x652 +#if MagickLibVersion >= 0x652 ZEND_ME(Imagick, subimageMatch, arginfo_class_Imagick_subimageMatch, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x652 +#if MagickLibVersion >= 0x652 ZEND_MALIAS(Imagick, similarityImage, subimageMatch, arginfo_class_Imagick_similarityImage, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 ZEND_ME(Imagick, setRegistry, arginfo_class_Imagick_setRegistry, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) -#endif -#if MagickLibVersion > 0x628 ZEND_ME(Imagick, getRegistry, arginfo_class_Imagick_getRegistry, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) -#endif -#if MagickLibVersion > 0x628 ZEND_ME(Imagick, listRegistry, arginfo_class_Imagick_listRegistry, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) -#endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x680 +#if MagickLibVersion >= 0x680 ZEND_ME(Imagick, morphology, arginfo_class_Imagick_morphology, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && defined(IMAGICK_WITH_KERNEL) && MagickLibVersion < 0x700 +#if defined(IMAGICK_WITH_KERNEL) && MagickLibVersion < 0x700 ZEND_ME(Imagick, filter, arginfo_class_Imagick_filter, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED) #endif -#if MagickLibVersion > 0x628 ZEND_ME(Imagick, setAntialias, arginfo_class_Imagick_setAntialias, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x628 ZEND_ME(Imagick, getAntialias, arginfo_class_Imagick_getAntialias, ZEND_ACC_PUBLIC) -#endif -#if MagickLibVersion > 0x628 && MagickLibVersion > 0x676 +#if MagickLibVersion > 0x676 ZEND_ME(Imagick, colorDecisionListImage, arginfo_class_Imagick_colorDecisionListImage, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x687 +#if MagickLibVersion >= 0x687 ZEND_ME(Imagick, optimizeImageTransparency, arginfo_class_Imagick_optimizeImageTransparency, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x660 +#if MagickLibVersion >= 0x660 ZEND_ME(Imagick, autoGammaImage, arginfo_class_Imagick_autoGammaImage, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x692 +#if MagickLibVersion >= 0x692 ZEND_ME(Imagick, autoOrient, arginfo_class_Imagick_autoOrient, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x692 +#if MagickLibVersion >= 0x692 ZEND_MALIAS(Imagick, autoOrientate, autoOrient, arginfo_class_Imagick_autoOrientate, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x692 +#if MagickLibVersion >= 0x692 ZEND_ME(Imagick, compositeImageGravity, arginfo_class_Imagick_compositeImageGravity, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x693 +#if MagickLibVersion >= 0x693 ZEND_ME(Imagick, localContrastImage, arginfo_class_Imagick_localContrastImage, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x700 +#if MagickLibVersion >= 0x700 ZEND_ME(Imagick, identifyImageType, arginfo_class_Imagick_identifyImageType, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GETSETIMAGEMASK +#if IM_HAVE_IMAGICK_GETSETIMAGEMASK ZEND_ME(Imagick, getImageMask, arginfo_class_Imagick_getImageMask, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GETSETIMAGEMASK +#if IM_HAVE_IMAGICK_GETSETIMAGEMASK ZEND_ME(Imagick, setImageMask, arginfo_class_Imagick_setImageMask, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x709 +#if IM_HAVE_IMAGICK_CANNYEDGEIMAGE ZEND_ME(Imagick, cannyEdgeImage, arginfo_class_Imagick_cannyEdgeImage, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_SETSEED +#if IM_HAVE_IMAGICK_SETSEED ZEND_ME(Imagick, setSeed, arginfo_class_Imagick_setSeed, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_WAVELETDENOISEIMAGE +#if IM_HAVE_IMAGICK_WAVELETDENOISEIMAGE ZEND_ME(Imagick, waveletDenoiseImage, arginfo_class_Imagick_waveletDenoiseImage, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_MEANSHIFTIMAGE +#if IM_HAVE_IMAGICK_MEANSHIFTIMAGE ZEND_ME(Imagick, meanShiftImage, arginfo_class_Imagick_meanShiftImage, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_KMEANSIMAGE +#if IM_HAVE_IMAGICK_KMEANSIMAGE ZEND_ME(Imagick, kmeansImage, arginfo_class_Imagick_kmeansImage, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_RANGETHRESHOLDIMAGE +#if IM_HAVE_IMAGICK_RANGETHRESHOLDIMAGE ZEND_ME(Imagick, rangeThresholdImage, arginfo_class_Imagick_rangeThresholdImage, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_AUTOTHRESHOLDIMAGE +#if IM_HAVE_IMAGICK_AUTOTHRESHOLDIMAGE ZEND_ME(Imagick, autoThresholdImage, arginfo_class_Imagick_autoThresholdImage, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_BILATERALBLURIMAGE +#if IM_HAVE_IMAGICK_BILATERALBLURIMAGE ZEND_ME(Imagick, bilateralBlurImage, arginfo_class_Imagick_bilateralBlurImage, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_CLAHEIMAGE +#if IM_HAVE_IMAGICK_CLAHEIMAGE ZEND_ME(Imagick, claheImage, arginfo_class_Imagick_claheImage, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_CHANNELFXIMAGE +#if IM_HAVE_IMAGICK_CHANNELFXIMAGE ZEND_ME(Imagick, channelFxImage, arginfo_class_Imagick_channelFxImage, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_COLORTHRESHOLDIMAGE +#if IM_HAVE_IMAGICK_COLORTHRESHOLDIMAGE ZEND_ME(Imagick, colorThresholdImage, arginfo_class_Imagick_colorThresholdImage, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_COMPLEXIMAGES +#if IM_HAVE_IMAGICK_COMPLEXIMAGES ZEND_ME(Imagick, complexImages, arginfo_class_Imagick_complexImages, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_INTERPOLATIVERESIZEIMAGE +#if IM_HAVE_IMAGICK_INTERPOLATIVERESIZEIMAGE ZEND_ME(Imagick, interpolativeResizeImage, arginfo_class_Imagick_interpolativeResizeImage, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_LEVELIMAGECOLORS +#if IM_HAVE_IMAGICK_LEVELIMAGECOLORS ZEND_ME(Imagick, levelImageColors, arginfo_class_Imagick_levelImageColors, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_LEVELIZEIMAGE +#if IM_HAVE_IMAGICK_LEVELIZEIMAGE ZEND_ME(Imagick, levelizeImage, arginfo_class_Imagick_levelizeImage, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_ORDEREDDITHERIMAGE +#if IM_HAVE_IMAGICK_ORDEREDDITHERIMAGE ZEND_ME(Imagick, orderedDitherImage, arginfo_class_Imagick_orderedDitherImage, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_WHITEBALANCEIMAGE +#if IM_HAVE_IMAGICK_WHITEBALANCEIMAGE ZEND_ME(Imagick, whiteBalanceImage, arginfo_class_Imagick_whiteBalanceImage, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_DELETE_OPTION +#if IM_HAVE_IMAGICK_DELETE_OPTION ZEND_ME(Imagick, deleteOption, arginfo_class_Imagick_deleteOption, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_BACKGROUND_COLOR +#if IM_HAVE_IMAGICK_GET_BACKGROUND_COLOR ZEND_ME(Imagick, getBackgroundColor, arginfo_class_Imagick_getBackgroundColor, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_IMAGE_ARTIFACTS +#if IM_HAVE_IMAGICK_GET_IMAGE_ARTIFACTS ZEND_ME(Imagick, getImageArtifacts, arginfo_class_Imagick_getImageArtifacts, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_IMAGE_KURTOSIS +#if IM_HAVE_IMAGICK_GET_IMAGE_KURTOSIS ZEND_ME(Imagick, getImageKurtosis, arginfo_class_Imagick_getImageKurtosis, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_IMAGE_MEAN +#if IM_HAVE_IMAGICK_GET_IMAGE_MEAN ZEND_ME(Imagick, getImageMean, arginfo_class_Imagick_getImageMean, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_IMAGE_RANGE +#if IM_HAVE_IMAGICK_GET_IMAGE_RANGE ZEND_ME(Imagick, getImageRange, arginfo_class_Imagick_getImageRange, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_INTERPOLATE_METHOD +#if IM_HAVE_IMAGICK_GET_INTERPOLATE_METHOD ZEND_ME(Imagick, getInterpolateMethod, arginfo_class_Imagick_getInterpolateMethod, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_OPTIONS +#if IM_HAVE_IMAGICK_GET_OPTIONS ZEND_ME(Imagick, getOptions, arginfo_class_Imagick_getOptions, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_ORIENTATION +#if IM_HAVE_IMAGICK_GET_ORIENTATION ZEND_ME(Imagick, getOrientation, arginfo_class_Imagick_getOrientation, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_RESOLUTION +#if IM_HAVE_IMAGICK_GET_RESOLUTION ZEND_ME(Imagick, getResolution, arginfo_class_Imagick_getResolution, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_TYPE +#if IM_HAVE_IMAGICK_GET_TYPE ZEND_ME(Imagick, getType, arginfo_class_Imagick_getType, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_POLYNOMIAL_IMAGE +#if IM_HAVE_IMAGICK_POLYNOMIAL_IMAGE ZEND_ME(Imagick, polynomialImage, arginfo_class_Imagick_polynomialImage, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_SET_DEPTH +#if IM_HAVE_IMAGICK_SET_DEPTH ZEND_ME(Imagick, setDepth, arginfo_class_Imagick_setDepth, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_SET_EXTRACT +#if IM_HAVE_IMAGICK_SET_EXTRACT ZEND_ME(Imagick, setExtract, arginfo_class_Imagick_setExtract, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_SET_INTERPOLATE_METHOD +#if IM_HAVE_IMAGICK_SET_INTERPOLATE_METHOD ZEND_ME(Imagick, setInterpolateMethod, arginfo_class_Imagick_setInterpolateMethod, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_SET_ORIENTATION +#if IM_HAVE_IMAGICK_SET_ORIENTATION ZEND_ME(Imagick, setOrientation, arginfo_class_Imagick_setOrientation, ZEND_ACC_PUBLIC) #endif ZEND_FE_END diff --git a/imagick_class.c b/imagick_class.c index e0964b34..28423362 100644 --- a/imagick_class.c +++ b/imagick_class.c @@ -13275,7 +13275,7 @@ PHP_METHOD(Imagick, colorDecisionListImage) #endif #if MagickLibVersion >= 0x687 -/* {{{ proto Imagick Imagick::optimizeimagetransparency() +/* {{{ proto void Imagick::optimizeimagetransparency() Takes a frame optimized GIF animation, and compares the overlayed pixels against the disposal image resulting fr */ PHP_METHOD(Imagick, optimizeImageTransparency)