fix subimageMatch / similarityimage

Imagick · Jun 15, 2021 · ed784bc · ed784bc
1 parent dc56e4b
commit ed784bc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 22 deletions.
diff --git a/Imagick.stub.php b/Imagick.stub.php
@@ -1266,10 +1266,10 @@ public function statisticImage(
 #endif
 
 #if MagickLibVersion >= 0x652
-    public function subimageMatch(Imagick $image, ?array &$offset, ?float &$similarity): Imagick  {}
+    public function subimageMatch(Imagick $image, ?array &$offset=null, ?float &$similarity=null, float $threshold = 0.0, int metric=0): Imagick  {}
 
     /** @alias Imagick::subimageMatch */
-    public function similarityimage(imagick $image, ?array &$offset, ?float &$similarity): Imagick  {}
+    public function similarityimage(imagick $image, ?array &$offset=null, ?float &$similarity=null, float $threshold = 0.0, int metric=0): Imagick  {}
 #endif
 
     public static function setRegistry(string $key, string $value): bool  {}

diff --git 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