diff options
Diffstat (limited to 'imagick-arginfo.patch')
| -rw-r--r-- | imagick-arginfo.patch | 385 |
1 files changed, 385 insertions, 0 deletions
diff --git a/imagick-arginfo.patch b/imagick-arginfo.patch new file mode 100644 index 0000000..d3e5ecf --- /dev/null +++ b/imagick-arginfo.patch @@ -0,0 +1,385 @@ +From cc48deb6e778f9da67acb94bbc8dde51c87700e1 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Tue, 15 Jun 2021 07:37:21 +0200 +Subject: [PATCH 01/10] fix getConfigureOptions, pattern is optional + +--- + Imagick_arginfo.h | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Imagick_arginfo.h b/Imagick_arginfo.h +index 45136da..ffe846d 100644 +--- a/Imagick_arginfo.h ++++ b/Imagick_arginfo.h +@@ -4511,14 +4511,14 @@ ZEND_END_ARG_INFO() + + + #if PHP_VERSION_ID >= 80000 +-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_getConfigureOptions, 0, 1, IS_STRING, 0) ++ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_getConfigureOptions, 0, 0, IS_STRING, 0) + #else +-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_getConfigureOptions, 0, 0, 1) ++ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_getConfigureOptions, 0, 0, 0) + #endif + + + #if PHP_VERSION_ID >= 80000 +- ZEND_ARG_TYPE_INFO(0, pattern, IS_STRING, 1) ++ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, pattern, IS_STRING, 0, "*") + #else + ZEND_ARG_INFO(0, pattern) + #endif +@@ -6493,4 +6493,4 @@ static const zend_function_entry class_Imagick_methods[] = { + ZEND_ME(Imagick, setImageMask, arginfo_class_Imagick_setImageMask, ZEND_ACC_PUBLIC) + #endif + ZEND_FE_END +-}; +\ No newline at end of file ++}; + +From c15e55145fb115da8a1af74bc38828c22a123de7 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Tue, 15 Jun 2021 07:49:43 +0200 +Subject: [PATCH 02/10] fix pingImageFile, filename is optional + +--- + Imagick_arginfo.h | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Imagick_arginfo.h b/Imagick_arginfo.h +index ffe846d..9a33086 100644 +--- a/Imagick_arginfo.h ++++ b/Imagick_arginfo.h +@@ -50,9 +50,9 @@ ZEND_END_ARG_INFO() + #if MagickLibVersion > 0x628 + + #if PHP_VERSION_ID >= 80000 +-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_pingImageFile, 0, 2, _IS_BOOL, 0) ++ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_pingImageFile, 0, 1, _IS_BOOL, 0) + #else +-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_pingImageFile, 0, 0, 2) ++ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_pingImageFile, 0, 0, 1) + #endif + + +@@ -64,7 +64,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_pingImageFile, 0, 0, 2) + + + #if PHP_VERSION_ID >= 80000 +- ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 1) ++ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, filename, IS_STRING, 1, "null") + #else + ZEND_ARG_INFO(0, filename) + #endif + +From 0de8b99b36c3a6b5a26579dd9af688b63877b24c Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Tue, 15 Jun 2021 07:52:47 +0200 +Subject: [PATCH 03/10] fix writeImageFile, format is optional + +--- + Imagick_arginfo.h | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Imagick_arginfo.h b/Imagick_arginfo.h +index 9a33086..38662af 100644 +--- a/Imagick_arginfo.h ++++ b/Imagick_arginfo.h +@@ -815,9 +815,9 @@ ZEND_END_ARG_INFO() + #if MagickLibVersion > 0x635 + + #if PHP_VERSION_ID >= 80000 +-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_writeImageFile, 0, 2, _IS_BOOL, 0) ++ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_writeImageFile, 0, 1, _IS_BOOL, 0) + #else +-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_writeImageFile, 0, 0, 2) ++ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_writeImageFile, 0, 0, 1) + #endif + + +@@ -829,7 +829,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_writeImageFile, 0, 0, 2) + + + #if PHP_VERSION_ID >= 80000 +- ZEND_ARG_TYPE_INFO(0, format, IS_STRING, 1) ++ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, format, IS_STRING, 1, "null") + #else + ZEND_ARG_INFO(0, format) + #endif + +From 09af952ac4bcac96fb64c3fb1a90877e88fc6c6e Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Tue, 15 Jun 2021 07:59:45 +0200 +Subject: [PATCH 04/10] fix __construct, files is optional + +--- + Imagick_arginfo.h | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Imagick_arginfo.h b/Imagick_arginfo.h +index 38662af..bdfc658 100644 +--- a/Imagick_arginfo.h ++++ b/Imagick_arginfo.h +@@ -1678,10 +1678,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_smushImages, 0, 0, 2) + ZEND_END_ARG_INFO() + #endif + +-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick___construct, 0, 0, 1) ++ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick___construct, 0, 0, 0) + + #if PHP_VERSION_ID >= 80000 +- ZEND_ARG_TYPE_MASK(0, files, MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_LONG|MAY_BE_DOUBLE|MAY_BE_NULL, NULL) ++ ZEND_ARG_TYPE_MASK(0, files, MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_LONG|MAY_BE_DOUBLE|MAY_BE_NULL, "null") + #else + ZEND_ARG_INFO(0, files) + #endif + +From 62c0629d0cddda94138ca9ac37f0f010f712ecd4 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Tue, 15 Jun 2021 08:02:07 +0200 +Subject: [PATCH 05/10] fix readImageBlob, filename is optional + +--- + Imagick_arginfo.h | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Imagick_arginfo.h b/Imagick_arginfo.h +index bdfc658..ee51298 100644 +--- a/Imagick_arginfo.h ++++ b/Imagick_arginfo.h +@@ -1794,9 +1794,9 @@ ZEND_END_ARG_INFO() + + + #if PHP_VERSION_ID >= 80000 +-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_readImageBlob, 0, 2, _IS_BOOL, 0) ++ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_readImageBlob, 0, 1, _IS_BOOL, 0) + #else +-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_readImageBlob, 0, 0, 2) ++ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_readImageBlob, 0, 0, 1) + #endif + + +@@ -1807,7 +1807,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_readImageBlob, 0, 0, 2) + #endif + + #if PHP_VERSION_ID >= 80000 +- ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 1) ++ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, filename, IS_STRING, 1, "null") + #else + ZEND_ARG_INFO(0, filename) + #endif + +From f0189212999e41b7e5dda85268d6e7b2a4213bd6 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Tue, 15 Jun 2021 08:08:50 +0200 +Subject: [PATCH 06/10] fix writeImage, filename is optional + +--- + Imagick_arginfo.h | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Imagick_arginfo.h b/Imagick_arginfo.h +index ee51298..85308f8 100644 +--- a/Imagick_arginfo.h ++++ b/Imagick_arginfo.h +@@ -1853,14 +1853,14 @@ ZEND_END_ARG_INFO() + + + #if PHP_VERSION_ID >= 80000 +-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_writeImage, 0, 1, _IS_BOOL, 0) ++ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_writeImage, 0, 0, _IS_BOOL, 0) + #else +-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_writeImage, 0, 0, 1) ++ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_writeImage, 0, 0, 0) + #endif + + + #if PHP_VERSION_ID >= 80000 +- ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 1) ++ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, filename, IS_STRING, 1, "null") + #else + ZEND_ARG_INFO(0, filename) + #endif + +From 721b6dc487200aaf2b3e1c8313d5b34e478a05db Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Tue, 15 Jun 2021 08:09:45 +0200 +Subject: [PATCH 07/10] fix blurImage, channel is optional + +--- + Imagick_arginfo.h | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Imagick_arginfo.h b/Imagick_arginfo.h +index 85308f8..ab07ae8 100644 +--- a/Imagick_arginfo.h ++++ b/Imagick_arginfo.h +@@ -1889,9 +1889,9 @@ ZEND_END_ARG_INFO() + + + #if PHP_VERSION_ID >= 80000 +-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_blurImage, 0, 3, _IS_BOOL, 0) ++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, 3) ++ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_blurImage, 0, 0, 2) + #endif + + +@@ -1908,7 +1908,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_blurImage, 0, 0, 3) + #endif + + #if PHP_VERSION_ID >= 80000 +- ZEND_ARG_TYPE_INFO(0, channel, IS_LONG, 1) ++ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, channel, IS_LONG, 0, "Imagick::CHANNEL_DEFAULT") + #else + ZEND_ARG_INFO(0, channel) + #endif + +From eeec0cd9985f5b65f96dd211d81b73f54d999998 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Tue, 15 Jun 2021 08:22:47 +0200 +Subject: [PATCH 08/10] Fix queryFontMetrics, multiline is optional + +--- + Imagick_arginfo.h | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Imagick_arginfo.h b/Imagick_arginfo.h +index ab07ae8..1bbed68 100644 +--- a/Imagick_arginfo.h ++++ b/Imagick_arginfo.h +@@ -3030,9 +3030,9 @@ ZEND_END_ARG_INFO() + + + #if PHP_VERSION_ID >= 80000 +-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_queryFontMetrics, 0, 3, IS_ARRAY, 0) ++ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_queryFontMetrics, 0, 2, IS_ARRAY, 0) + #else +-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_queryFontMetrics, 0, 0, 3) ++ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_queryFontMetrics, 0, 0, 2) + #endif + + ZEND_ARG_OBJ_INFO(0, settings, ImagickDraw, 0) +@@ -3044,7 +3044,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_queryFontMetrics, 0, 0, 3) + #endif + + #if PHP_VERSION_ID >= 80000 +- ZEND_ARG_TYPE_INFO(0, multiline, _IS_BOOL, 1) ++ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, multiline, _IS_BOOL, 1, "null") + #else + ZEND_ARG_INFO(0, multiline) + #endif + +From 7b81520d701512a817f6e4daeca958d41502a2c2 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Tue, 15 Jun 2021 08:43:03 +0200 +Subject: [PATCH 09/10] fix newImage, format is optional + +--- + Imagick_arginfo.h | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Imagick_arginfo.h b/Imagick_arginfo.h +index 1bbed68..f66a858 100644 +--- a/Imagick_arginfo.h ++++ b/Imagick_arginfo.h +@@ -4450,9 +4450,9 @@ ZEND_END_ARG_INFO() + + + #if PHP_VERSION_ID >= 80000 +-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_newImage, 0, 4, _IS_BOOL, 0) ++ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Imagick_newImage, 0, 3, _IS_BOOL, 0) + #else +-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_newImage, 0, 0, 4) ++ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_newImage, 0, 0, 3) + #endif + + +@@ -4470,7 +4470,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_newImage, 0, 0, 4) + ZEND_ARG_OBJ_TYPE_MASK(0, background_color, ImagickPixel, MAY_BE_STRING, NULL) + + #if PHP_VERSION_ID >= 80000 +- ZEND_ARG_TYPE_INFO(0, format, IS_STRING, 1) ++ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, format, IS_STRING, 0, "null") + #else + ZEND_ARG_INFO(0, format) + #endif + +From b24cc587f40126307faa5761f6384628675f1e7c Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Tue, 15 Jun 2021 09:00:43 +0200 +Subject: [PATCH 10/10] fix subimageMatch / similarityimage + +--- + Imagick_arginfo.h | 32 ++++++++++++-------------------- + 2 files changed, 14 insertions(+), 22 deletions(-) + +diff --git a/Imagick_arginfo.h b/Imagick_arginfo.h +index f66a858..a5768b8 100644 +--- a/Imagick_arginfo.h ++++ b/Imagick_arginfo.h +@@ -4829,51 +4829,43 @@ ZEND_END_ARG_INFO() + #if MagickLibVersion > 0x628 && MagickLibVersion >= 0x652 + + #if PHP_VERSION_ID >= 80000 +-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Imagick_subimageMatch, 0, 3, Imagick, 0) ++ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Imagick_subimageMatch, 0, 1, Imagick, 0) + #else +-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_subimageMatch, 0, 0, 3) ++ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_subimageMatch, 0, 0, 1) + #endif + + ZEND_ARG_OBJ_INFO(0, image, Imagick, 0) + + #if PHP_VERSION_ID >= 80000 +- ZEND_ARG_TYPE_INFO(1, offset, IS_ARRAY, 1) ++ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(1, offset, IS_ARRAY, 1, "null") + #else + ZEND_ARG_INFO(1, offset) + #endif + + #if PHP_VERSION_ID >= 80000 +- ZEND_ARG_TYPE_INFO(1, similarity, IS_DOUBLE, 1) ++ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(1, similarity, IS_DOUBLE, 1, "0.0") + #else + ZEND_ARG_INFO(1, similarity) + #endif +-ZEND_END_ARG_INFO() +-#endif +- +-#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x652 + + #if PHP_VERSION_ID >= 80000 +-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Imagick_similarityimage, 0, 3, Imagick, 0) ++ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, threshold, IS_DOUBLE, 0, "0.0") + #else +-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_similarityimage, 0, 0, 3) ++ ZEND_ARG_INFO(1, threshold) + #endif + +- ZEND_ARG_OBJ_INFO(0, image, imagick, 0) +- +-#if PHP_VERSION_ID >= 80000 +- ZEND_ARG_TYPE_INFO(1, offset, IS_ARRAY, 1) +-#else +- ZEND_ARG_INFO(1, offset) +-#endif +- + #if PHP_VERSION_ID >= 80000 +- ZEND_ARG_TYPE_INFO(1, similarity, IS_DOUBLE, 1) ++ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, metric, IS_LONG, 0, "0") + #else +- ZEND_ARG_INFO(1, similarity) ++ ZEND_ARG_INFO(1, metric) + #endif + ZEND_END_ARG_INFO() + #endif + ++#if MagickLibVersion > 0x628 && MagickLibVersion >= 0x652 ++#define arginfo_class_Imagick_similarityimage arginfo_class_Imagick_subimageMatch ++#endif ++ + #if MagickLibVersion > 0x628 + + #if PHP_VERSION_ID >= 80000 |