From 0d9216c478a2e0043d446fa3ea68c0d79795414f Mon Sep 17 00:00:00 2001 From: Mikhail Galanin Date: Thu, 16 Mar 2023 10:45:58 +0000 Subject: [PATCH] Imagick::getRegistry() may return false --- Imagick.stub.php | 2 +- Imagick_arginfo.h | 1104 ++++++++++++++++++++++++++++++--------------- imagick_class.c | 2 +- 3 files changed, 742 insertions(+), 366 deletions(-) diff --git a/Imagick.stub.php b/Imagick.stub.php index 2130a2b6..f67f10b1 100644 --- a/Imagick.stub.php +++ b/Imagick.stub.php @@ -1322,7 +1322,7 @@ public function similarityImage(Imagick $image, ?array &$offset = null, ?float & public static function setRegistry(string $key, string $value): bool {} - public static function getRegistry(string $key): string {} + public static function getRegistry(string $key): string|false {} public static function listRegistry(): array {} diff --git a/Imagick_arginfo.h b/Imagick_arginfo.h index 7ce549f3..13d1aba4 100644 --- a/Imagick_arginfo.h +++ b/Imagick_arginfo.h @@ -2,6 +2,7 @@ * 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) @@ -10,7 +11,9 @@ 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) @@ -25,7 +28,9 @@ 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) @@ -40,7 +45,9 @@ 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) @@ -62,11 +69,17 @@ 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 +#endif +#if MagickLibVersion > 0x628 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_trimImage, 0, 1, _IS_BOOL, 0) @@ -81,7 +94,9 @@ 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) @@ -102,8 +117,9 @@ 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 >= 0x700 +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x700 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_waveImageWithMethod, 0, 3, _IS_BOOL, 0) @@ -132,6 +148,7 @@ 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) @@ -164,10 +181,13 @@ 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 -#if !defined(MAGICKCORE_EXCLUDE_DEPRECATED) && MagickLibVersion < 0x700 +#if MagickLibVersion > 0x628 && !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) @@ -178,6 +198,7 @@ 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) @@ -192,7 +213,9 @@ 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) @@ -227,7 +250,9 @@ 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) @@ -254,7 +279,9 @@ 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) @@ -281,7 +308,9 @@ 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) @@ -290,7 +319,9 @@ 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) @@ -317,7 +348,9 @@ 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) @@ -339,7 +372,9 @@ 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) @@ -361,9 +396,13 @@ 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) @@ -385,7 +424,9 @@ 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) @@ -421,9 +462,13 @@ 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) @@ -438,10 +483,13 @@ 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 < 0x700 +#if MagickLibVersion > 0x628 && MagickLibVersion < 0x700 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Imagick_transformImage, 0, 2, Imagick, 0) @@ -481,7 +529,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setImageOpacity, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion >= 0x700 +#if MagickLibVersion > 0x630 && MagickLibVersion >= 0x700 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_setImageAlpha, 0, 1, _IS_BOOL, 0) @@ -498,7 +546,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setImageAlpha, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion < 0x700 +#if MagickLibVersion > 0x630 && MagickLibVersion < 0x700 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_orderedPosterizeImage, 0, 1, _IS_BOOL, 0) @@ -546,6 +594,7 @@ 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) @@ -561,7 +610,9 @@ 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) @@ -576,7 +627,9 @@ 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) @@ -597,7 +650,9 @@ 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) @@ -612,7 +667,9 @@ 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) @@ -627,8 +684,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_identifyFormat, 0, 0, 1) ZEND_ARG_INFO(0, format) #endif ZEND_END_ARG_INFO() +#endif -#if IM_HAVE_IMAGICK_SETIMAGEINTERPOLATEMETHOD +#if MagickLibVersion > 0x631 && 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) @@ -645,8 +703,18 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setImageInterpolateMethod, 0, 0, 1) 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_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 +#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) @@ -667,9 +735,13 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_linearStretchImage, 0, 0, 2) ZEND_ARG_INFO(0, white_point) #endif ZEND_END_ARG_INFO() +#endif -#define arginfo_class_Imagick_getImageLength arginfo_class_Imagick_getSizeOffset +#if MagickLibVersion > 0x631 +#define arginfo_class_Imagick_getImageLength arginfo_class_Imagick_getImageInterpolateMethod +#endif +#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) @@ -702,6 +774,7 @@ 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 @@ -763,6 +836,7 @@ 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) @@ -773,25 +847,9 @@ 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) @@ -808,9 +866,13 @@ 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) @@ -837,7 +899,9 @@ 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) @@ -859,9 +923,13 @@ 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) @@ -876,8 +944,9 @@ 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 < 0x700 +#if MagickLibVersion > 0x635 && MagickLibVersion < 0x700 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_setImageClipMask, 0, 1, _IS_BOOL, 0) @@ -889,7 +958,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setImageClipMask, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion < 0x700 +#if MagickLibVersion > 0x635 && MagickLibVersion < 0x700 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Imagick_getImageClipMask, 0, 0, Imagick, 0) @@ -900,6 +969,7 @@ 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) @@ -914,8 +984,9 @@ 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 !defined(MAGICKCORE_EXCLUDE_DEPRECATED) && MagickLibVersion < 0x700 +#if MagickLibVersion > 0x635 && !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) @@ -1866,7 +1937,40 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setImageFormat, 0, 0, 1) #endif ZEND_END_ARG_INFO() -#define arginfo_class_Imagick_scaleImage arginfo_class_Imagick_adaptiveResizeImage + +#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() #if PHP_VERSION_ID >= 80000 @@ -1905,7 +2009,27 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_writeImages, 0, 0, 2) #endif ZEND_END_ARG_INFO() -#define arginfo_class_Imagick_blurImage arginfo_class_Imagick_adaptiveBlurImage + +#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() #if PHP_VERSION_ID >= 80000 @@ -1985,11 +2109,18 @@ ZEND_END_ARG_INFO() #define arginfo_class_Imagick_getImageMimeType arginfo_class_Imagick___toString -#define arginfo_class_Imagick_removeImage arginfo_class_Imagick_optimizeImageLayers -#define arginfo_class_Imagick_destroy arginfo_class_Imagick_optimizeImageLayers +#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_optimizeImageLayers +#define arginfo_class_Imagick_clear arginfo_class_Imagick_removeImage #if PHP_VERSION_ID >= 80000 @@ -2000,15 +2131,22 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_clone, 0, 0, 0) ZEND_END_ARG_INFO() -#define arginfo_class_Imagick_getImageSize arginfo_class_Imagick_getSizeOffset + +#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 + +ZEND_END_ARG_INFO() #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_optimizeImageLayers +#define arginfo_class_Imagick_setFirstIterator arginfo_class_Imagick_removeImage -#define arginfo_class_Imagick_setLastIterator arginfo_class_Imagick_optimizeImageLayers +#define arginfo_class_Imagick_setLastIterator arginfo_class_Imagick_removeImage #if PHP_VERSION_ID >= 80000 @@ -2019,17 +2157,30 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_resetIterator, 0, 0, 0) ZEND_END_ARG_INFO() -#define arginfo_class_Imagick_previousImage arginfo_class_Imagick_optimizeImageLayers +#define arginfo_class_Imagick_previousImage arginfo_class_Imagick_removeImage + +#define arginfo_class_Imagick_nextImage arginfo_class_Imagick_removeImage -#define arginfo_class_Imagick_nextImage arginfo_class_Imagick_optimizeImageLayers +#define arginfo_class_Imagick_hasPreviousImage arginfo_class_Imagick_removeImage -#define arginfo_class_Imagick_hasPreviousImage arginfo_class_Imagick_optimizeImageLayers +#define arginfo_class_Imagick_hasNextImage arginfo_class_Imagick_removeImage -#define arginfo_class_Imagick_hasNextImage arginfo_class_Imagick_optimizeImageLayers -#define arginfo_class_Imagick_setImageIndex arginfo_class_Imagick_setIteratorIndex +#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_getImageIndex arginfo_class_Imagick_getSizeOffset +#define arginfo_class_Imagick_getImageIndex arginfo_class_Imagick_getImageSize #if PHP_VERSION_ID >= 80000 @@ -2046,7 +2197,38 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_commentImage, 0, 0, 1) #endif ZEND_END_ARG_INFO() -#define arginfo_class_Imagick_cropImage arginfo_class_Imagick_extentImage + +#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() #if PHP_VERSION_ID >= 80000 @@ -2097,7 +2279,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_getSizeOffset +#define arginfo_class_Imagick_getImageCompressionQuality arginfo_class_Imagick_getImageSize #if PHP_VERSION_ID >= 80000 @@ -2114,7 +2296,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_getSizeOffset +#define arginfo_class_Imagick_getImageCompression arginfo_class_Imagick_getImageSize #if PHP_VERSION_ID >= 80000 @@ -2206,7 +2388,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_getSizeOffset +#define arginfo_class_Imagick_getImageColors arginfo_class_Imagick_getImageSize #if PHP_VERSION_ID >= 80000 @@ -2798,7 +2980,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_extentImage +#define arginfo_class_Imagick_setImagePage arginfo_class_Imagick_cropImage #define arginfo_class_Imagick_setImageProgressMonitor arginfo_class_Imagick_readImage @@ -2900,7 +3082,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_adaptiveBlurImage +#define arginfo_class_Imagick_sharpenImage arginfo_class_Imagick_blurImage #define arginfo_class_Imagick_shaveImage arginfo_class_Imagick_sampleImage @@ -2926,11 +3108,31 @@ 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_extentImage +#define arginfo_class_Imagick_spliceImage arginfo_class_Imagick_cropImage #define arginfo_class_Imagick_pingImage arginfo_class_Imagick_readImage -#define arginfo_class_Imagick_readImageFile arginfo_class_Imagick_pingImageFile + +#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() #if PHP_VERSION_ID >= 80000 @@ -3012,7 +3214,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_optimizeImageLayers +#define arginfo_class_Imagick_stripImage arginfo_class_Imagick_removeImage #if PHP_VERSION_ID >= 80000 @@ -3159,7 +3361,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_optimizeImageLayers +#define arginfo_class_Imagick_minifyImage arginfo_class_Imagick_removeImage #if PHP_VERSION_ID >= 80000 @@ -3265,9 +3467,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_extentImage +#define arginfo_class_Imagick_chopImage arginfo_class_Imagick_cropImage -#define arginfo_class_Imagick_clipImage arginfo_class_Imagick_optimizeImageLayers +#define arginfo_class_Imagick_clipImage arginfo_class_Imagick_removeImage #if PHP_VERSION_ID >= 80000 @@ -3463,15 +3665,15 @@ ZEND_END_ARG_INFO() #define arginfo_class_Imagick_deconstructImages arginfo_class_Imagick_clone -#define arginfo_class_Imagick_despeckleImage arginfo_class_Imagick_optimizeImageLayers +#define arginfo_class_Imagick_despeckleImage arginfo_class_Imagick_removeImage #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_optimizeImageLayers +#define arginfo_class_Imagick_enhanceImage arginfo_class_Imagick_removeImage -#define arginfo_class_Imagick_equalizeImage arginfo_class_Imagick_optimizeImageLayers +#define arginfo_class_Imagick_equalizeImage arginfo_class_Imagick_removeImage #if PHP_VERSION_ID >= 80000 @@ -3514,9 +3716,9 @@ ZEND_END_ARG_INFO() #define arginfo_class_Imagick_flattenImages arginfo_class_Imagick_clone -#define arginfo_class_Imagick_flipImage arginfo_class_Imagick_optimizeImageLayers +#define arginfo_class_Imagick_flipImage arginfo_class_Imagick_removeImage -#define arginfo_class_Imagick_flopImage arginfo_class_Imagick_optimizeImageLayers +#define arginfo_class_Imagick_flopImage arginfo_class_Imagick_removeImage #if MagickLibVersion >= 0x655 @@ -3643,7 +3845,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_adaptiveBlurImage +#define arginfo_class_Imagick_gaussianBlurImage arginfo_class_Imagick_blurImage #if MagickLibVersion < 0x700 && !defined(MAGICKCORE_EXCLUDE_DEPRECATED) @@ -3761,13 +3963,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_getSizeOffset +#define arginfo_class_Imagick_getImageColorspace arginfo_class_Imagick_getImageSize -#define arginfo_class_Imagick_getImageCompose arginfo_class_Imagick_getSizeOffset +#define arginfo_class_Imagick_getImageCompose arginfo_class_Imagick_getImageSize -#define arginfo_class_Imagick_getImageDelay arginfo_class_Imagick_getSizeOffset +#define arginfo_class_Imagick_getImageDelay arginfo_class_Imagick_getImageSize -#define arginfo_class_Imagick_getImageDepth arginfo_class_Imagick_getSizeOffset +#define arginfo_class_Imagick_getImageDepth arginfo_class_Imagick_getImageSize #if PHP_VERSION_ID >= 80000 @@ -3796,7 +3998,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_getSizeOffset +#define arginfo_class_Imagick_getImageDispose arginfo_class_Imagick_getImageSize #if PHP_VERSION_ID >= 80000 @@ -3809,13 +4011,13 @@ ZEND_END_ARG_INFO() #define arginfo_class_Imagick_getImageGreenPrimary arginfo_class_Imagick_getImageGeometry -#define arginfo_class_Imagick_getImageHeight arginfo_class_Imagick_getSizeOffset +#define arginfo_class_Imagick_getImageHeight arginfo_class_Imagick_getImageSize #define arginfo_class_Imagick_getImageHistogram arginfo_class_Imagick_getImageGeometry -#define arginfo_class_Imagick_getImageInterlaceScheme arginfo_class_Imagick_getSizeOffset +#define arginfo_class_Imagick_getImageInterlaceScheme arginfo_class_Imagick_getImageSize -#define arginfo_class_Imagick_getImageIterations arginfo_class_Imagick_getSizeOffset +#define arginfo_class_Imagick_getImageIterations arginfo_class_Imagick_getImageSize #if MagickLibVersion < 0x700 @@ -3875,31 +4077,44 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setImagePixelColor, 0, 0, 3) ZEND_END_ARG_INFO() #endif -#define arginfo_class_Imagick_getImageProfile arginfo_class_Imagick_getImageProperty + +#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_getImageRedPrimary arginfo_class_Imagick_getImageGeometry -#define arginfo_class_Imagick_getImageRenderingIntent arginfo_class_Imagick_getSizeOffset +#define arginfo_class_Imagick_getImageRenderingIntent arginfo_class_Imagick_getImageSize #define arginfo_class_Imagick_getImageResolution arginfo_class_Imagick_getImageGeometry -#define arginfo_class_Imagick_getImageScene arginfo_class_Imagick_getSizeOffset +#define arginfo_class_Imagick_getImageScene arginfo_class_Imagick_getImageSize #define arginfo_class_Imagick_getImageSignature arginfo_class_Imagick___toString -#define arginfo_class_Imagick_getImageTicksPerSecond arginfo_class_Imagick_getSizeOffset +#define arginfo_class_Imagick_getImageTicksPerSecond arginfo_class_Imagick_getImageSize -#define arginfo_class_Imagick_getImageType arginfo_class_Imagick_getSizeOffset +#define arginfo_class_Imagick_getImageType arginfo_class_Imagick_getImageSize -#define arginfo_class_Imagick_getImageUnits arginfo_class_Imagick_getSizeOffset +#define arginfo_class_Imagick_getImageUnits arginfo_class_Imagick_getImageSize -#define arginfo_class_Imagick_getImageVirtualPixelMethod arginfo_class_Imagick_getSizeOffset +#define arginfo_class_Imagick_getImageVirtualPixelMethod arginfo_class_Imagick_getImageSize #define arginfo_class_Imagick_getImageWhitePoint arginfo_class_Imagick_getImageGeometry -#define arginfo_class_Imagick_getImageWidth arginfo_class_Imagick_getSizeOffset +#define arginfo_class_Imagick_getImageWidth arginfo_class_Imagick_getImageSize -#define arginfo_class_Imagick_getNumberImages arginfo_class_Imagick_getSizeOffset +#define arginfo_class_Imagick_getNumberImages arginfo_class_Imagick_getImageSize #define arginfo_class_Imagick_getImageTotalInkDensity arginfo_class_Imagick_getImageGamma @@ -4007,7 +4222,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_optimizeImageLayers +#define arginfo_class_Imagick_magnifyImage arginfo_class_Imagick_removeImage #if !defined(MAGICKCORE_EXCLUDE_DEPRECATED) && MagickLibVersion < 0x700 @@ -4234,7 +4449,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_getImageProperty +#define arginfo_class_Imagick_removeImageProfile arginfo_class_Imagick_getImageProfile #if PHP_VERSION_ID >= 80000 @@ -4300,36 +4515,6 @@ 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, 3, _IS_BOOL, 0) -#else -ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setImageBluePrimary, 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, z, IS_DOUBLE, 0) -#else - ZEND_ARG_INFO(0, z) -#endif -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) @@ -4350,7 +4535,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setImageBluePrimary, 0, 0, 2) ZEND_ARG_INFO(0, y) #endif ZEND_END_ARG_INFO() -#endif #if PHP_VERSION_ID >= 80000 @@ -4431,13 +4615,7 @@ 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 @@ -4475,13 +4653,7 @@ 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 @@ -4513,13 +4685,7 @@ 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 @@ -4691,9 +4857,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_getSizeOffset +#define arginfo_class_Imagick_getCompression arginfo_class_Imagick_getImageSize -#define arginfo_class_Imagick_getCompressionQuality arginfo_class_Imagick_getSizeOffset +#define arginfo_class_Imagick_getCompressionQuality arginfo_class_Imagick_getImageSize #define arginfo_class_Imagick_getCopyright arginfo_class_Imagick___toString @@ -4716,7 +4882,7 @@ ZEND_END_ARG_INFO() #define arginfo_class_Imagick_getHomeURL arginfo_class_Imagick___toString -#define arginfo_class_Imagick_getInterlaceScheme arginfo_class_Imagick_getSizeOffset +#define arginfo_class_Imagick_getInterlaceScheme arginfo_class_Imagick_getImageSize #if PHP_VERSION_ID >= 80000 @@ -4737,9 +4903,9 @@ ZEND_END_ARG_INFO() #define arginfo_class_Imagick_getPage arginfo_class_Imagick_getImageGeometry -#define arginfo_class_Imagick_getQuantum arginfo_class_Imagick_getSizeOffset +#define arginfo_class_Imagick_getQuantum arginfo_class_Imagick_getImageSize -#define arginfo_class_Imagick_getHdriEnabled arginfo_class_Imagick_optimizeImageLayers +#define arginfo_class_Imagick_getHdriEnabled arginfo_class_Imagick_removeImage #define arginfo_class_Imagick_getQuantumDepth arginfo_class_Imagick_getImageGeometry @@ -4803,7 +4969,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_extentImage +#define arginfo_class_Imagick_setPage arginfo_class_Imagick_cropImage #if PHP_VERSION_ID >= 80000 @@ -4861,30 +5027,34 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setType, 0, 0, 1) ZEND_END_ARG_INFO() #if MagickLibVersion > 0x628 - -#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) +#define arginfo_class_Imagick_key arginfo_class_Imagick_getSizeOffset #endif -ZEND_END_ARG_INFO() -#endif - -#if (PHP_VERSION_ID >= 80100) +#if MagickLibVersion > 0x628 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() +#endif +#if MagickLibVersion > 0x628 #define arginfo_class_Imagick_rewind arginfo_class_Imagick_next +#endif +#if MagickLibVersion > 0x628 #define arginfo_class_Imagick_valid arginfo_class_Imagick_optimizeImageLayers +#endif -#define arginfo_class_Imagick_current arginfo_class_Imagick_clone +#if MagickLibVersion > 0x628 -#if MagickLibVersion >= 0x659 +#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 + +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x659 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_brightnessContrastImage, 0, 2, _IS_BOOL, 0) @@ -4908,7 +5078,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_brightnessContrastImage, 0, 0, 2) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion > 0x661 +#if MagickLibVersion > 0x628 && MagickLibVersion > 0x661 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_colorMatrixImage, 0, 1, _IS_BOOL, 0) @@ -4925,6 +5095,7 @@ 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) @@ -4952,8 +5123,9 @@ 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 >= 0x689 +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x689 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_rotationalBlurImage, 0, 1, _IS_BOOL, 0) @@ -4971,7 +5143,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_rotationalBlurImage, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion >= 0x683 +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x683 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_statisticImage, 0, 3, _IS_BOOL, 0) @@ -5001,7 +5173,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_statisticImage, 0, 0, 3) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion >= 0x652 +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x652 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Imagick_subimageMatch, 0, 1, Imagick, 0) @@ -5035,17 +5207,62 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_subimageMatch, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion >= 0x652 +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x652 #define arginfo_class_Imagick_similarityImage arginfo_class_Imagick_subimageMatch #endif -#define arginfo_class_Imagick_setRegistry arginfo_class_Imagick_setOption +#if MagickLibVersion > 0x628 -#define arginfo_class_Imagick_getRegistry arginfo_class_Imagick_getOption +#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 -#define arginfo_class_Imagick_listRegistry arginfo_class_Imagick_getImageGeometry + +#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 -#if MagickLibVersion >= 0x680 +#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) +#else + ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_getRegistry, 0, 0, 1) +#endif + + +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) +#else + ZEND_ARG_INFO(0, key) +#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_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 PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_morphology, 0, 3, _IS_BOOL, 0) @@ -5070,7 +5287,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_morphology, 0, 0, 3) ZEND_END_ARG_INFO() #endif -#if defined(IMAGICK_WITH_KERNEL) && MagickLibVersion < 0x700 +#if MagickLibVersion > 0x628 && 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) @@ -5083,6 +5300,7 @@ 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) @@ -5097,10 +5315,13 @@ 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 -#if MagickLibVersion > 0x676 +#if MagickLibVersion > 0x628 && MagickLibVersion > 0x676 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_colorDecisionListImage, 0, 1, _IS_BOOL, 0) @@ -5117,7 +5338,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_colorDecisionListImage, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion >= 0x687 +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x687 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_optimizeImageTransparency, 0, 0, IS_VOID, 0) @@ -5128,7 +5349,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_optimizeImageTransparency, 0, 0, 0) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion >= 0x660 +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x660 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_autoGammaImage, 0, 0, IS_VOID, 0) @@ -5140,7 +5361,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_autoGammaImage, 0, 0, 0) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion >= 0x692 +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x692 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_autoOrient, 0, 0, IS_VOID, 0) @@ -5151,11 +5372,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_autoOrient, 0, 0, 0) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion >= 0x692 +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x692 #define arginfo_class_Imagick_autoOrientate arginfo_class_Imagick_autoOrient #endif -#if MagickLibVersion >= 0x692 +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x692 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_compositeImageGravity, 0, 3, _IS_BOOL, 0) @@ -5179,7 +5400,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_compositeImageGravity, 0, 0, 3) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion >= 0x693 +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x693 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_localContrastImage, 0, 2, IS_VOID, 0) @@ -5202,7 +5423,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_localContrastImage, 0, 0, 2) ZEND_END_ARG_INFO() #endif -#if MagickLibVersion >= 0x700 +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x700 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_identifyImageType, 0, 0, IS_LONG, 0) @@ -5213,7 +5434,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_identifyImageType, 0, 0, 0) ZEND_END_ARG_INFO() #endif -#if IM_HAVE_IMAGICK_GETSETIMAGEMASK +#if MagickLibVersion > 0x628 && 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) @@ -5230,7 +5451,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_getImageMask, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if IM_HAVE_IMAGICK_GETSETIMAGEMASK +#if MagickLibVersion > 0x628 && 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) @@ -5248,7 +5469,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setImageMask, 0, 0, 2) ZEND_END_ARG_INFO() #endif -#if IM_HAVE_IMAGICK_CANNYEDGEIMAGE +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x709 #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_cannyEdgeImage, 0, 4, _IS_BOOL, 0) @@ -5283,7 +5504,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_cannyEdgeImage, 0, 0, 4) ZEND_END_ARG_INFO() #endif -#if IM_HAVE_IMAGICK_SETSEED +#if MagickLibVersion > 0x628 && 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) @@ -5300,7 +5521,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setSeed, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if IM_HAVE_IMAGICK_WAVELETDENOISEIMAGE +#if MagickLibVersion > 0x628 && 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) @@ -5323,7 +5544,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_waveletDenoiseImage, 0, 0, 2) ZEND_END_ARG_INFO() #endif -#if IM_HAVE_IMAGICK_MEANSHIFTIMAGE +#if MagickLibVersion > 0x628 && 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) @@ -5352,7 +5573,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_meanShiftImage, 0, 0, 3) ZEND_END_ARG_INFO() #endif -#if IM_HAVE_IMAGICK_KMEANSIMAGE +#if MagickLibVersion > 0x628 && 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) @@ -5381,7 +5602,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_kmeansImage, 0, 0, 3) ZEND_END_ARG_INFO() #endif -#if IM_HAVE_IMAGICK_RANGETHRESHOLDIMAGE +#if MagickLibVersion > 0x628 && 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) @@ -5416,7 +5637,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_rangeThresholdImage, 0, 0, 4) ZEND_END_ARG_INFO() #endif -#if IM_HAVE_IMAGICK_AUTOTHRESHOLDIMAGE +#if MagickLibVersion > 0x628 && 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) @@ -5433,7 +5654,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_autoThresholdImage, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if IM_HAVE_IMAGICK_BILATERALBLURIMAGE +#if MagickLibVersion > 0x628 && 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) @@ -5468,7 +5689,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_bilateralBlurImage, 0, 0, 4) ZEND_END_ARG_INFO() #endif -#if IM_HAVE_IMAGICK_CLAHEIMAGE +#if MagickLibVersion > 0x628 && 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) @@ -5503,7 +5724,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_claheImage, 0, 0, 4) ZEND_END_ARG_INFO() #endif -#if IM_HAVE_IMAGICK_CHANNELFXIMAGE +#if MagickLibVersion > 0x628 && 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) @@ -5520,7 +5741,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_channelFxImage, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if IM_HAVE_IMAGICK_COLORTHRESHOLDIMAGE +#if MagickLibVersion > 0x628 && 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) @@ -5533,7 +5754,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_colorThresholdImage, 0, 0, 2) ZEND_END_ARG_INFO() #endif -#if IM_HAVE_IMAGICK_COMPLEXIMAGES +#if MagickLibVersion > 0x628 && 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) @@ -5550,7 +5771,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_complexImages, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if IM_HAVE_IMAGICK_INTERPOLATIVERESIZEIMAGE +#if MagickLibVersion > 0x628 && 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) @@ -5579,7 +5800,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_interpolativeResizeImage, 0, 0, 3) ZEND_END_ARG_INFO() #endif -#if IM_HAVE_IMAGICK_LEVELIMAGECOLORS +#if MagickLibVersion > 0x628 && 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) @@ -5598,7 +5819,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_levelImageColors, 0, 0, 3) ZEND_END_ARG_INFO() #endif -#if IM_HAVE_IMAGICK_LEVELIZEIMAGE +#if MagickLibVersion > 0x628 && 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) @@ -5627,7 +5848,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_levelizeImage, 0, 0, 3) ZEND_END_ARG_INFO() #endif -#if IM_HAVE_IMAGICK_ORDEREDDITHERIMAGE +#if MagickLibVersion > 0x628 && 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) @@ -5644,7 +5865,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_orderedDitherImage, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if IM_HAVE_IMAGICK_WHITEBALANCEIMAGE +#if MagickLibVersion > 0x628 && 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) @@ -5655,7 +5876,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_whiteBalanceImage, 0, 0, 0) ZEND_END_ARG_INFO() #endif -#if IM_HAVE_IMAGICK_DELETE_OPTION +#if MagickLibVersion > 0x628 && 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) @@ -5672,7 +5893,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_deleteOption, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if IM_HAVE_IMAGICK_GET_BACKGROUND_COLOR +#if MagickLibVersion > 0x628 && 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) @@ -5683,7 +5904,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_getBackgroundColor, 0, 0, 0) ZEND_END_ARG_INFO() #endif -#if IM_HAVE_IMAGICK_GET_IMAGE_ARTIFACTS +#if MagickLibVersion > 0x628 && 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) @@ -5695,7 +5916,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_getImageArtifacts, 0, 0, 0) ZEND_END_ARG_INFO() #endif -#if IM_HAVE_IMAGICK_GET_IMAGE_KURTOSIS +#if MagickLibVersion > 0x628 && 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) @@ -5706,7 +5927,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_getImageKurtosis, 0, 0, 0) ZEND_END_ARG_INFO() #endif -#if IM_HAVE_IMAGICK_GET_IMAGE_MEAN +#if MagickLibVersion > 0x628 && 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) @@ -5717,7 +5938,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_getImageMean, 0, 0, 0) ZEND_END_ARG_INFO() #endif -#if IM_HAVE_IMAGICK_GET_IMAGE_RANGE +#if MagickLibVersion > 0x628 && 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) @@ -5728,7 +5949,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_getImageRange, 0, 0, 0) ZEND_END_ARG_INFO() #endif -#if IM_HAVE_IMAGICK_GET_INTERPOLATE_METHOD +#if MagickLibVersion > 0x628 && 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) @@ -5739,7 +5960,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_getInterpolateMethod, 0, 0, 0) ZEND_END_ARG_INFO() #endif -#if IM_HAVE_IMAGICK_GET_OPTIONS +#if MagickLibVersion > 0x628 && 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) @@ -5751,7 +5972,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_getOptions, 0, 0, 0) ZEND_END_ARG_INFO() #endif -#if IM_HAVE_IMAGICK_GET_ORIENTATION +#if MagickLibVersion > 0x628 && 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) @@ -5762,7 +5983,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_getOrientation, 0, 0, 0) ZEND_END_ARG_INFO() #endif -#if IM_HAVE_IMAGICK_GET_RESOLUTION +#if MagickLibVersion > 0x628 && 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) @@ -5773,7 +5994,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_getResolution, 0, 0, 0) ZEND_END_ARG_INFO() #endif -#if IM_HAVE_IMAGICK_GET_TYPE +#if MagickLibVersion > 0x628 && 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) @@ -5784,7 +6005,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_getType, 0, 0, 0) ZEND_END_ARG_INFO() #endif -#if IM_HAVE_IMAGICK_POLYNOMIAL_IMAGE +#if MagickLibVersion > 0x628 && 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) @@ -5801,7 +6022,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_polynomialImage, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if IM_HAVE_IMAGICK_SET_DEPTH +#if MagickLibVersion > 0x628 && 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) @@ -5818,7 +6039,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setDepth, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if IM_HAVE_IMAGICK_SET_EXTRACT +#if MagickLibVersion > 0x628 && 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) @@ -5835,7 +6056,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setExtract, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if IM_HAVE_IMAGICK_SET_INTERPOLATE_METHOD +#if MagickLibVersion > 0x628 && 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) @@ -5852,7 +6073,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setInterpolateMethod, 0, 0, 1) ZEND_END_ARG_INFO() #endif -#if IM_HAVE_IMAGICK_SET_ORIENTATION +#if MagickLibVersion > 0x628 && 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) @@ -5870,62 +6091,126 @@ 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); -#if MagickLibVersion >= 0x700 +#endif +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x700 ZEND_METHOD(Imagick, waveImageWithMethod); #endif +#if MagickLibVersion > 0x628 ZEND_METHOD(Imagick, vignetteImage); +#endif +#if MagickLibVersion > 0x628 ZEND_METHOD(Imagick, uniqueImageColors); -#if !defined(MAGICKCORE_EXCLUDE_DEPRECATED) && MagickLibVersion < 0x700 +#endif +#if MagickLibVersion > 0x628 && !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); -#if MagickLibVersion < 0x700 +#endif +#if MagickLibVersion > 0x628 && MagickLibVersion < 0x700 ZEND_METHOD(Imagick, transformImage); #endif #if MagickLibVersion > 0x630 && MagickLibVersion < 0x700 ZEND_METHOD(Imagick, setImageOpacity); #endif -#if MagickLibVersion >= 0x700 +#if MagickLibVersion > 0x630 && MagickLibVersion >= 0x700 ZEND_METHOD(Imagick, setImageAlpha); #endif -#if MagickLibVersion < 0x700 +#if MagickLibVersion > 0x630 && 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); -#if IM_HAVE_IMAGICK_SETIMAGEINTERPOLATEMETHOD +#endif +#if MagickLibVersion > 0x631 && 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 @@ -5935,24 +6220,37 @@ 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); -#if MagickLibVersion < 0x700 +#endif +#if MagickLibVersion > 0x635 && MagickLibVersion < 0x700 ZEND_METHOD(Imagick, setImageClipMask); #endif -#if MagickLibVersion < 0x700 +#if MagickLibVersion > 0x635 && MagickLibVersion < 0x700 ZEND_METHOD(Imagick, getImageClipMask); #endif +#if MagickLibVersion > 0x635 ZEND_METHOD(Imagick, animateImages); -#if !defined(MAGICKCORE_EXCLUDE_DEPRECATED) && MagickLibVersion < 0x700 +#endif +#if MagickLibVersion > 0x635 && !defined(MAGICKCORE_EXCLUDE_DEPRECATED) && MagickLibVersion < 0x700 ZEND_METHOD(Imagick, recolorImage); #endif #if MagickLibVersion > 0x636 @@ -6342,40 +6640,20 @@ 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); @@ -6424,223 +6702,308 @@ ZEND_METHOD(Imagick, setSamplingFactors); ZEND_METHOD(Imagick, setSize); ZEND_METHOD(Imagick, setType); #if MagickLibVersion > 0x628 -ZEND_METHOD(Imagick, getIteratorIndex); +ZEND_METHOD(Imagick, nextImage); +#endif +#if MagickLibVersion > 0x628 +ZEND_METHOD(Imagick, setFirstIterator); #endif +#if MagickLibVersion > 0x628 ZEND_METHOD(Imagick, valid); +#endif +#if MagickLibVersion > 0x628 ZEND_METHOD(Imagick, current); -#if MagickLibVersion >= 0x659 +#endif +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x659 ZEND_METHOD(Imagick, brightnessContrastImage); #endif -#if MagickLibVersion > 0x661 +#if MagickLibVersion > 0x628 && MagickLibVersion > 0x661 ZEND_METHOD(Imagick, colorMatrixImage); #endif +#if MagickLibVersion > 0x628 ZEND_METHOD(Imagick, selectiveBlurImage); -#if MagickLibVersion >= 0x689 +#endif +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x689 ZEND_METHOD(Imagick, rotationalBlurImage); #endif -#if MagickLibVersion >= 0x683 +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x683 ZEND_METHOD(Imagick, statisticImage); #endif -#if MagickLibVersion >= 0x652 +#if MagickLibVersion > 0x628 && 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); -#if MagickLibVersion >= 0x680 +#endif +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x680 ZEND_METHOD(Imagick, morphology); #endif -#if defined(IMAGICK_WITH_KERNEL) && MagickLibVersion < 0x700 +#if MagickLibVersion > 0x628 && 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); -#if MagickLibVersion > 0x676 +#endif +#if MagickLibVersion > 0x628 && MagickLibVersion > 0x676 ZEND_METHOD(Imagick, colorDecisionListImage); #endif -#if MagickLibVersion >= 0x687 +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x687 ZEND_METHOD(Imagick, optimizeImageTransparency); #endif -#if MagickLibVersion >= 0x660 +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x660 ZEND_METHOD(Imagick, autoGammaImage); #endif -#if MagickLibVersion >= 0x692 +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x692 ZEND_METHOD(Imagick, autoOrient); #endif -#if MagickLibVersion >= 0x692 +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x692 ZEND_METHOD(Imagick, compositeImageGravity); #endif -#if MagickLibVersion >= 0x693 +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x693 ZEND_METHOD(Imagick, localContrastImage); #endif -#if MagickLibVersion >= 0x700 +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x700 ZEND_METHOD(Imagick, identifyImageType); #endif -#if IM_HAVE_IMAGICK_GETSETIMAGEMASK +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GETSETIMAGEMASK ZEND_METHOD(Imagick, getImageMask); #endif -#if IM_HAVE_IMAGICK_GETSETIMAGEMASK +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GETSETIMAGEMASK ZEND_METHOD(Imagick, setImageMask); #endif -#if IM_HAVE_IMAGICK_CANNYEDGEIMAGE +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x709 ZEND_METHOD(Imagick, cannyEdgeImage); #endif -#if IM_HAVE_IMAGICK_SETSEED +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_SETSEED ZEND_METHOD(Imagick, setSeed); #endif -#if IM_HAVE_IMAGICK_WAVELETDENOISEIMAGE +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_WAVELETDENOISEIMAGE ZEND_METHOD(Imagick, waveletDenoiseImage); #endif -#if IM_HAVE_IMAGICK_MEANSHIFTIMAGE +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_MEANSHIFTIMAGE ZEND_METHOD(Imagick, meanShiftImage); #endif -#if IM_HAVE_IMAGICK_KMEANSIMAGE +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_KMEANSIMAGE ZEND_METHOD(Imagick, kmeansImage); #endif -#if IM_HAVE_IMAGICK_RANGETHRESHOLDIMAGE +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_RANGETHRESHOLDIMAGE ZEND_METHOD(Imagick, rangeThresholdImage); #endif -#if IM_HAVE_IMAGICK_AUTOTHRESHOLDIMAGE +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_AUTOTHRESHOLDIMAGE ZEND_METHOD(Imagick, autoThresholdImage); #endif -#if IM_HAVE_IMAGICK_BILATERALBLURIMAGE +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_BILATERALBLURIMAGE ZEND_METHOD(Imagick, bilateralBlurImage); #endif -#if IM_HAVE_IMAGICK_CLAHEIMAGE +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_CLAHEIMAGE ZEND_METHOD(Imagick, claheImage); #endif -#if IM_HAVE_IMAGICK_CHANNELFXIMAGE +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_CHANNELFXIMAGE ZEND_METHOD(Imagick, channelFxImage); #endif -#if IM_HAVE_IMAGICK_COLORTHRESHOLDIMAGE +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_COLORTHRESHOLDIMAGE ZEND_METHOD(Imagick, colorThresholdImage); #endif -#if IM_HAVE_IMAGICK_COMPLEXIMAGES +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_COMPLEXIMAGES ZEND_METHOD(Imagick, complexImages); #endif -#if IM_HAVE_IMAGICK_INTERPOLATIVERESIZEIMAGE +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_INTERPOLATIVERESIZEIMAGE ZEND_METHOD(Imagick, interpolativeResizeImage); #endif -#if IM_HAVE_IMAGICK_LEVELIMAGECOLORS +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_LEVELIMAGECOLORS ZEND_METHOD(Imagick, levelImageColors); #endif -#if IM_HAVE_IMAGICK_LEVELIZEIMAGE +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_LEVELIZEIMAGE ZEND_METHOD(Imagick, levelizeImage); #endif -#if IM_HAVE_IMAGICK_ORDEREDDITHERIMAGE +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_ORDEREDDITHERIMAGE ZEND_METHOD(Imagick, orderedDitherImage); #endif -#if IM_HAVE_IMAGICK_WHITEBALANCEIMAGE +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_WHITEBALANCEIMAGE ZEND_METHOD(Imagick, whiteBalanceImage); #endif -#if IM_HAVE_IMAGICK_DELETE_OPTION +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_DELETE_OPTION ZEND_METHOD(Imagick, deleteOption); #endif -#if IM_HAVE_IMAGICK_GET_BACKGROUND_COLOR +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_BACKGROUND_COLOR ZEND_METHOD(Imagick, getBackgroundColor); #endif -#if IM_HAVE_IMAGICK_GET_IMAGE_ARTIFACTS +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_IMAGE_ARTIFACTS ZEND_METHOD(Imagick, getImageArtifacts); #endif -#if IM_HAVE_IMAGICK_GET_IMAGE_KURTOSIS +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_IMAGE_KURTOSIS ZEND_METHOD(Imagick, getImageKurtosis); #endif -#if IM_HAVE_IMAGICK_GET_IMAGE_MEAN +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_IMAGE_MEAN ZEND_METHOD(Imagick, getImageMean); #endif -#if IM_HAVE_IMAGICK_GET_IMAGE_RANGE +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_IMAGE_RANGE ZEND_METHOD(Imagick, getImageRange); #endif -#if IM_HAVE_IMAGICK_GET_INTERPOLATE_METHOD +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_INTERPOLATE_METHOD ZEND_METHOD(Imagick, getInterpolateMethod); #endif -#if IM_HAVE_IMAGICK_GET_OPTIONS +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_OPTIONS ZEND_METHOD(Imagick, getOptions); #endif -#if IM_HAVE_IMAGICK_GET_ORIENTATION +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_ORIENTATION ZEND_METHOD(Imagick, getOrientation); #endif -#if IM_HAVE_IMAGICK_GET_RESOLUTION +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_RESOLUTION ZEND_METHOD(Imagick, getResolution); #endif -#if IM_HAVE_IMAGICK_GET_TYPE +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_TYPE ZEND_METHOD(Imagick, getType); #endif -#if IM_HAVE_IMAGICK_POLYNOMIAL_IMAGE +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_POLYNOMIAL_IMAGE ZEND_METHOD(Imagick, polynomialImage); #endif -#if IM_HAVE_IMAGICK_SET_DEPTH +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_SET_DEPTH ZEND_METHOD(Imagick, setDepth); #endif -#if IM_HAVE_IMAGICK_SET_EXTRACT +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_SET_EXTRACT ZEND_METHOD(Imagick, setExtract); #endif -#if IM_HAVE_IMAGICK_SET_INTERPOLATE_METHOD +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_SET_INTERPOLATE_METHOD ZEND_METHOD(Imagick, setInterpolateMethod); #endif -#if IM_HAVE_IMAGICK_SET_ORIENTATION +#if MagickLibVersion > 0x628 && 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) -#if MagickLibVersion >= 0x700 +#endif +#if MagickLibVersion > 0x628 && 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) -#if !defined(MAGICKCORE_EXCLUDE_DEPRECATED) && MagickLibVersion < 0x700 +#endif +#if MagickLibVersion > 0x628 && !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) -#if MagickLibVersion < 0x700 +#endif +#if MagickLibVersion > 0x628 && 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 >= 0x700 +#if MagickLibVersion > 0x630 && MagickLibVersion >= 0x700 ZEND_ME(Imagick, setImageAlpha, arginfo_class_Imagick_setImageAlpha, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion < 0x700 +#if MagickLibVersion > 0x630 && 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) -#if IM_HAVE_IMAGICK_SETIMAGEINTERPOLATEMETHOD +#endif +#if MagickLibVersion > 0x631 && 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 @@ -6650,24 +7013,37 @@ 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) -#if MagickLibVersion < 0x700 +#endif +#if MagickLibVersion > 0x635 && MagickLibVersion < 0x700 ZEND_ME(Imagick, setImageClipMask, arginfo_class_Imagick_setImageClipMask, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED) #endif -#if MagickLibVersion < 0x700 +#if MagickLibVersion > 0x635 && 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) -#if !defined(MAGICKCORE_EXCLUDE_DEPRECATED) && MagickLibVersion < 0x700 +#endif +#if MagickLibVersion > 0x635 && !defined(MAGICKCORE_EXCLUDE_DEPRECATED) && MagickLibVersion < 0x700 ZEND_ME(Imagick, recolorImage, arginfo_class_Imagick_recolorImage, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED) #endif #if MagickLibVersion > 0x636 @@ -7059,40 +7435,20 @@ 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) @@ -7143,167 +7499,187 @@ 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) -#if MagickLibVersion >= 0x659 +#endif +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x659 ZEND_ME(Imagick, brightnessContrastImage, arginfo_class_Imagick_brightnessContrastImage, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion > 0x661 +#if MagickLibVersion > 0x628 && 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) -#if MagickLibVersion >= 0x689 +#endif +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x689 ZEND_ME(Imagick, rotationalBlurImage, arginfo_class_Imagick_rotationalBlurImage, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion >= 0x683 +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x683 ZEND_ME(Imagick, statisticImage, arginfo_class_Imagick_statisticImage, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion >= 0x652 +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x652 ZEND_ME(Imagick, subimageMatch, arginfo_class_Imagick_subimageMatch, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion >= 0x652 +#if MagickLibVersion > 0x628 && 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) -#if MagickLibVersion >= 0x680 +#endif +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x680 ZEND_ME(Imagick, morphology, arginfo_class_Imagick_morphology, ZEND_ACC_PUBLIC) #endif -#if defined(IMAGICK_WITH_KERNEL) && MagickLibVersion < 0x700 +#if MagickLibVersion > 0x628 && 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) -#if MagickLibVersion > 0x676 +#endif +#if MagickLibVersion > 0x628 && MagickLibVersion > 0x676 ZEND_ME(Imagick, colorDecisionListImage, arginfo_class_Imagick_colorDecisionListImage, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion >= 0x687 +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x687 ZEND_ME(Imagick, optimizeImageTransparency, arginfo_class_Imagick_optimizeImageTransparency, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion >= 0x660 +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x660 ZEND_ME(Imagick, autoGammaImage, arginfo_class_Imagick_autoGammaImage, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion >= 0x692 +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x692 ZEND_ME(Imagick, autoOrient, arginfo_class_Imagick_autoOrient, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion >= 0x692 +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x692 ZEND_MALIAS(Imagick, autoOrientate, autoOrient, arginfo_class_Imagick_autoOrientate, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion >= 0x692 +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x692 ZEND_ME(Imagick, compositeImageGravity, arginfo_class_Imagick_compositeImageGravity, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion >= 0x693 +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x693 ZEND_ME(Imagick, localContrastImage, arginfo_class_Imagick_localContrastImage, ZEND_ACC_PUBLIC) #endif -#if MagickLibVersion >= 0x700 +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x700 ZEND_ME(Imagick, identifyImageType, arginfo_class_Imagick_identifyImageType, ZEND_ACC_PUBLIC) #endif -#if IM_HAVE_IMAGICK_GETSETIMAGEMASK +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GETSETIMAGEMASK ZEND_ME(Imagick, getImageMask, arginfo_class_Imagick_getImageMask, ZEND_ACC_PUBLIC) #endif -#if IM_HAVE_IMAGICK_GETSETIMAGEMASK +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GETSETIMAGEMASK ZEND_ME(Imagick, setImageMask, arginfo_class_Imagick_setImageMask, ZEND_ACC_PUBLIC) #endif -#if IM_HAVE_IMAGICK_CANNYEDGEIMAGE +#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x709 ZEND_ME(Imagick, cannyEdgeImage, arginfo_class_Imagick_cannyEdgeImage, ZEND_ACC_PUBLIC) #endif -#if IM_HAVE_IMAGICK_SETSEED +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_SETSEED ZEND_ME(Imagick, setSeed, arginfo_class_Imagick_setSeed, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) #endif -#if IM_HAVE_IMAGICK_WAVELETDENOISEIMAGE +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_WAVELETDENOISEIMAGE ZEND_ME(Imagick, waveletDenoiseImage, arginfo_class_Imagick_waveletDenoiseImage, ZEND_ACC_PUBLIC) #endif -#if IM_HAVE_IMAGICK_MEANSHIFTIMAGE +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_MEANSHIFTIMAGE ZEND_ME(Imagick, meanShiftImage, arginfo_class_Imagick_meanShiftImage, ZEND_ACC_PUBLIC) #endif -#if IM_HAVE_IMAGICK_KMEANSIMAGE +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_KMEANSIMAGE ZEND_ME(Imagick, kmeansImage, arginfo_class_Imagick_kmeansImage, ZEND_ACC_PUBLIC) #endif -#if IM_HAVE_IMAGICK_RANGETHRESHOLDIMAGE +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_RANGETHRESHOLDIMAGE ZEND_ME(Imagick, rangeThresholdImage, arginfo_class_Imagick_rangeThresholdImage, ZEND_ACC_PUBLIC) #endif -#if IM_HAVE_IMAGICK_AUTOTHRESHOLDIMAGE +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_AUTOTHRESHOLDIMAGE ZEND_ME(Imagick, autoThresholdImage, arginfo_class_Imagick_autoThresholdImage, ZEND_ACC_PUBLIC) #endif -#if IM_HAVE_IMAGICK_BILATERALBLURIMAGE +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_BILATERALBLURIMAGE ZEND_ME(Imagick, bilateralBlurImage, arginfo_class_Imagick_bilateralBlurImage, ZEND_ACC_PUBLIC) #endif -#if IM_HAVE_IMAGICK_CLAHEIMAGE +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_CLAHEIMAGE ZEND_ME(Imagick, claheImage, arginfo_class_Imagick_claheImage, ZEND_ACC_PUBLIC) #endif -#if IM_HAVE_IMAGICK_CHANNELFXIMAGE +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_CHANNELFXIMAGE ZEND_ME(Imagick, channelFxImage, arginfo_class_Imagick_channelFxImage, ZEND_ACC_PUBLIC) #endif -#if IM_HAVE_IMAGICK_COLORTHRESHOLDIMAGE +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_COLORTHRESHOLDIMAGE ZEND_ME(Imagick, colorThresholdImage, arginfo_class_Imagick_colorThresholdImage, ZEND_ACC_PUBLIC) #endif -#if IM_HAVE_IMAGICK_COMPLEXIMAGES +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_COMPLEXIMAGES ZEND_ME(Imagick, complexImages, arginfo_class_Imagick_complexImages, ZEND_ACC_PUBLIC) #endif -#if IM_HAVE_IMAGICK_INTERPOLATIVERESIZEIMAGE +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_INTERPOLATIVERESIZEIMAGE ZEND_ME(Imagick, interpolativeResizeImage, arginfo_class_Imagick_interpolativeResizeImage, ZEND_ACC_PUBLIC) #endif -#if IM_HAVE_IMAGICK_LEVELIMAGECOLORS +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_LEVELIMAGECOLORS ZEND_ME(Imagick, levelImageColors, arginfo_class_Imagick_levelImageColors, ZEND_ACC_PUBLIC) #endif -#if IM_HAVE_IMAGICK_LEVELIZEIMAGE +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_LEVELIZEIMAGE ZEND_ME(Imagick, levelizeImage, arginfo_class_Imagick_levelizeImage, ZEND_ACC_PUBLIC) #endif -#if IM_HAVE_IMAGICK_ORDEREDDITHERIMAGE +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_ORDEREDDITHERIMAGE ZEND_ME(Imagick, orderedDitherImage, arginfo_class_Imagick_orderedDitherImage, ZEND_ACC_PUBLIC) #endif -#if IM_HAVE_IMAGICK_WHITEBALANCEIMAGE +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_WHITEBALANCEIMAGE ZEND_ME(Imagick, whiteBalanceImage, arginfo_class_Imagick_whiteBalanceImage, ZEND_ACC_PUBLIC) #endif -#if IM_HAVE_IMAGICK_DELETE_OPTION +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_DELETE_OPTION ZEND_ME(Imagick, deleteOption, arginfo_class_Imagick_deleteOption, ZEND_ACC_PUBLIC) #endif -#if IM_HAVE_IMAGICK_GET_BACKGROUND_COLOR +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_BACKGROUND_COLOR ZEND_ME(Imagick, getBackgroundColor, arginfo_class_Imagick_getBackgroundColor, ZEND_ACC_PUBLIC) #endif -#if IM_HAVE_IMAGICK_GET_IMAGE_ARTIFACTS +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_IMAGE_ARTIFACTS ZEND_ME(Imagick, getImageArtifacts, arginfo_class_Imagick_getImageArtifacts, ZEND_ACC_PUBLIC) #endif -#if IM_HAVE_IMAGICK_GET_IMAGE_KURTOSIS +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_IMAGE_KURTOSIS ZEND_ME(Imagick, getImageKurtosis, arginfo_class_Imagick_getImageKurtosis, ZEND_ACC_PUBLIC) #endif -#if IM_HAVE_IMAGICK_GET_IMAGE_MEAN +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_IMAGE_MEAN ZEND_ME(Imagick, getImageMean, arginfo_class_Imagick_getImageMean, ZEND_ACC_PUBLIC) #endif -#if IM_HAVE_IMAGICK_GET_IMAGE_RANGE +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_IMAGE_RANGE ZEND_ME(Imagick, getImageRange, arginfo_class_Imagick_getImageRange, ZEND_ACC_PUBLIC) #endif -#if IM_HAVE_IMAGICK_GET_INTERPOLATE_METHOD +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_INTERPOLATE_METHOD ZEND_ME(Imagick, getInterpolateMethod, arginfo_class_Imagick_getInterpolateMethod, ZEND_ACC_PUBLIC) #endif -#if IM_HAVE_IMAGICK_GET_OPTIONS +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_OPTIONS ZEND_ME(Imagick, getOptions, arginfo_class_Imagick_getOptions, ZEND_ACC_PUBLIC) #endif -#if IM_HAVE_IMAGICK_GET_ORIENTATION +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_ORIENTATION ZEND_ME(Imagick, getOrientation, arginfo_class_Imagick_getOrientation, ZEND_ACC_PUBLIC) #endif -#if IM_HAVE_IMAGICK_GET_RESOLUTION +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_RESOLUTION ZEND_ME(Imagick, getResolution, arginfo_class_Imagick_getResolution, ZEND_ACC_PUBLIC) #endif -#if IM_HAVE_IMAGICK_GET_TYPE +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_GET_TYPE ZEND_ME(Imagick, getType, arginfo_class_Imagick_getType, ZEND_ACC_PUBLIC) #endif -#if IM_HAVE_IMAGICK_POLYNOMIAL_IMAGE +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_POLYNOMIAL_IMAGE ZEND_ME(Imagick, polynomialImage, arginfo_class_Imagick_polynomialImage, ZEND_ACC_PUBLIC) #endif -#if IM_HAVE_IMAGICK_SET_DEPTH +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_SET_DEPTH ZEND_ME(Imagick, setDepth, arginfo_class_Imagick_setDepth, ZEND_ACC_PUBLIC) #endif -#if IM_HAVE_IMAGICK_SET_EXTRACT +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_SET_EXTRACT ZEND_ME(Imagick, setExtract, arginfo_class_Imagick_setExtract, ZEND_ACC_PUBLIC) #endif -#if IM_HAVE_IMAGICK_SET_INTERPOLATE_METHOD +#if MagickLibVersion > 0x628 && IM_HAVE_IMAGICK_SET_INTERPOLATE_METHOD ZEND_ME(Imagick, setInterpolateMethod, arginfo_class_Imagick_setInterpolateMethod, ZEND_ACC_PUBLIC) #endif -#if IM_HAVE_IMAGICK_SET_ORIENTATION +#if MagickLibVersion > 0x628 && 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 1ef93bfe..dde6a49b 100644 --- a/imagick_class.c +++ b/imagick_class.c @@ -13066,7 +13066,7 @@ PHP_METHOD(Imagick, getRegistry) if (ex_info->severity != 0) { zend_throw_exception_ex(php_imagick_exception_class_entry, 1 TSRMLS_CC, "Imagick::getRegistry exception (%s) ", ex_info->reason); ex_info = DestroyExceptionInfo(ex_info); - return; + RETURN_THROWS(); } ex_info = DestroyExceptionInfo(ex_info);