summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--346.patch45
-rw-r--r--347.patch36
-rw-r--r--348.patch47
-rw-r--r--350.patch29
-rw-r--r--375.patch112
-rw-r--r--PHPINFO9
-rw-r--r--REFLECTION1794
-rw-r--r--imagick-arginfo.patch385
-rw-r--r--imagick-php8.patch1309
-rw-r--r--imagick-php81.patch287
-rw-r--r--php-pecl-imagick.spec32
11 files changed, 1310 insertions, 2775 deletions
diff --git a/346.patch b/346.patch
deleted file mode 100644
index 57f38f4..0000000
--- a/346.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From b34d134a63e6f784d90fe5fbc455cf383f0e8c82 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Fri, 4 Sep 2020 08:36:10 +0200
-Subject: [PATCH] SPL is always there
-
----
- imagick.c | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/imagick.c b/imagick.c
-index 1e6d174..cd7f98e 100644
---- a/imagick.c
-+++ b/imagick.c
-@@ -33,9 +33,7 @@
-
-
- /* For the countable interface */
--#if defined(HAVE_SPL)
- #include "ext/spl/spl_iterators.h"
--#endif
-
- ZEND_DECLARE_MODULE_GLOBALS(imagick)
-
-@@ -3799,11 +3797,7 @@ PHP_MINIT_FUNCTION(imagick)
- #endif
-
- php_imagick_sc_entry = zend_register_internal_class(&ce TSRMLS_CC);
--#if defined(HAVE_SPL)
- zend_class_implements(php_imagick_sc_entry TSRMLS_CC, 2, zend_ce_iterator, spl_ce_Countable);
--#else
-- zend_class_implements(php_imagick_sc_entry TSRMLS_CC, 1, zend_ce_iterator);
--#endif
-
- /*
- Initialize the class (ImagickDraw)
-@@ -4011,9 +4005,7 @@ PHP_RSHUTDOWN_FUNCTION(imagick)
- static const zend_module_dep imagick_deps[] = {
- ZEND_MOD_CONFLICTS("gmagick")
- ZEND_MOD_REQUIRED("standard")
--#ifdef HAVE_SPL
- ZEND_MOD_REQUIRED("spl")
--#endif
- ZEND_MOD_END
- };
- #endif
diff --git a/347.patch b/347.patch
deleted file mode 100644
index b090b1e..0000000
--- a/347.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 960409cb784cd5d8c9f41068a54dad8141fdf25d Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Fri, 4 Sep 2020 08:57:24 +0200
-Subject: [PATCH] thread limit per request
-
----
- imagick.c | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/imagick.c b/imagick.c
-index 1e6d174..8d0a7b5 100644
---- a/imagick.c
-+++ b/imagick.c
-@@ -3872,10 +3872,6 @@ PHP_MINIT_FUNCTION(imagick)
- checkImagickVersion();
- }
-
-- if (IMAGICK_G(set_single_thread)) {
-- MagickSetResourceLimit(ThreadResource, 1);
-- }
--
- return SUCCESS;
- }
-
-@@ -3981,6 +3977,11 @@ PHP_RINIT_FUNCTION(imagick)
- (void)module_number;
-
- IMAGICK_G(progress_callback) = NULL;
-+
-+ if (IMAGICK_G(set_single_thread)) {
-+ MagickSetResourceLimit(ThreadResource, 1);
-+ }
-+
- return SUCCESS;
- }
-
diff --git a/348.patch b/348.patch
deleted file mode 100644
index b1bd808..0000000
--- a/348.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From f054a66254a71d9840fb9504abeedb4ba25a2b7a Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Fri, 4 Sep 2020 10:46:01 +0200
-Subject: [PATCH] set single thread by default
-
----
- imagick.c | 4 ++--
- tests/281_ini_settings_default.phpt | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/imagick.c b/imagick.c
-index 1e6d174..70ca146 100644
---- a/imagick.c
-+++ b/imagick.c
-@@ -3278,7 +3278,7 @@ PHP_INI_BEGIN()
- STD_PHP_INI_ENTRY("imagick.skip_version_check", "0", PHP_INI_ALL, OnUpdateBool, skip_version_check, zend_imagick_globals, imagick_globals)
- STD_PHP_INI_ENTRY("imagick.progress_monitor", "0", PHP_INI_SYSTEM, OnUpdateBool, progress_monitor, zend_imagick_globals, imagick_globals)
-
-- STD_PHP_INI_ENTRY("imagick.set_single_thread", "0", PHP_INI_SYSTEM, OnUpdateBool, set_single_thread, zend_imagick_globals, imagick_globals)
-+ STD_PHP_INI_ENTRY("imagick.set_single_thread", "1", PHP_INI_SYSTEM, OnUpdateBool, set_single_thread, zend_imagick_globals, imagick_globals)
- STD_PHP_INI_ENTRY("imagick.shutdown_sleep_count", "10", PHP_INI_ALL, OnUpdateLong, shutdown_sleep_count, zend_imagick_globals, imagick_globals)
-
- PHP_INI_END()
-@@ -3288,7 +3288,7 @@ static void php_imagick_init_globals(zend_imagick_globals *imagick_globals)
- imagick_globals->locale_fix = 0;
- imagick_globals->progress_monitor = 0;
- imagick_globals->skip_version_check = 0;
-- imagick_globals->set_single_thread = 0;
-+ imagick_globals->set_single_thread = 1;
- // 10 is magick number, that seems to be enough.
- imagick_globals->shutdown_sleep_count = 10;
- }
-diff --git a/tests/281_ini_settings_default.phpt b/tests/281_ini_settings_default.phpt
-index e397e98..4b223ac 100644
---- a/tests/281_ini_settings_default.phpt
-+++ b/tests/281_ini_settings_default.phpt
-@@ -18,8 +18,8 @@ if ($sleepCount != 10) {
- echo "imagick.shutdown_sleep_count is not set to 10 but instead " . var_export($sleepCount, true) ."\n";
- }
-
--if ($setSingleThread != 0) {
-- echo "imagick.set_single_thread setting is not false but instead " . var_export($setSingleThread, true) ."\n";
-+if ($setSingleThread != 1) {
-+ echo "imagick.set_single_thread setting is not true but instead " . var_export($setSingleThread, true) ."\n";
- }
-
-
diff --git a/350.patch b/350.patch
deleted file mode 100644
index 964cc72..0000000
--- a/350.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 4ace7cf1db75577e9c8eeb4826c9a04ac9bef4a9 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Mon, 28 Sep 2020 15:06:14 +0200
-Subject: [PATCH] simpler warning to avoid DivisionByZeroError exception in 8
-
----
- tests/270_imagick_restoreErrorHandler.phpt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/270_imagick_restoreErrorHandler.phpt b/tests/270_imagick_restoreErrorHandler.phpt
-index 77eeb17..ba2f5d1 100644
---- a/tests/270_imagick_restoreErrorHandler.phpt
-+++ b/tests/270_imagick_restoreErrorHandler.phpt
-@@ -16,7 +16,7 @@ catch(ImagickException $ie) {
- }
-
- try {
-- $x = @(5 / 0);
-+ $x = @$x;
- echo "Normal warning is suppressed".PHP_EOL;
- }
- catch(\Exception $e) {
-@@ -27,4 +27,4 @@ catch(\Exception $e) {
- ?>
- --EXPECTF--
- Normal exception
--Normal warning is suppressed
-\ No newline at end of file
-+Normal warning is suppressed
diff --git a/375.patch b/375.patch
deleted file mode 100644
index 53d6b1c..0000000
--- a/375.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 8e305b0035df336620f66d0ca4bb2a162a4977ed Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Mon, 25 Jan 2021 08:39:31 +0100
-Subject: [PATCH 1/2] call omp_pause_resource_all when available
-
----
- config.m4 | 2 ++
- imagick.c | 8 ++++++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/config.m4 b/config.m4
-index 15260dc..dfb73a1 100644
---- a/config.m4
-+++ b/config.m4
-@@ -58,6 +58,8 @@ IM_FIND_IMAGEMAGICK([6.2.4], [$PHP_IMAGICK])
-
- LIBS=$old_LIBS
-
-+ PHP_CHECK_FUNC(omp_pause_resource_all, gomp)
-+
- PHP_SUBST(IMAGICK_SHARED_LIBADD)
- AC_DEFINE(HAVE_IMAGICK,1,[ ])
- PHP_NEW_EXTENSION(imagick, imagick_file.c imagick_class.c imagickdraw_class.c imagickpixel_class.c imagickpixeliterator_class.c imagick_helpers.c imagick.c imagickkernel_class.c shim_im6_to_im7.c, $ext_shared,, $IM_IMAGEMAGICK_CFLAGS)
-diff --git a/imagick.c b/imagick.c
-index cd7f98e..5822b36 100644
---- a/imagick.c
-+++ b/imagick.c
-@@ -35,6 +35,10 @@
- /* For the countable interface */
- #include "ext/spl/spl_iterators.h"
-
-+#if HAVE_OMP_PAUSE_RESOURCE_ALL
-+#include <omp.h>
-+#endif
-+
- ZEND_DECLARE_MODULE_GLOBALS(imagick)
-
- #ifdef IMAGICK_WITH_KERNEL
-@@ -3953,6 +3957,9 @@ PHP_MSHUTDOWN_FUNCTION(imagick)
-
- MagickWandTerminus();
-
-+#if HAVE_OMP_PAUSE_RESOURCE_ALL
-+ omp_pause_resource_all(omp_pause_hard);
-+#else
- // Sleep for a bit to hopefully allow OpenMP to
- // shut down the threads it created, and avoid a segfault
- // This hack won't be needed once everyone is compiling ImageMagick
-@@ -3960,6 +3967,7 @@ PHP_MSHUTDOWN_FUNCTION(imagick)
- for (i = 0; i < 100 && i < IMAGICK_G(shutdown_sleep_count); i += 1) {
- usleep(1000);
- }
-+#endif
-
- #if defined(ZTS) && defined(PHP_WIN32)
- tsrm_mutex_free(imagick_mutex);
-
-From 071d6441ba02664e50cf021f8653b8e4d3014608 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Mon, 25 Jan 2021 15:15:14 +0100
-Subject: [PATCH 2/2] improve check
-
----
- config.m4 | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/config.m4 b/config.m4
-index dfb73a1..b92db01 100644
---- a/config.m4
-+++ b/config.m4
-@@ -58,7 +58,18 @@ IM_FIND_IMAGEMAGICK([6.2.4], [$PHP_IMAGICK])
-
- LIBS=$old_LIBS
-
-- PHP_CHECK_FUNC(omp_pause_resource_all, gomp)
-+ AC_MSG_CHECKING(omp_pause_resource_all usability)
-+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-+ #include <omp.h>
-+ ]],[[
-+ omp_pause_resource_all(omp_pause_hard);
-+ ]])],[
-+ AC_MSG_RESULT(yes)
-+ PHP_CHECK_FUNC(omp_pause_resource_all, gomp)
-+ PHP_ADD_LIBRARY(gomp,, GMAGICK_SHARED_LIBADD)
-+ ],[
-+ AC_MSG_RESULT(no)
-+ ])
-
- PHP_SUBST(IMAGICK_SHARED_LIBADD)
- AC_DEFINE(HAVE_IMAGICK,1,[ ])
-From d507dd74ee46ca8db0b659e4151f5e5440056aca Mon Sep 17 00:00:00 2001
-From: Danack <Danack@basereality.com>
-Date: Mon, 7 Jun 2021 22:01:14 +0100
-Subject: [PATCH] Tpyo.
-
----
- config.m4 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config.m4 b/config.m4
-index 9037f7ab..d1310a3e 100644
---- a/config.m4
-+++ b/config.m4
-@@ -68,7 +68,7 @@ IM_FIND_IMAGEMAGICK([6.2.4], [$PHP_IMAGICK])
- ]])],[
- AC_MSG_RESULT(yes)
- PHP_CHECK_FUNC(omp_pause_resource_all, gomp)
-- PHP_ADD_LIBRARY(gomp,, GMAGICK_SHARED_LIBADD)
-+ PHP_ADD_LIBRARY(gomp,, IMAGICK_SHARED_LIBADD)
- ],[
- AC_MSG_RESULT(no)
- ])
diff --git a/PHPINFO b/PHPINFO
index 9d3d653..2e95165 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,12 +2,12 @@
imagick
imagick module => enabled
-imagick module version => 3.4.4
+imagick module version => 3.5.0RC1
imagick classes => Imagick, ImagickDraw, ImagickPixel, ImagickPixelIterator, ImagickKernel
-Imagick compiled with ImageMagick version => ImageMagick 6.9.12-1 Q16 x86_64 2021-02-21 https://imagemagick.org
-Imagick using ImageMagick library version => ImageMagick 6.9.12-1 Q16 x86_64 2021-02-21 https://imagemagick.org
+Imagick compiled with ImageMagick version => ImageMagick 6.9.12-15 Q16 x86_64 2021-06-13 https://imagemagick.org
+Imagick using ImageMagick library version => ImageMagick 6.9.12-15 Q16 x86_64 2021-06-13 https://imagemagick.org
ImageMagick copyright => (C) 1999-2021 ImageMagick Studio LLC
-ImageMagick release date => 2021-02-21
+ImageMagick release date => 2021-06-13
ImageMagick number of supported formats: => 247
ImageMagick supported formats => 3FR, 3G2, 3GP, AAI, AI, APNG, ART, ARW, AVI, AVIF, AVS, BGR, BGRA, BGRO, BIE, BMP, BMP2, BMP3, BRF, CAL, CALS, CANVAS, CAPTION, CIN, CIP, CLIP, CMYK, CMYKA, CR2, CR3, CRW, CUR, CUT, DATA, DCM, DCR, DCX, DDS, DFONT, DJVU, DNG, DOT, DPX, DXT1, DXT5, EPDF, EPI, EPS, EPS2, EPS3, EPSF, EPSI, EPT, EPT2, EPT3, ERF, EXR, FAX, FILE, FITS, FRACTAL, FTP, FTS, G3, G4, GIF, GIF87, GRADIENT, GRAY, GRAYA, GROUP4, GV, H, HALD, HDR, HEIC, HISTOGRAM, HRZ, HTM, HTML, HTTP, HTTPS, ICB, ICO, ICON, IIQ, INFO, INLINE, IPL, ISOBRL, ISOBRL6, J2C, J2K, JBG, JBIG, JNG, JNX, JP2, JPC, JPE, JPEG, JPG, JPM, JPS, JPT, JSON, K25, KDC, LABEL, M2V, M4V, MAC, MAGICK, MAP, MASK, MAT, MATTE, MEF, MIFF, MKV, MNG, MONO, MOV, MP4, MPC, MPG, MRW, MSL, MSVG, MTV, MVG, NEF, NRW, NULL, ORF, OTB, OTF, PAL, PALM, PAM, PANGO, PATTERN, PBM, PCD, PCDS, PCL, PCT, PCX, PDB, PDF, PDFA, PEF, PES, PFA, PFB, PFM, PGM, PGX, PICON, PICT, PIX, PJPEG, PLASMA, PNG, PNG00, PNG24, PNG32, PNG48, PNG64, PNG8, PNM, POCKETMOD, PPM, PREVIEW, PS, PS2, PS3, PSB, PSD, PTIF, PWP, RADIAL-GRADIENT, RAF, RAS, RAW, RGB, RGBA, RGBO, RGF, RLA, RLE, RMF, RW2, SCR, SCT, SFW, SGI, SHTML, SIX, SIXEL, SPARSE-COLOR, SR2, SRF, STEGANO, SUN, SVG, SVGZ, TEXT, TGA, THUMBNAIL, TIFF, TIFF64, TILE, TIM, TTC, TTF, TXT, UBRL, UBRL6, UIL, UYVY, VDA, VICAR, VID, VIDEO, VIFF, VIPS, VST, WBMP, WEBM, WEBP, WMF, WMV, WMZ, WPG, X, X3F, XBM, XC, XCF, XPM, XPS, XV, XWD, YCbCr, YCbCrA, YUV
@@ -17,3 +17,4 @@ imagick.skip_version_check => 1 => 1
imagick.progress_monitor => 0 => 0
imagick.set_single_thread => 1 => 1
imagick.shutdown_sleep_count => 10 => 10
+imagick.allow_zero_dimension_images => 0 => 0
diff --git a/REFLECTION b/REFLECTION
index d2d66bd..2b3be21 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
+Extension [ <persistent> extension #75 imagick version 3.5.0RC1 ] {
- Dependencies {
Dependency [ gmagick (Conflicts) ]
@@ -22,6 +22,9 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
Entry [ imagick.shutdown_sleep_count <ALL> ]
Current = '10'
}
+ Entry [ imagick.allow_zero_dimension_images <ALL> ]
+ Current = '0'
+ }
}
- Classes [10] {
@@ -312,7 +315,7 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
Class [ <internal:imagick> <iterateable> class Imagick implements Iterator, Traversable, Countable ] {
- - Constants [574] {
+ - Constants [583] {
Constant [ public int COLOR_BLACK ] { 11 }
Constant [ public int COLOR_BLUE ] { 12 }
Constant [ public int COLOR_CYAN ] { 13 }
@@ -323,8 +326,8 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
Constant [ public int COLOR_OPACITY ] { 18 }
Constant [ public int COLOR_ALPHA ] { 19 }
Constant [ public int COLOR_FUZZ ] { 20 }
- Constant [ public int IMAGICK_EXTNUM ] { 30404 }
- Constant [ public string IMAGICK_EXTVER ] { 3.4.4 }
+ Constant [ public int IMAGICK_EXTNUM ] { 30500 }
+ Constant [ public string IMAGICK_EXTVER ] { 3.5.0RC1 }
Constant [ public int QUANTUM_RANGE ] { 65535 }
Constant [ public int USE_ZEND_MM ] { 0 }
Constant [ public int COMPOSITE_DEFAULT ] { 40 }
@@ -555,12 +558,19 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
Constant [ public int METRIC_FUZZERROR ] { 9 }
Constant [ public int METRIC_PERCEPTUALHASH_ERROR ] { 255 }
Constant [ public int PIXEL_CHAR ] { 1 }
+ Constant [ public int PIXELSTORAGE_CHAR ] { 1 }
Constant [ public int PIXEL_DOUBLE ] { 2 }
+ Constant [ public int PIXELSTORAGE_DOUBLE ] { 2 }
Constant [ public int PIXEL_FLOAT ] { 3 }
+ Constant [ public int PIXELSTORAGE_FLOAT ] { 3 }
Constant [ public int PIXEL_INTEGER ] { 4 }
+ Constant [ public int PIXELSTORAGE_INTEGER ] { 4 }
Constant [ public int PIXEL_LONG ] { 5 }
+ Constant [ public int PIXELSTORAGE_LONG ] { 5 }
Constant [ public int PIXEL_QUANTUM ] { 6 }
+ Constant [ public int PIXELSTORAGE_QUANTUM ] { 6 }
Constant [ public int PIXEL_SHORT ] { 7 }
+ Constant [ public int PIXELSTORAGE_SHORT ] { 7 }
Constant [ public int EVALUATE_UNDEFINED ] { 0 }
Constant [ public int EVALUATE_ADD ] { 1 }
Constant [ public int EVALUATE_AND ] { 2 }
@@ -646,6 +656,8 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
Constant [ public int VIRTUALPIXELMETHOD_HORIZONTALTILEEDGE ] { 15 }
Constant [ public int VIRTUALPIXELMETHOD_VERTICALTILEEDGE ] { 16 }
Constant [ public int VIRTUALPIXELMETHOD_CHECKERTILE ] { 17 }
+ Constant [ public int VIRTUALPIXELMETHOD_DITHER ] { 3 }
+ Constant [ public int VIRTUALPIXELMETHOD_RANDOM ] { 6 }
Constant [ public int PREVIEW_UNDEFINED ] { 0 }
Constant [ public int PREVIEW_ROTATE ] { 1 }
Constant [ public int PREVIEW_SHEAR ] { 2 }
@@ -893,121 +905,121 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
- Static methods [20] {
- Method [ <internal:imagick> static public method queryformats ] {
+ Method [ <internal:imagick> static public method queryFormats ] {
- Parameters [1] {
- Parameter #0 [ <required> $pattern ]
+ Parameter #0 [ <optional> $pattern ]
}
}
- Method [ <internal:imagick> static public method queryfonts ] {
+ Method [ <internal:imagick> static public method queryFonts ] {
- Parameters [1] {
- Parameter #0 [ <required> $pattern ]
+ Parameter #0 [ <optional> $pattern ]
}
}
- Method [ <internal:imagick> static public method calculatecrop ] {
+ Method [ <internal:imagick> static public method calculateCrop ] {
- Parameters [5] {
- Parameter #0 [ <required> $orig_width ]
- Parameter #1 [ <required> $orig_height ]
+ Parameter #0 [ <required> $original_width ]
+ Parameter #1 [ <required> $original_height ]
Parameter #2 [ <required> $desired_width ]
Parameter #3 [ <required> $desired_height ]
Parameter #4 [ <optional> $legacy ]
}
}
- Method [ <internal:imagick> static public method getcopyright ] {
+ Method [ <internal:imagick> static public method getCopyright ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> static public method getconfigureoptions ] {
+ Method [ <internal:imagick> static public method getConfigureOptions ] {
- Parameters [1] {
Parameter #0 [ <optional> $pattern ]
}
}
- Method [ <internal:imagick> static public method getfeatures ] {
+ Method [ <internal:imagick> static public method getFeatures ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> static public method gethomeurl ] {
+ Method [ <internal:imagick> static public method getHomeURL ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> static public method getpackagename ] {
+ Method [ <internal:imagick> static public method getPackageName ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> static public method getquantum ] {
+ Method [ <internal:imagick> static public method getQuantum ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> static public method gethdrienabled ] {
+ Method [ <internal:imagick> static public method getHdriEnabled ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> static public method getquantumdepth ] {
+ Method [ <internal:imagick> static public method getQuantumDepth ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> static public method getquantumrange ] {
+ Method [ <internal:imagick> static public method getQuantumRange ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> static public method getreleasedate ] {
+ Method [ <internal:imagick> static public method getReleaseDate ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> static public method getresource ] {
+ Method [ <internal:imagick> static public method getResource ] {
- Parameters [1] {
- Parameter #0 [ <required> $resource_type ]
+ Parameter #0 [ <required> $type ]
}
}
- Method [ <internal:imagick> static public method getresourcelimit ] {
+ Method [ <internal:imagick> static public method getResourceLimit ] {
- Parameters [1] {
- Parameter #0 [ <required> $resource_type ]
+ Parameter #0 [ <required> $type ]
}
}
- Method [ <internal:imagick> static public method getversion ] {
+ Method [ <internal:imagick> static public method getVersion ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> static public method setresourcelimit ] {
+ Method [ <internal:imagick> static public method setResourceLimit ] {
- Parameters [2] {
- Parameter #0 [ <required> $RESOURCETYPE ]
+ Parameter #0 [ <required> $type ]
Parameter #1 [ <required> $limit ]
}
}
- Method [ <internal:imagick> static public method setregistry ] {
+ Method [ <internal:imagick> static public method setRegistry ] {
- Parameters [2] {
Parameter #0 [ <required> $key ]
@@ -1015,14 +1027,14 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> static public method getregistry ] {
+ Method [ <internal:imagick> static public method getRegistry ] {
- Parameters [1] {
Parameter #0 [ <required> $key ]
}
}
- Method [ <internal:imagick> static public method listregistry ] {
+ Method [ <internal:imagick> static public method listRegistry ] {
- Parameters [0] {
}
@@ -1032,91 +1044,92 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
- Properties [0] {
}
- - Methods [352] {
- Method [ <internal:imagick> public method optimizeimagelayers ] {
+ - Methods [353] {
+ Method [ <internal:imagick> public method optimizeImageLayers ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method compareimagelayers ] {
+ Method [ <internal:imagick> public method compareImageLayers ] {
- Parameters [1] {
- Parameter #0 [ <required> $LAYER ]
+ Parameter #0 [ <required> $metric ]
}
}
- Method [ <internal:imagick> public method pingimageblob ] {
+ Method [ <internal:imagick> public method pingImageBlob ] {
- Parameters [1] {
- Parameter #0 [ <required> $imageContents ]
+ Parameter #0 [ <required> $image ]
}
}
- Method [ <internal:imagick> public method pingimagefile ] {
+ Method [ <internal:imagick> public method pingImageFile ] {
- - Parameters [1] {
- Parameter #0 [ <required> $fp ]
+ - Parameters [2] {
+ Parameter #0 [ <required> $filehandle ]
+ Parameter #1 [ <optional> $filename ]
}
}
- Method [ <internal:imagick> public method transposeimage ] {
+ Method [ <internal:imagick> public method transposeImage ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method transverseimage ] {
+ Method [ <internal:imagick> public method transverseImage ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method trimimage ] {
+ Method [ <internal:imagick> public method trimImage ] {
- Parameters [1] {
Parameter #0 [ <required> $fuzz ]
}
}
- Method [ <internal:imagick> public method waveimage ] {
+ Method [ <internal:imagick> public method waveImage ] {
- Parameters [2] {
Parameter #0 [ <required> $amplitude ]
- Parameter #1 [ <required> $waveLenght ]
+ Parameter #1 [ <required> $length ]
}
}
- Method [ <internal:imagick> public method vignetteimage ] {
+ Method [ <internal:imagick> public method vignetteImage ] {
- Parameters [4] {
- Parameter #0 [ <required> $blackPoint ]
- Parameter #1 [ <required> $whitePoint ]
+ Parameter #0 [ <required> $black_point ]
+ Parameter #1 [ <required> $white_point ]
Parameter #2 [ <required> $x ]
Parameter #3 [ <required> $y ]
}
}
- Method [ <internal:imagick> public method uniqueimagecolors ] {
+ Method [ <internal:imagick> public method uniqueImageColors ] {
- Parameters [0] {
}
}
- Method [ <internal, deprecated:imagick> public method getimagematte ] {
+ Method [ <internal, deprecated:imagick> public method getImageMatte ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method setimagematte ] {
+ Method [ <internal:imagick> public method setImageMatte ] {
- Parameters [1] {
- Parameter #0 [ <required> $enable ]
+ Parameter #0 [ <required> $matte ]
}
}
- Method [ <internal:imagick> public method adaptiveresizeimage ] {
+ Method [ <internal:imagick> public method adaptiveResizeImage ] {
- Parameters [4] {
Parameter #0 [ <required> $columns ]
@@ -1126,7 +1139,7 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method sketchimage ] {
+ Method [ <internal:imagick> public method sketchImage ] {
- Parameters [3] {
Parameter #0 [ <required> $radius ]
@@ -1135,7 +1148,7 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method shadeimage ] {
+ Method [ <internal:imagick> public method shadeImage ] {
- Parameters [3] {
Parameter #0 [ <required> $gray ]
@@ -1144,13 +1157,13 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method getsizeoffset ] {
+ Method [ <internal:imagick> public method getSizeOffset ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method setsizeoffset ] {
+ Method [ <internal:imagick> public method setSizeOffset ] {
- Parameters [3] {
Parameter #0 [ <required> $columns ]
@@ -1159,78 +1172,78 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method adaptiveblurimage ] {
+ Method [ <internal:imagick> public method adaptiveBlurImage ] {
- Parameters [3] {
Parameter #0 [ <required> $radius ]
Parameter #1 [ <required> $sigma ]
- Parameter #2 [ <optional> $CHANNEL ]
+ Parameter #2 [ <optional> $channel ]
}
}
- Method [ <internal:imagick> public method contraststretchimage ] {
+ Method [ <internal:imagick> public method contrastStretchImage ] {
- Parameters [3] {
- Parameter #0 [ <required> $blackPoint ]
- Parameter #1 [ <required> $whitePoint ]
- Parameter #2 [ <optional> $CHANNEL ]
+ Parameter #0 [ <required> $black_point ]
+ Parameter #1 [ <required> $white_point ]
+ Parameter #2 [ <optional> $channel ]
}
}
- Method [ <internal:imagick> public method adaptivesharpenimage ] {
+ Method [ <internal:imagick> public method adaptiveSharpenImage ] {
- Parameters [3] {
Parameter #0 [ <required> $radius ]
Parameter #1 [ <required> $sigma ]
- Parameter #2 [ <optional> $CHANNEL ]
+ Parameter #2 [ <optional> $channel ]
}
}
- Method [ <internal:imagick> public method randomthresholdimage ] {
+ Method [ <internal:imagick> public method randomThresholdImage ] {
- Parameters [3] {
Parameter #0 [ <required> $low ]
Parameter #1 [ <required> $high ]
- Parameter #2 [ <optional> $CHANNELTYPE ]
+ Parameter #2 [ <optional> $channel ]
}
}
- Method [ <internal, deprecated:imagick> public method roundcornersimage ] {
+ Method [ <internal, deprecated:imagick> public method roundCornersImage ] {
- Parameters [5] {
- Parameter #0 [ <required> $xRounding ]
- Parameter #1 [ <required> $yRounding ]
- Parameter #2 [ <optional> $strokeWidth ]
+ Parameter #0 [ <required> $x_rounding ]
+ Parameter #1 [ <required> $y_rounding ]
+ Parameter #2 [ <optional> $stroke_width ]
Parameter #3 [ <optional> $displace ]
- Parameter #4 [ <optional> $sizeCorrection ]
+ Parameter #4 [ <optional> $size_correction ]
}
}
- Method [ <internal, deprecated:imagick> public method roundcorners ] {
+ Method [ <internal, deprecated:imagick> public method roundCorners ] {
- Parameters [5] {
- Parameter #0 [ <required> $xRounding ]
- Parameter #1 [ <required> $yRounding ]
- Parameter #2 [ <optional> $strokeWidth ]
+ Parameter #0 [ <required> $x_rounding ]
+ Parameter #1 [ <required> $y_rounding ]
+ Parameter #2 [ <optional> $stroke_width ]
Parameter #3 [ <optional> $displace ]
- Parameter #4 [ <optional> $sizeCorrection ]
+ Parameter #4 [ <optional> $size_correction ]
}
}
- Method [ <internal:imagick> public method setiteratorindex ] {
+ Method [ <internal:imagick> public method setIteratorIndex ] {
- Parameters [1] {
Parameter #0 [ <required> $index ]
}
}
- Method [ <internal:imagick> public method getiteratorindex ] {
+ Method [ <internal:imagick> public method getIteratorIndex ] {
- Parameters [0] {
}
}
- Method [ <internal, deprecated:imagick> public method transformimage ] {
+ Method [ <internal, deprecated:imagick> public method transformImage ] {
- Parameters [2] {
Parameter #0 [ <required> $crop ]
@@ -1238,37 +1251,37 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal, deprecated:imagick> public method setimageopacity ] {
+ Method [ <internal, deprecated:imagick> public method setImageOpacity ] {
- Parameters [1] {
Parameter #0 [ <required> $opacity ]
}
}
- Method [ <internal, deprecated:imagick> public method orderedposterizeimage ] {
+ Method [ <internal, deprecated:imagick> public method orderedPosterizeImage ] {
- Parameters [2] {
Parameter #0 [ <required> $threshold_map ]
- Parameter #1 [ <optional> $CHANNEL ]
+ Parameter #1 [ <optional> $channel ]
}
}
- Method [ <internal:imagick> public method polaroidimage ] {
+ Method [ <internal:imagick> public method polaroidImage ] {
- Parameters [2] {
- Parameter #0 [ <required> ImagickDraw $ImagickDraw ]
+ Parameter #0 [ <required> ImagickDraw $settings ]
Parameter #1 [ <required> $angle ]
}
}
- Method [ <internal:imagick> public method getimageproperty ] {
+ Method [ <internal:imagick> public method getImageProperty ] {
- Parameters [1] {
Parameter #0 [ <required> $name ]
}
}
- Method [ <internal:imagick> public method setimageproperty ] {
+ Method [ <internal:imagick> public method setImageProperty ] {
- Parameters [2] {
Parameter #0 [ <required> $name ]
@@ -1276,48 +1289,48 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method deleteimageproperty ] {
+ Method [ <internal:imagick> public method deleteImageProperty ] {
- Parameters [1] {
Parameter #0 [ <required> $name ]
}
}
- Method [ <internal:imagick> public method identifyformat ] {
+ Method [ <internal:imagick> public method identifyFormat ] {
- Parameters [1] {
- Parameter #0 [ <required> $embedText ]
+ Parameter #0 [ <required> $format ]
}
}
- Method [ <internal:imagick> public method setimageinterpolatemethod ] {
+ Method [ <internal:imagick> public method setImageInterpolateMethod ] {
- Parameters [1] {
- Parameter #0 [ <required> $INTERPOLATE ]
+ Parameter #0 [ <required> $method ]
}
}
- Method [ <internal:imagick> public method getimageinterpolatemethod ] {
+ Method [ <internal:imagick> public method getImageInterpolateMethod ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method linearstretchimage ] {
+ Method [ <internal:imagick> public method linearStretchImage ] {
- Parameters [2] {
- Parameter #0 [ <required> $blackPoint ]
- Parameter #1 [ <required> $whitePoint ]
+ Parameter #0 [ <required> $black_point ]
+ Parameter #1 [ <required> $white_point ]
}
}
- Method [ <internal:imagick> public method getimagelength ] {
+ Method [ <internal:imagick> public method getImageLength ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method extentimage ] {
+ Method [ <internal:imagick> public method extentImage ] {
- Parameters [4] {
Parameter #0 [ <required> $width ]
@@ -1327,261 +1340,261 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method getimageorientation ] {
+ Method [ <internal:imagick> public method getImageOrientation ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method setimageorientation ] {
+ Method [ <internal:imagick> public method setImageOrientation ] {
- Parameters [1] {
- Parameter #0 [ <required> $ORIENTATION ]
+ Parameter #0 [ <required> $orientation ]
}
}
- Method [ <internal, deprecated:imagick> public method paintfloodfillimage ] {
+ Method [ <internal, deprecated:imagick> public method paintFloodfillImage ] {
- Parameters [6] {
- Parameter #0 [ <required> $CHANNEL ]
- Parameter #1 [ <required> $fill ]
- Parameter #2 [ <required> $fuzz ]
- Parameter #3 [ <required> $bordercolor ]
- Parameter #4 [ <required> $x ]
- Parameter #5 [ <required> $y ]
+ Parameter #0 [ <required> $fill_color ]
+ Parameter #1 [ <required> $fuzz ]
+ Parameter #2 [ <required> $border_color ]
+ Parameter #3 [ <required> $x ]
+ Parameter #4 [ <required> $y ]
+ Parameter #5 [ <optional> $channel ]
}
}
- Method [ <internal:imagick> public method clutimage ] {
+ Method [ <internal:imagick> public method clutImage ] {
- Parameters [2] {
- Parameter #0 [ <required> Imagick $Imagick ]
- Parameter #1 [ <optional> $CHANNELTYPE ]
+ Parameter #0 [ <required> Imagick $lookup_table ]
+ Parameter #1 [ <optional> $channel ]
}
}
- Method [ <internal:imagick> public method getimageproperties ] {
+ Method [ <internal:imagick> public method getImageProperties ] {
- Parameters [2] {
Parameter #0 [ <optional> $pattern ]
- Parameter #1 [ <optional> $values ]
+ Parameter #1 [ <optional> $include_values ]
}
}
- Method [ <internal:imagick> public method getimageprofiles ] {
+ Method [ <internal:imagick> public method getImageProfiles ] {
- Parameters [2] {
Parameter #0 [ <optional> $pattern ]
- Parameter #1 [ <optional> $values ]
+ Parameter #1 [ <optional> $include_values ]
}
}
- Method [ <internal:imagick> public method distortimage ] {
+ Method [ <internal:imagick> public method distortImage ] {
- Parameters [3] {
- Parameter #0 [ <required> $method ]
+ Parameter #0 [ <required> $distortion ]
Parameter #1 [ <required> $arguments ]
Parameter #2 [ <required> $bestfit ]
}
}
- Method [ <internal:imagick> public method writeimagefile ] {
+ Method [ <internal:imagick> public method writeImageFile ] {
- Parameters [2] {
- Parameter #0 [ <required> $handle ]
+ Parameter #0 [ <required> $filehandle ]
Parameter #1 [ <optional> $format ]
}
}
- Method [ <internal:imagick> public method writeimagesfile ] {
+ Method [ <internal:imagick> public method writeImagesFile ] {
- Parameters [2] {
- Parameter #0 [ <required> $handle ]
+ Parameter #0 [ <required> $filehandle ]
Parameter #1 [ <optional> $format ]
}
}
- Method [ <internal:imagick> public method resetimagepage ] {
+ Method [ <internal:imagick> public method resetImagePage ] {
- Parameters [1] {
Parameter #0 [ <required> $page ]
}
}
- Method [ <internal, deprecated:imagick> public method setimageclipmask ] {
+ Method [ <internal, deprecated:imagick> public method setImageClipMask ] {
- Parameters [1] {
- Parameter #0 [ <required> Imagick $Imagick ]
+ Parameter #0 [ <required> imagick $clip_mask ]
}
}
- Method [ <internal, deprecated:imagick> public method getimageclipmask ] {
+ Method [ <internal, deprecated:imagick> public method getImageClipMask ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method animateimages ] {
+ Method [ <internal:imagick> public method animateImages ] {
- Parameters [1] {
- Parameter #0 [ <required> $server_name ]
+ Parameter #0 [ <required> $x_server ]
}
}
- Method [ <internal, deprecated:imagick> public method recolorimage ] {
+ Method [ <internal, deprecated:imagick> public method recolorImage ] {
- Parameters [1] {
Parameter #0 [ <required> $matrix ]
}
}
- Method [ <internal:imagick> public method setfont ] {
+ Method [ <internal:imagick> public method setFont ] {
- Parameters [1] {
Parameter #0 [ <required> $font ]
}
}
- Method [ <internal:imagick> public method getfont ] {
+ Method [ <internal:imagick> public method getFont ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method setpointsize ] {
+ Method [ <internal:imagick> public method setPointSize ] {
- Parameters [1] {
- Parameter #0 [ <required> $pointsize ]
+ Parameter #0 [ <required> $point_size ]
}
}
- Method [ <internal:imagick> public method getpointsize ] {
+ Method [ <internal:imagick> public method getPointSize ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method mergeimagelayers ] {
+ Method [ <internal:imagick> public method mergeImageLayers ] {
- Parameters [1] {
- Parameter #0 [ <required> $LAYERMETHOD ]
+ Parameter #0 [ <required> $layermethod ]
}
}
- Method [ <internal:imagick> public method setimagealphachannel ] {
+ Method [ <internal:imagick> public method setImageAlphaChannel ] {
- Parameters [1] {
- Parameter #0 [ <required> $ALPHACHANNELTYPE ]
+ Parameter #0 [ <required> $alphachannel ]
}
}
- Method [ <internal:imagick> public method floodfillpaintimage ] {
+ Method [ <internal:imagick> public method floodfillPaintImage ] {
- Parameters [7] {
- Parameter #0 [ <required> $fill ]
+ Parameter #0 [ <required> $fill_color ]
Parameter #1 [ <required> $fuzz ]
- Parameter #2 [ <required> $bordercolor ]
+ Parameter #2 [ <required> $border_color ]
Parameter #3 [ <required> $x ]
Parameter #4 [ <required> $y ]
Parameter #5 [ <required> $invert ]
- Parameter #6 [ <optional> $CHANNEL ]
+ Parameter #6 [ <optional> $channel ]
}
}
- Method [ <internal:imagick> public method opaquepaintimage ] {
+ Method [ <internal:imagick> public method opaquePaintImage ] {
- Parameters [5] {
- Parameter #0 [ <required> $target ]
- Parameter #1 [ <required> $fill ]
+ Parameter #0 [ <required> $target_color ]
+ Parameter #1 [ <required> $fill_color ]
Parameter #2 [ <required> $fuzz ]
Parameter #3 [ <required> $invert ]
- Parameter #4 [ <optional> $CHANNEL ]
+ Parameter #4 [ <optional> $channel ]
}
}
- Method [ <internal:imagick> public method transparentpaintimage ] {
+ Method [ <internal:imagick> public method transparentPaintImage ] {
- Parameters [4] {
- Parameter #0 [ <required> $target ]
+ Parameter #0 [ <required> $target_color ]
Parameter #1 [ <required> $alpha ]
Parameter #2 [ <required> $fuzz ]
Parameter #3 [ <required> $invert ]
}
}
- Method [ <internal:imagick> public method liquidrescaleimage ] {
+ Method [ <internal:imagick> public method liquidRescaleImage ] {
- Parameters [4] {
- Parameter #0 [ <required> $columns ]
- Parameter #1 [ <required> $rows ]
+ Parameter #0 [ <required> $width ]
+ Parameter #1 [ <required> $height ]
Parameter #2 [ <required> $delta_x ]
Parameter #3 [ <required> $rigidity ]
}
}
- Method [ <internal:imagick> public method encipherimage ] {
+ Method [ <internal:imagick> public method encipherImage ] {
- Parameters [1] {
Parameter #0 [ <required> $passphrase ]
}
}
- Method [ <internal:imagick> public method decipherimage ] {
+ Method [ <internal:imagick> public method decipherImage ] {
- Parameters [1] {
Parameter #0 [ <required> $passphrase ]
}
}
- Method [ <internal:imagick> public method setgravity ] {
+ Method [ <internal:imagick> public method setGravity ] {
- Parameters [1] {
- Parameter #0 [ <required> $GRAVITY ]
+ Parameter #0 [ <required> $gravity ]
}
}
- Method [ <internal:imagick> public method getgravity ] {
+ Method [ <internal:imagick> public method getGravity ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getimagechannelrange ] {
+ Method [ <internal:imagick> public method getImageChannelRange ] {
- Parameters [1] {
- Parameter #0 [ <required> $CHANNEL ]
+ Parameter #0 [ <required> $channel ]
}
}
- Method [ <internal:imagick> public method getimagealphachannel ] {
+ Method [ <internal:imagick> public method getImageAlphaChannel ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getimagechanneldistortions ] {
+ Method [ <internal:imagick> public method getImageChannelDistortions ] {
- Parameters [3] {
- Parameter #0 [ <required> Imagick $Imagick ]
- Parameter #1 [ <optional> $METRICTYPE ]
- Parameter #2 [ <optional> $CHANNEL ]
+ Parameter #0 [ <required> Imagick $reference_image ]
+ Parameter #1 [ <required> $metric ]
+ Parameter #2 [ <optional> $channel ]
}
}
- Method [ <internal:imagick> public method setimagegravity ] {
+ Method [ <internal:imagick> public method setImageGravity ] {
- Parameters [1] {
- Parameter #0 [ <required> $GRAVITY ]
+ Parameter #0 [ <required> $gravity ]
}
}
- Method [ <internal:imagick> public method getimagegravity ] {
+ Method [ <internal:imagick> public method getImageGravity ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method importimagepixels ] {
+ Method [ <internal:imagick> public method importImagePixels ] {
- Parameters [7] {
Parameter #0 [ <required> $x ]
@@ -1589,46 +1602,46 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
Parameter #2 [ <required> $width ]
Parameter #3 [ <required> $height ]
Parameter #4 [ <required> $map ]
- Parameter #5 [ <required> $storage ]
- Parameter #6 [ <required> $PIXEL ]
+ Parameter #5 [ <required> $pixelstorage ]
+ Parameter #6 [ <required> $pixels ]
}
}
- Method [ <internal:imagick> public method deskewimage ] {
+ Method [ <internal:imagick> public method deskewImage ] {
- Parameters [1] {
Parameter #0 [ <required> $threshold ]
}
}
- Method [ <internal:imagick> public method segmentimage ] {
+ Method [ <internal:imagick> public method segmentImage ] {
- Parameters [4] {
- Parameter #0 [ <required> $COLORSPACE ]
+ Parameter #0 [ <required> $colorspace ]
Parameter #1 [ <required> $cluster_threshold ]
Parameter #2 [ <required> $smooth_threshold ]
Parameter #3 [ <optional> $verbose ]
}
}
- Method [ <internal:imagick> public method sparsecolorimage ] {
+ Method [ <internal:imagick> public method sparseColorImage ] {
- Parameters [3] {
- Parameter #0 [ <required> $SPARSE_METHOD ]
+ Parameter #0 [ <required> $sparsecolormethod ]
Parameter #1 [ <required> $arguments ]
- Parameter #2 [ <optional> $CHANNEL ]
+ Parameter #2 [ <optional> $channel ]
}
}
- Method [ <internal:imagick> public method remapimage ] {
+ Method [ <internal:imagick> public method remapImage ] {
- Parameters [2] {
- Parameter #0 [ <required> Imagick $Imagick ]
- Parameter #1 [ <required> $DITHER ]
+ Parameter #0 [ <required> Imagick $replacement ]
+ Parameter #1 [ <required> $dither_method ]
}
}
- Method [ <internal:imagick> public method exportimagepixels ] {
+ Method [ <internal:imagick> public method exportImagePixels ] {
- Parameters [6] {
Parameter #0 [ <required> $x ]
@@ -1636,62 +1649,63 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
Parameter #2 [ <required> $width ]
Parameter #3 [ <required> $height ]
Parameter #4 [ <required> $map ]
- Parameter #5 [ <required> $STORAGE ]
+ Parameter #5 [ <required> $pixelstorage ]
}
}
- Method [ <internal:imagick> public method getimagechannelkurtosis ] {
+ Method [ <internal:imagick> public method getImageChannelKurtosis ] {
- Parameters [1] {
- Parameter #0 [ <optional> $CHANNEL ]
+ Parameter #0 [ <optional> $channel ]
}
}
- Method [ <internal:imagick> public method functionimage ] {
+ Method [ <internal:imagick> public method functionImage ] {
- - Parameters [2] {
- Parameter #0 [ <required> $FUNCTION ]
- Parameter #1 [ <required> $arguments ]
+ - Parameters [3] {
+ Parameter #0 [ <required> $function ]
+ Parameter #1 [ <required> $parameters ]
+ Parameter #2 [ <optional> $channel ]
}
}
- Method [ <internal:imagick> public method transformimagecolorspace ] {
+ Method [ <internal:imagick> public method transformImageColorspace ] {
- Parameters [1] {
- Parameter #0 [ <required> $COLORSPACE ]
+ Parameter #0 [ <required> $colorspace ]
}
}
- Method [ <internal:imagick> public method haldclutimage ] {
+ Method [ <internal:imagick> public method haldClutImage ] {
- Parameters [2] {
- Parameter #0 [ <required> Imagick $Imagick ]
- Parameter #1 [ <optional> $CHANNEL ]
+ Parameter #0 [ <required> Imagick $clut ]
+ Parameter #1 [ <optional> $channel ]
}
}
- Method [ <internal:imagick> public method autolevelimage ] {
+ Method [ <internal:imagick> public method autoLevelImage ] {
- Parameters [1] {
- Parameter #0 [ <optional> $CHANNEL ]
+ Parameter #0 [ <optional> $channel ]
}
}
- Method [ <internal:imagick> public method blueshiftimage ] {
+ Method [ <internal:imagick> public method blueShiftImage ] {
- Parameters [1] {
Parameter #0 [ <optional> $factor ]
}
}
- Method [ <internal:imagick> public method getimageartifact ] {
+ Method [ <internal:imagick> public method getImageArtifact ] {
- Parameters [1] {
Parameter #0 [ <required> $artifact ]
}
}
- Method [ <internal:imagick> public method setimageartifact ] {
+ Method [ <internal:imagick> public method setImageArtifact ] {
- Parameters [2] {
Parameter #0 [ <required> $artifact ]
@@ -1699,34 +1713,34 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method deleteimageartifact ] {
+ Method [ <internal:imagick> public method deleteImageArtifact ] {
- Parameters [1] {
Parameter #0 [ <required> $artifact ]
}
}
- Method [ <internal:imagick> public method getcolorspace ] {
+ Method [ <internal:imagick> public method getColorspace ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method setcolorspace ] {
+ Method [ <internal:imagick> public method setColorspace ] {
- Parameters [1] {
- Parameter #0 [ <required> $COLORSPACE ]
+ Parameter #0 [ <required> $colorspace ]
}
}
- Method [ <internal:imagick> public method clampimage ] {
+ Method [ <internal:imagick> public method clampImage ] {
- Parameters [1] {
- Parameter #0 [ <optional> $CHANNEL ]
+ Parameter #0 [ <optional> $channel ]
}
}
- Method [ <internal:imagick> public method smushimages ] {
+ Method [ <internal:imagick> public method smushImages ] {
- Parameters [2] {
Parameter #0 [ <required> $stack ]
@@ -1741,7 +1755,7 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method __tostring ] {
+ Method [ <internal:imagick> public method __toString ] {
- Parameters [0] {
}
@@ -1754,70 +1768,69 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method getpixeliterator ] {
+ Method [ <internal:imagick> public method getPixelIterator ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getpixelregioniterator ] {
+ Method [ <internal:imagick> public method getPixelRegionIterator ] {
- - Parameters [5] {
+ - Parameters [4] {
Parameter #0 [ <required> $x ]
Parameter #1 [ <required> $y ]
Parameter #2 [ <required> $columns ]
Parameter #3 [ <required> $rows ]
- Parameter #4 [ <required> $modify ]
}
}
- Method [ <internal:imagick> public method readimage ] {
+ Method [ <internal:imagick> public method readImage ] {
- Parameters [1] {
Parameter #0 [ <required> $filename ]
}
}
- Method [ <internal:imagick> public method readimages ] {
+ Method [ <internal:imagick> public method readImages ] {
- Parameters [1] {
Parameter #0 [ <required> $filenames ]
}
}
- Method [ <internal:imagick> public method readimageblob ] {
+ Method [ <internal:imagick> public method readImageBlob ] {
- Parameters [2] {
- Parameter #0 [ <required> $imageContents ]
+ Parameter #0 [ <required> $image ]
Parameter #1 [ <optional> $filename ]
}
}
- Method [ <internal:imagick> public method setimageformat ] {
+ Method [ <internal:imagick> public method setImageFormat ] {
- Parameters [1] {
- Parameter #0 [ <required> $imageFormat ]
+ Parameter #0 [ <required> $format ]
}
}
- Method [ <internal:imagick> public method scaleimage ] {
+ Method [ <internal:imagick> public method scaleImage ] {
- Parameters [4] {
- Parameter #0 [ <required> $width ]
- Parameter #1 [ <required> $height ]
+ Parameter #0 [ <required> $columns ]
+ Parameter #1 [ <required> $rows ]
Parameter #2 [ <optional> $bestfit ]
Parameter #3 [ <optional> $legacy ]
}
}
- Method [ <internal:imagick> public method writeimage ] {
+ Method [ <internal:imagick> public method writeImage ] {
- Parameters [1] {
Parameter #0 [ <optional> $filename ]
}
}
- Method [ <internal:imagick> public method writeimages ] {
+ Method [ <internal:imagick> public method writeImages ] {
- Parameters [2] {
Parameter #0 [ <required> $filename ]
@@ -1825,27 +1838,27 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method blurimage ] {
+ Method [ <internal:imagick> public method blurImage ] {
- Parameters [3] {
Parameter #0 [ <required> $radius ]
Parameter #1 [ <required> $sigma ]
- Parameter #2 [ <optional> $CHANNELTYPE ]
+ Parameter #2 [ <optional> $channel ]
}
}
- Method [ <internal:imagick> public method thumbnailimage ] {
+ Method [ <internal:imagick> public method thumbnailImage ] {
- Parameters [5] {
- Parameter #0 [ <required> $width ]
- Parameter #1 [ <required> $height ]
+ Parameter #0 [ <required> $columns ]
+ Parameter #1 [ <required> $rows ]
Parameter #2 [ <optional> $bestfit ]
Parameter #3 [ <optional> $fill ]
Parameter #4 [ <optional> $legacy ]
}
}
- Method [ <internal:imagick> public method cropthumbnailimage ] {
+ Method [ <internal:imagick> public method cropThumbnailImage ] {
- Parameters [3] {
Parameter #0 [ <required> $width ]
@@ -1854,32 +1867,32 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method getimagefilename ] {
+ Method [ <internal:imagick> public method getImageFilename ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method setimagefilename ] {
+ Method [ <internal:imagick> public method setImageFilename ] {
- Parameters [1] {
Parameter #0 [ <required> $filename ]
}
}
- Method [ <internal:imagick> public method getimageformat ] {
+ Method [ <internal:imagick> public method getImageFormat ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getimagemimetype ] {
+ Method [ <internal:imagick> public method getImageMimeType ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method removeimage ] {
+ Method [ <internal:imagick> public method removeImage ] {
- Parameters [0] {
}
@@ -1903,87 +1916,87 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal, deprecated:imagick> public method getimagesize ] {
+ Method [ <internal, deprecated:imagick> public method getImageSize ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getimageblob ] {
+ Method [ <internal:imagick> public method getImageBlob ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getimagesblob ] {
+ Method [ <internal:imagick> public method getImagesBlob ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method setfirstiterator ] {
+ Method [ <internal:imagick> public method setFirstIterator ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method setlastiterator ] {
+ Method [ <internal:imagick> public method setLastIterator ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method resetiterator ] {
+ Method [ <internal:imagick> public method resetIterator ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method previousimage ] {
+ Method [ <internal:imagick> public method previousImage ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method nextimage ] {
+ Method [ <internal:imagick> public method nextImage ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method haspreviousimage ] {
+ Method [ <internal:imagick> public method hasPreviousImage ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method hasnextimage ] {
+ Method [ <internal:imagick> public method hasNextImage ] {
- Parameters [0] {
}
}
- Method [ <internal, deprecated:imagick> public method setimageindex ] {
+ Method [ <internal, deprecated:imagick> public method setImageIndex ] {
- Parameters [1] {
Parameter #0 [ <required> $index ]
}
}
- Method [ <internal, deprecated:imagick> public method getimageindex ] {
+ Method [ <internal, deprecated:imagick> public method getImageIndex ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method commentimage ] {
+ Method [ <internal:imagick> public method commentImage ] {
- Parameters [1] {
Parameter #0 [ <required> $comment ]
}
}
- Method [ <internal:imagick> public method cropimage ] {
+ Method [ <internal:imagick> public method cropImage ] {
- Parameters [4] {
Parameter #0 [ <required> $width ]
@@ -1993,56 +2006,56 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method labelimage ] {
+ Method [ <internal:imagick> public method labelImage ] {
- Parameters [1] {
Parameter #0 [ <required> $label ]
}
}
- Method [ <internal:imagick> public method getimagegeometry ] {
+ Method [ <internal:imagick> public method getImageGeometry ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method drawimage ] {
+ Method [ <internal:imagick> public method drawImage ] {
- Parameters [1] {
- Parameter #0 [ <required> ImagickDraw $ImagickDraw ]
+ Parameter #0 [ <required> ImagickDraw $drawing ]
}
}
- Method [ <internal:imagick> public method setimagecompressionquality ] {
+ Method [ <internal:imagick> public method setImageCompressionQuality ] {
- Parameters [1] {
Parameter #0 [ <required> $quality ]
}
}
- Method [ <internal:imagick> public method getimagecompressionquality ] {
+ Method [ <internal:imagick> public method getImageCompressionQuality ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method setimagecompression ] {
+ Method [ <internal:imagick> public method setImageCompression ] {
- Parameters [1] {
- Parameter #0 [ <required> $COMPRESSION ]
+ Parameter #0 [ <required> $compression ]
}
}
- Method [ <internal:imagick> public method getimagecompression ] {
+ Method [ <internal:imagick> public method getImageCompression ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method annotateimage ] {
+ Method [ <internal:imagick> public method annotateImage ] {
- Parameters [5] {
- Parameter #0 [ <required> ImagickDraw $ImagickDraw ]
+ Parameter #0 [ <required> ImagickDraw $settings ]
Parameter #1 [ <required> $x ]
Parameter #2 [ <required> $y ]
Parameter #3 [ <required> $angle ]
@@ -2050,18 +2063,18 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method compositeimage ] {
+ Method [ <internal:imagick> public method compositeImage ] {
- Parameters [5] {
- Parameter #0 [ <required> Imagick $Imagick ]
- Parameter #1 [ <required> $COMPOSITE ]
+ Parameter #0 [ <required> Imagick $composite_image ]
+ Parameter #1 [ <required> $composite ]
Parameter #2 [ <required> $x ]
Parameter #3 [ <required> $y ]
- Parameter #4 [ <optional> $CHANNELTYPE ]
+ Parameter #4 [ <optional> $channel ]
}
}
- Method [ <internal:imagick> public method modulateimage ] {
+ Method [ <internal:imagick> public method modulateImage ] {
- Parameters [3] {
Parameter #0 [ <required> $brightness ]
@@ -2070,39 +2083,39 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method getimagecolors ] {
+ Method [ <internal:imagick> public method getImageColors ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method montageimage ] {
+ Method [ <internal:imagick> public method montageImage ] {
- Parameters [5] {
- Parameter #0 [ <required> ImagickDraw $ImagickDraw ]
- Parameter #1 [ <required> $tileGeometry ]
- Parameter #2 [ <required> $thumbnailGeometry ]
- Parameter #3 [ <required> $MONTAGEMODE ]
+ Parameter #0 [ <required> ImagickDraw $settings ]
+ Parameter #1 [ <required> $tile_geometry ]
+ Parameter #2 [ <required> $thumbnail_geometry ]
+ Parameter #3 [ <required> $monatgemode ]
Parameter #4 [ <required> $frame ]
}
}
- Method [ <internal:imagick> public method identifyimage ] {
+ Method [ <internal:imagick> public method identifyImage ] {
- Parameters [1] {
- Parameter #0 [ <optional> $appendRawOutput ]
+ Parameter #0 [ <optional> $append_raw_output ]
}
}
- Method [ <internal:imagick> public method thresholdimage ] {
+ Method [ <internal:imagick> public method thresholdImage ] {
- Parameters [2] {
Parameter #0 [ <required> $threshold ]
- Parameter #1 [ <optional> $CHANNELTYPE ]
+ Parameter #1 [ <optional> $channel ]
}
}
- Method [ <internal:imagick> public method adaptivethresholdimage ] {
+ Method [ <internal:imagick> public method adaptiveThresholdImage ] {
- Parameters [3] {
Parameter #0 [ <required> $width ]
@@ -2111,28 +2124,28 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method blackthresholdimage ] {
+ Method [ <internal:imagick> public method blackThresholdImage ] {
- Parameters [1] {
- Parameter #0 [ <required> $color ]
+ Parameter #0 [ <required> $threshold_color ]
}
}
- Method [ <internal:imagick> public method whitethresholdimage ] {
+ Method [ <internal:imagick> public method whiteThresholdImage ] {
- Parameters [1] {
- Parameter #0 [ <required> $color ]
+ Parameter #0 [ <required> $threshold_color ]
}
}
- Method [ <internal:imagick> public method appendimages ] {
+ Method [ <internal:imagick> public method appendImages ] {
- Parameters [1] {
Parameter #0 [ <required> $stack ]
}
}
- Method [ <internal:imagick> public method charcoalimage ] {
+ Method [ <internal:imagick> public method charcoalImage ] {
- Parameters [2] {
Parameter #0 [ <required> $radius ]
@@ -2140,21 +2153,21 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method normalizeimage ] {
+ Method [ <internal:imagick> public method normalizeImage ] {
- Parameters [1] {
- Parameter #0 [ <optional> $CHANNEL ]
+ Parameter #0 [ <optional> $channel ]
}
}
- Method [ <internal:imagick> public method oilpaintimage ] {
+ Method [ <internal:imagick> public method oilPaintImage ] {
- Parameters [1] {
Parameter #0 [ <required> $radius ]
}
}
- Method [ <internal:imagick> public method posterizeimage ] {
+ Method [ <internal:imagick> public method posterizeImage ] {
- Parameters [2] {
Parameter #0 [ <required> $levels ]
@@ -2162,15 +2175,15 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal, deprecated:imagick> public method radialblurimage ] {
+ Method [ <internal, deprecated:imagick> public method radialBlurImage ] {
- Parameters [2] {
Parameter #0 [ <required> $angle ]
- Parameter #1 [ <optional> $CHANNEL ]
+ Parameter #1 [ <optional> $channel ]
}
}
- Method [ <internal:imagick> public method raiseimage ] {
+ Method [ <internal:imagick> public method raiseImage ] {
- Parameters [5] {
Parameter #0 [ <required> $width ]
@@ -2181,29 +2194,29 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method resampleimage ] {
+ Method [ <internal:imagick> public method resampleImage ] {
- Parameters [4] {
- Parameter #0 [ <required> $xResolution ]
- Parameter #1 [ <required> $yResolution ]
- Parameter #2 [ <required> $FILTER ]
+ Parameter #0 [ <required> $x_resolution ]
+ Parameter #1 [ <required> $y_resolution ]
+ Parameter #2 [ <required> $filter ]
Parameter #3 [ <required> $blur ]
}
}
- Method [ <internal:imagick> public method resizeimage ] {
+ Method [ <internal:imagick> public method resizeImage ] {
- Parameters [6] {
- Parameter #0 [ <required> $x ]
- Parameter #1 [ <required> $y ]
- Parameter #2 [ <optional> $filter ]
- Parameter #3 [ <optional> $blur ]
+ Parameter #0 [ <required> $columns ]
+ Parameter #1 [ <required> $rows ]
+ Parameter #2 [ <required> $filter ]
+ Parameter #3 [ <required> $blur ]
Parameter #4 [ <optional> $bestfit ]
Parameter #5 [ <optional> $legacy ]
}
}
- Method [ <internal:imagick> public method rollimage ] {
+ Method [ <internal:imagick> public method rollImage ] {
- Parameters [2] {
Parameter #0 [ <required> $x ]
@@ -2211,15 +2224,15 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method rotateimage ] {
+ Method [ <internal:imagick> public method rotateImage ] {
- Parameters [2] {
- Parameter #0 [ <required> $color ]
+ Parameter #0 [ <required> $background_color ]
Parameter #1 [ <required> $degrees ]
}
}
- Method [ <internal:imagick> public method sampleimage ] {
+ Method [ <internal:imagick> public method sampleImage ] {
- Parameters [2] {
Parameter #0 [ <required> $columns ]
@@ -2227,14 +2240,14 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method solarizeimage ] {
+ Method [ <internal:imagick> public method solarizeImage ] {
- Parameters [1] {
Parameter #0 [ <required> $threshold ]
}
}
- Method [ <internal:imagick> public method shadowimage ] {
+ Method [ <internal:imagick> public method shadowImage ] {
- Parameters [4] {
Parameter #0 [ <required> $opacity ]
@@ -2244,7 +2257,7 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal, deprecated:imagick> public method setimageattribute ] {
+ Method [ <internal, deprecated:imagick> public method setImageAttribute ] {
- Parameters [2] {
Parameter #0 [ <required> $key ]
@@ -2252,56 +2265,56 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method setimagebackgroundcolor ] {
+ Method [ <internal:imagick> public method setImageBackgroundColor ] {
- Parameters [1] {
- Parameter #0 [ <required> $color ]
+ Parameter #0 [ <required> $background_color ]
}
}
- Method [ <internal:imagick> public method setimagecompose ] {
+ Method [ <internal:imagick> public method setImageCompose ] {
- Parameters [1] {
- Parameter #0 [ <required> $COMPOSITE ]
+ Parameter #0 [ <required> $compose ]
}
}
- Method [ <internal:imagick> public method setimagedelay ] {
+ Method [ <internal:imagick> public method setImageDelay ] {
- Parameters [1] {
Parameter #0 [ <required> $delay ]
}
}
- Method [ <internal:imagick> public method setimagedepth ] {
+ Method [ <internal:imagick> public method setImageDepth ] {
- Parameters [1] {
Parameter #0 [ <required> $depth ]
}
}
- Method [ <internal:imagick> public method setimagegamma ] {
+ Method [ <internal:imagick> public method setImageGamma ] {
- Parameters [1] {
Parameter #0 [ <required> $gamma ]
}
}
- Method [ <internal:imagick> public method setimageiterations ] {
+ Method [ <internal:imagick> public method setImageIterations ] {
- Parameters [1] {
Parameter #0 [ <required> $iterations ]
}
}
- Method [ <internal, deprecated:imagick> public method setimagemattecolor ] {
+ Method [ <internal, deprecated:imagick> public method setImageMatteColor ] {
- Parameters [1] {
- Parameter #0 [ <required> $color ]
+ Parameter #0 [ <required> $matte_color ]
}
}
- Method [ <internal:imagick> public method setimagepage ] {
+ Method [ <internal:imagick> public method setImagePage ] {
- Parameters [4] {
Parameter #0 [ <required> $width ]
@@ -2311,66 +2324,66 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method setimageprogressmonitor ] {
+ Method [ <internal:imagick> public method setImageProgressMonitor ] {
- Parameters [1] {
Parameter #0 [ <required> $filename ]
}
}
- Method [ <internal:imagick> public method setprogressmonitor ] {
+ Method [ <internal:imagick> public method setProgressMonitor ] {
- Parameters [1] {
Parameter #0 [ <required> $callback ]
}
}
- Method [ <internal:imagick> public method setimageresolution ] {
+ Method [ <internal:imagick> public method setImageResolution ] {
- Parameters [2] {
- Parameter #0 [ <required> $xResolution ]
- Parameter #1 [ <required> $yResolution ]
+ Parameter #0 [ <required> $x_resolution ]
+ Parameter #1 [ <required> $y_resolution ]
}
}
- Method [ <internal:imagick> public method setimagescene ] {
+ Method [ <internal:imagick> public method setImageScene ] {
- Parameters [1] {
Parameter #0 [ <required> $scene ]
}
}
- Method [ <internal:imagick> public method setimagetickspersecond ] {
+ Method [ <internal:imagick> public method setImageTicksPerSecond ] {
- Parameters [1] {
- Parameter #0 [ <required> $ticksPerSecond ]
+ Parameter #0 [ <required> $ticks_per_second ]
}
}
- Method [ <internal:imagick> public method setimagetype ] {
+ Method [ <internal:imagick> public method setImageType ] {
- Parameters [1] {
- Parameter #0 [ <required> $IMGTYPE ]
+ Parameter #0 [ <required> $image_type ]
}
}
- Method [ <internal:imagick> public method setimageunits ] {
+ Method [ <internal:imagick> public method setImageUnits ] {
- Parameters [1] {
- Parameter #0 [ <required> $RESOLUTION ]
+ Parameter #0 [ <required> $units ]
}
}
- Method [ <internal:imagick> public method sharpenimage ] {
+ Method [ <internal:imagick> public method sharpenImage ] {
- Parameters [3] {
Parameter #0 [ <required> $radius ]
Parameter #1 [ <required> $sigma ]
- Parameter #2 [ <optional> $CHANNEL ]
+ Parameter #2 [ <optional> $channel ]
}
}
- Method [ <internal:imagick> public method shaveimage ] {
+ Method [ <internal:imagick> public method shaveImage ] {
- Parameters [2] {
Parameter #0 [ <required> $columns ]
@@ -2378,16 +2391,16 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method shearimage ] {
+ Method [ <internal:imagick> public method shearImage ] {
- Parameters [3] {
- Parameter #0 [ <required> $color ]
- Parameter #1 [ <required> $xShear ]
- Parameter #2 [ <required> $yShear ]
+ Parameter #0 [ <required> $background_color ]
+ Parameter #1 [ <required> $x_shear ]
+ Parameter #2 [ <required> $y_shear ]
}
}
- Method [ <internal:imagick> public method spliceimage ] {
+ Method [ <internal:imagick> public method spliceImage ] {
- Parameters [4] {
Parameter #0 [ <required> $width ]
@@ -2397,131 +2410,132 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method pingimage ] {
+ Method [ <internal:imagick> public method pingImage ] {
- Parameters [1] {
Parameter #0 [ <required> $filename ]
}
}
- Method [ <internal:imagick> public method readimagefile ] {
+ Method [ <internal:imagick> public method readImageFile ] {
- - Parameters [1] {
- Parameter #0 [ <required> $fp ]
+ - Parameters [2] {
+ Parameter #0 [ <required> $filehandle ]
+ Parameter #1 [ <optional> $filename ]
}
}
- Method [ <internal:imagick> public method displayimage ] {
+ Method [ <internal:imagick> public method displayImage ] {
- Parameters [1] {
- Parameter #0 [ <required> $serverName ]
+ Parameter #0 [ <required> $servername ]
}
}
- Method [ <internal:imagick> public method displayimages ] {
+ Method [ <internal:imagick> public method displayImages ] {
- Parameters [1] {
- Parameter #0 [ <required> $serverName ]
+ Parameter #0 [ <required> $servername ]
}
}
- Method [ <internal:imagick> public method spreadimage ] {
+ Method [ <internal:imagick> public method spreadImage ] {
- Parameters [1] {
Parameter #0 [ <required> $radius ]
}
}
- Method [ <internal:imagick> public method swirlimage ] {
+ Method [ <internal:imagick> public method swirlImage ] {
- Parameters [1] {
Parameter #0 [ <required> $degrees ]
}
}
- Method [ <internal:imagick> public method stripimage ] {
+ Method [ <internal:imagick> public method stripImage ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method queryfontmetrics ] {
+ Method [ <internal:imagick> public method queryFontMetrics ] {
- Parameters [3] {
- Parameter #0 [ <required> ImagickDraw $ImagickDraw ]
+ Parameter #0 [ <required> ImagickDraw $settings ]
Parameter #1 [ <required> $text ]
Parameter #2 [ <optional> $multiline ]
}
}
- Method [ <internal:imagick> public method steganoimage ] {
+ Method [ <internal:imagick> public method steganoImage ] {
- Parameters [2] {
- Parameter #0 [ <required> Imagick $Imagick ]
+ Parameter #0 [ <required> Imagick $watermark ]
Parameter #1 [ <required> $offset ]
}
}
- Method [ <internal:imagick> public method addnoiseimage ] {
+ Method [ <internal:imagick> public method addNoiseImage ] {
- Parameters [2] {
- Parameter #0 [ <required> $NOISE ]
- Parameter #1 [ <optional> $CHANNEL ]
+ Parameter #0 [ <required> $noise ]
+ Parameter #1 [ <optional> $channel ]
}
}
- Method [ <internal:imagick> public method motionblurimage ] {
+ Method [ <internal:imagick> public method motionBlurImage ] {
- Parameters [4] {
Parameter #0 [ <required> $radius ]
Parameter #1 [ <required> $sigma ]
Parameter #2 [ <required> $angle ]
- Parameter #3 [ <optional> $CHANNEL ]
+ Parameter #3 [ <optional> $channel ]
}
}
- Method [ <internal, deprecated:imagick> public method mosaicimages ] {
+ Method [ <internal, deprecated:imagick> public method mosaicImages ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method morphimages ] {
+ Method [ <internal:imagick> public method morphImages ] {
- Parameters [1] {
- Parameter #0 [ <required> $frames ]
+ Parameter #0 [ <required> $number_frames ]
}
}
- Method [ <internal:imagick> public method minifyimage ] {
+ Method [ <internal:imagick> public method minifyImage ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method affinetransformimage ] {
+ Method [ <internal:imagick> public method affineTransformImage ] {
- Parameters [1] {
- Parameter #0 [ <required> ImagickDraw $ImagickDraw ]
+ Parameter #0 [ <required> ImagickDraw $settings ]
}
}
- Method [ <internal, deprecated:imagick> public method averageimages ] {
+ Method [ <internal, deprecated:imagick> public method averageImages ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method borderimage ] {
+ Method [ <internal:imagick> public method borderImage ] {
- Parameters [3] {
- Parameter #0 [ <required> $color ]
+ Parameter #0 [ <required> $border_color ]
Parameter #1 [ <required> $width ]
Parameter #2 [ <required> $height ]
}
}
- Method [ <internal:imagick> public method chopimage ] {
+ Method [ <internal:imagick> public method chopImage ] {
- Parameters [4] {
Parameter #0 [ <required> $width ]
@@ -2531,13 +2545,13 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method clipimage ] {
+ Method [ <internal:imagick> public method clipImage ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method clippathimage ] {
+ Method [ <internal:imagick> public method clipPathImage ] {
- Parameters [2] {
Parameter #0 [ <required> $pathname ]
@@ -2545,7 +2559,7 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method clipimagepath ] {
+ Method [ <internal:imagick> public method clipImagePath ] {
- Parameters [2] {
Parameter #0 [ <required> $pathname ]
@@ -2553,97 +2567,98 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method coalesceimages ] {
+ Method [ <internal:imagick> public method coalesceImages ] {
- Parameters [0] {
}
}
- Method [ <internal, deprecated:imagick> public method colorfloodfillimage ] {
+ Method [ <internal, deprecated:imagick> public method colorFloodfillImage ] {
- Parameters [5] {
Parameter #0 [ <required> $fill_color ]
Parameter #1 [ <required> $fuzz ]
Parameter #2 [ <required> $border_color ]
- Parameter #3 [ <required> $y ]
- Parameter #4 [ <required> $x ]
+ Parameter #3 [ <required> $x ]
+ Parameter #4 [ <required> $y ]
}
}
- Method [ <internal:imagick> public method colorizeimage ] {
+ Method [ <internal:imagick> public method colorizeImage ] {
- Parameters [3] {
Parameter #0 [ <required> $colorize_color ]
- Parameter #1 [ <required> $opacity ]
+ Parameter #1 [ <required> $opacity_color ]
Parameter #2 [ <optional> $legacy ]
}
}
- Method [ <internal:imagick> public method compareimagechannels ] {
+ Method [ <internal:imagick> public method compareImageChannels ] {
- Parameters [3] {
- Parameter #0 [ <required> Imagick $Imagick ]
- Parameter #1 [ <required> $CHANNEL ]
- Parameter #2 [ <required> $METRIC ]
+ Parameter #0 [ <required> Imagick $reference ]
+ Parameter #1 [ <required> $channel ]
+ Parameter #2 [ <required> $metric ]
}
}
- Method [ <internal:imagick> public method compareimages ] {
+ Method [ <internal:imagick> public method compareImages ] {
- Parameters [2] {
- Parameter #0 [ <required> Imagick $Imagick ]
- Parameter #1 [ <required> $METRIC ]
+ Parameter #0 [ <required> Imagick $reference ]
+ Parameter #1 [ <required> $metric ]
}
}
- Method [ <internal:imagick> public method contrastimage ] {
+ Method [ <internal:imagick> public method contrastImage ] {
- Parameters [1] {
Parameter #0 [ <required> $sharpen ]
}
}
- Method [ <internal:imagick> public method combineimages ] {
+ Method [ <internal:imagick> public method combineImages ] {
- - Parameters [0] {
+ - Parameters [1] {
+ Parameter #0 [ <required> $colorspace ]
}
}
- Method [ <internal:imagick> public method convolveimage ] {
+ Method [ <internal:imagick> public method convolveImage ] {
- Parameters [2] {
Parameter #0 [ <required> $kernel ]
- Parameter #1 [ <optional> $CHANNEL ]
+ Parameter #1 [ <optional> $channel ]
}
}
- Method [ <internal:imagick> public method cyclecolormapimage ] {
+ Method [ <internal:imagick> public method cycleColormapImage ] {
- Parameters [1] {
Parameter #0 [ <required> $displace ]
}
}
- Method [ <internal:imagick> public method deconstructimages ] {
+ Method [ <internal:imagick> public method deconstructImages ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method despeckleimage ] {
+ Method [ <internal:imagick> public method despeckleImage ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method edgeimage ] {
+ Method [ <internal:imagick> public method edgeImage ] {
- Parameters [1] {
Parameter #0 [ <required> $radius ]
}
}
- Method [ <internal:imagick> public method embossimage ] {
+ Method [ <internal:imagick> public method embossImage ] {
- Parameters [2] {
Parameter #0 [ <required> $radius ]
@@ -2651,256 +2666,256 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method enhanceimage ] {
+ Method [ <internal:imagick> public method enhanceImage ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method equalizeimage ] {
+ Method [ <internal:imagick> public method equalizeImage ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method evaluateimage ] {
+ Method [ <internal:imagick> public method evaluateImage ] {
- Parameters [3] {
- Parameter #0 [ <required> $EVALUATE ]
+ Parameter #0 [ <required> $evaluate ]
Parameter #1 [ <required> $constant ]
- Parameter #2 [ <optional> $CHANNEL ]
+ Parameter #2 [ <optional> $channel ]
}
}
- Method [ <internal:imagick> public method evaluateimages ] {
+ Method [ <internal:imagick> public method evaluateImages ] {
- Parameters [1] {
- Parameter #0 [ <required> $EVALUATE ]
+ Parameter #0 [ <required> $evaluate ]
}
}
- Method [ <internal, deprecated:imagick> public method flattenimages ] {
+ Method [ <internal, deprecated:imagick> public method flattenImages ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method flipimage ] {
+ Method [ <internal:imagick> public method flipImage ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method flopimage ] {
+ Method [ <internal:imagick> public method flopImage ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method forwardfouriertransformimage ] {
+ Method [ <internal:imagick> public method forwardFourierTransformImage ] {
- Parameters [1] {
Parameter #0 [ <required> $magnitude ]
}
}
- Method [ <internal:imagick> public method frameimage ] {
+ Method [ <internal:imagick> public method frameImage ] {
- Parameters [5] {
- Parameter #0 [ <required> $color ]
+ Parameter #0 [ <required> $matte_color ]
Parameter #1 [ <required> $width ]
Parameter #2 [ <required> $height ]
- Parameter #3 [ <required> $innerBevel ]
- Parameter #4 [ <required> $outerBevel ]
+ Parameter #3 [ <required> $inner_bevel ]
+ Parameter #4 [ <required> $outer_bevel ]
}
}
- Method [ <internal:imagick> public method fximage ] {
+ Method [ <internal:imagick> public method fxImage ] {
- Parameters [2] {
Parameter #0 [ <required> $expression ]
- Parameter #1 [ <optional> $CHANNEL ]
+ Parameter #1 [ <optional> $channel ]
}
}
- Method [ <internal:imagick> public method gammaimage ] {
+ Method [ <internal:imagick> public method gammaImage ] {
- Parameters [2] {
Parameter #0 [ <required> $gamma ]
- Parameter #1 [ <optional> $CHANNEL ]
+ Parameter #1 [ <optional> $channel ]
}
}
- Method [ <internal:imagick> public method gaussianblurimage ] {
+ Method [ <internal:imagick> public method gaussianBlurImage ] {
- Parameters [3] {
Parameter #0 [ <required> $radius ]
Parameter #1 [ <required> $sigma ]
- Parameter #2 [ <optional> $CHANNEL ]
+ Parameter #2 [ <optional> $channel ]
}
}
- Method [ <internal, deprecated:imagick> public method getimageattribute ] {
+ Method [ <internal, deprecated:imagick> public method getImageAttribute ] {
- Parameters [1] {
Parameter #0 [ <required> $key ]
}
}
- Method [ <internal:imagick> public method getimagebackgroundcolor ] {
+ Method [ <internal:imagick> public method getImageBackgroundColor ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getimageblueprimary ] {
+ Method [ <internal:imagick> public method getImageBluePrimary ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getimagebordercolor ] {
+ Method [ <internal:imagick> public method getImageBorderColor ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getimagechanneldepth ] {
+ Method [ <internal:imagick> public method getImageChannelDepth ] {
- Parameters [1] {
- Parameter #0 [ <required> $CHANNEL ]
+ Parameter #0 [ <required> $channel ]
}
}
- Method [ <internal:imagick> public method getimagechanneldistortion ] {
+ Method [ <internal:imagick> public method getImageChannelDistortion ] {
- Parameters [3] {
- Parameter #0 [ <required> Imagick $Imagick ]
- Parameter #1 [ <required> $CHANNEL ]
- Parameter #2 [ <required> $METRIC ]
+ Parameter #0 [ <required> Imagick $reference ]
+ Parameter #1 [ <required> $channel ]
+ Parameter #2 [ <required> $metric ]
}
}
- Method [ <internal, deprecated:imagick> public method getimagechannelextrema ] {
+ Method [ <internal, deprecated:imagick> public method getImageChannelExtrema ] {
- Parameters [1] {
- Parameter #0 [ <required> $CHANNEL ]
+ Parameter #0 [ <required> $channel ]
}
}
- Method [ <internal:imagick> public method getimagechannelmean ] {
+ Method [ <internal:imagick> public method getImageChannelMean ] {
- Parameters [1] {
- Parameter #0 [ <required> $CHANNEL ]
+ Parameter #0 [ <required> $channel ]
}
}
- Method [ <internal:imagick> public method getimagechannelstatistics ] {
+ Method [ <internal:imagick> public method getImageChannelStatistics ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getimagecolormapcolor ] {
+ Method [ <internal:imagick> public method getImageColormapColor ] {
- Parameters [1] {
Parameter #0 [ <required> $index ]
}
}
- Method [ <internal:imagick> public method getimagecolorspace ] {
+ Method [ <internal:imagick> public method getImageColorspace ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getimagecompose ] {
+ Method [ <internal:imagick> public method getImageCompose ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getimagedelay ] {
+ Method [ <internal:imagick> public method getImageDelay ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getimagedepth ] {
+ Method [ <internal:imagick> public method getImageDepth ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getimagedistortion ] {
+ Method [ <internal:imagick> public method getImageDistortion ] {
- Parameters [2] {
- Parameter #0 [ <required> Imagick $Imagick ]
- Parameter #1 [ <required> $METRIC ]
+ Parameter #0 [ <required> Imagick $reference ]
+ Parameter #1 [ <required> $metric ]
}
}
- Method [ <internal, deprecated:imagick> public method getimageextrema ] {
+ Method [ <internal, deprecated:imagick> public method getImageExtrema ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getimagedispose ] {
+ Method [ <internal:imagick> public method getImageDispose ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getimagegamma ] {
+ Method [ <internal:imagick> public method getImageGamma ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getimagegreenprimary ] {
+ Method [ <internal:imagick> public method getImageGreenPrimary ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getimageheight ] {
+ Method [ <internal:imagick> public method getImageHeight ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getimagehistogram ] {
+ Method [ <internal:imagick> public method getImageHistogram ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getimageinterlacescheme ] {
+ Method [ <internal:imagick> public method getImageInterlaceScheme ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getimageiterations ] {
+ Method [ <internal:imagick> public method getImageIterations ] {
- Parameters [0] {
}
}
- Method [ <internal, deprecated:imagick> public method getimagemattecolor ] {
+ Method [ <internal, deprecated:imagick> public method getImageMatteColor ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getimagepage ] {
+ Method [ <internal:imagick> public method getImagePage ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getimagepixelcolor ] {
+ Method [ <internal:imagick> public method getImagePixelColor ] {
- Parameters [2] {
Parameter #0 [ <required> $x ]
@@ -2908,92 +2923,92 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method getimageprofile ] {
+ Method [ <internal:imagick> public method getImageProfile ] {
- Parameters [1] {
Parameter #0 [ <required> $name ]
}
}
- Method [ <internal:imagick> public method getimageredprimary ] {
+ Method [ <internal:imagick> public method getImageRedPrimary ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getimagerenderingintent ] {
+ Method [ <internal:imagick> public method getImageRenderingIntent ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getimageresolution ] {
+ Method [ <internal:imagick> public method getImageResolution ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getimagescene ] {
+ Method [ <internal:imagick> public method getImageScene ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getimagesignature ] {
+ Method [ <internal:imagick> public method getImageSignature ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getimagetickspersecond ] {
+ Method [ <internal:imagick> public method getImageTicksPerSecond ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getimagetype ] {
+ Method [ <internal:imagick> public method getImageType ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getimageunits ] {
+ Method [ <internal:imagick> public method getImageUnits ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getimagevirtualpixelmethod ] {
+ Method [ <internal:imagick> public method getImageVirtualPixelMethod ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getimagewhitepoint ] {
+ Method [ <internal:imagick> public method getImageWhitePoint ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getimagewidth ] {
+ Method [ <internal:imagick> public method getImageWidth ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getnumberimages ] {
+ Method [ <internal:imagick> public method getNumberImages ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getimagetotalinkdensity ] {
+ Method [ <internal:imagick> public method getImageTotalInkDensity ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getimageregion ] {
+ Method [ <internal:imagick> public method getImageRegion ] {
- Parameters [4] {
Parameter #0 [ <required> $width ]
@@ -3003,82 +3018,82 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method implodeimage ] {
+ Method [ <internal:imagick> public method implodeImage ] {
- Parameters [1] {
Parameter #0 [ <required> $radius ]
}
}
- Method [ <internal:imagick> public method inversefouriertransformimage ] {
+ Method [ <internal:imagick> public method inverseFourierTransformImage ] {
- Parameters [2] {
- Parameter #0 [ <required> $complement ]
+ Parameter #0 [ <required> Imagick $complement ]
Parameter #1 [ <required> $magnitude ]
}
}
- Method [ <internal:imagick> public method levelimage ] {
+ Method [ <internal:imagick> public method levelImage ] {
- Parameters [4] {
- Parameter #0 [ <required> $blackPoint ]
+ Parameter #0 [ <required> $black_point ]
Parameter #1 [ <required> $gamma ]
- Parameter #2 [ <required> $whitePoint ]
- Parameter #3 [ <optional> $CHANNEL ]
+ Parameter #2 [ <required> $white_point ]
+ Parameter #3 [ <optional> $channel ]
}
}
- Method [ <internal:imagick> public method magnifyimage ] {
+ Method [ <internal:imagick> public method magnifyImage ] {
- Parameters [0] {
}
}
- Method [ <internal, deprecated:imagick> public method mapimage ] {
+ Method [ <internal, deprecated:imagick> public method mapImage ] {
- Parameters [2] {
- Parameter #0 [ <required> Imagick $Imagick ]
+ Parameter #0 [ <required> imagick $map ]
Parameter #1 [ <required> $dither ]
}
}
- Method [ <internal, deprecated:imagick> public method mattefloodfillimage ] {
+ Method [ <internal, deprecated:imagick> public method matteFloodfillImage ] {
- Parameters [5] {
Parameter #0 [ <required> $alpha ]
Parameter #1 [ <required> $fuzz ]
- Parameter #2 [ <required> $color ]
+ Parameter #2 [ <required> $border_color ]
Parameter #3 [ <required> $x ]
Parameter #4 [ <required> $y ]
}
}
- Method [ <internal, deprecated:imagick> public method medianfilterimage ] {
+ Method [ <internal, deprecated:imagick> public method medianFilterImage ] {
- Parameters [1] {
Parameter #0 [ <required> $radius ]
}
}
- Method [ <internal:imagick> public method negateimage ] {
+ Method [ <internal:imagick> public method negateImage ] {
- Parameters [2] {
Parameter #0 [ <required> $gray ]
- Parameter #1 [ <optional> $CHANNEL ]
+ Parameter #1 [ <optional> $channel ]
}
}
- Method [ <internal, deprecated:imagick> public method paintopaqueimage ] {
+ Method [ <internal, deprecated:imagick> public method paintOpaqueImage ] {
- Parameters [4] {
Parameter #0 [ <required> $target_color ]
Parameter #1 [ <required> $fill_color ]
Parameter #2 [ <required> $fuzz ]
- Parameter #3 [ <optional> $CHANNEL ]
+ Parameter #3 [ <optional> $channel ]
}
}
- Method [ <internal, deprecated:imagick> public method painttransparentimage ] {
+ Method [ <internal, deprecated:imagick> public method paintTransparentImage ] {
- Parameters [3] {
Parameter #0 [ <required> $target_color ]
@@ -3087,14 +3102,14 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method previewimages ] {
+ Method [ <internal:imagick> public method previewImages ] {
- Parameters [1] {
- Parameter #0 [ <required> $PREVIEW ]
+ Parameter #0 [ <required> $preview ]
}
}
- Method [ <internal:imagick> public method profileimage ] {
+ Method [ <internal:imagick> public method profileImage ] {
- Parameters [2] {
Parameter #0 [ <required> $name ]
@@ -3102,71 +3117,71 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method quantizeimage ] {
+ Method [ <internal:imagick> public method quantizeImage ] {
- Parameters [5] {
- Parameter #0 [ <required> $numColors ]
- Parameter #1 [ <required> $COLORSPACE ]
- Parameter #2 [ <required> $treeDepth ]
+ Parameter #0 [ <required> $number_colors ]
+ Parameter #1 [ <required> $colorspace ]
+ Parameter #2 [ <required> $tree_depth ]
Parameter #3 [ <required> $dither ]
- Parameter #4 [ <required> $measureError ]
+ Parameter #4 [ <required> $measure_error ]
}
}
- Method [ <internal:imagick> public method quantizeimages ] {
+ Method [ <internal:imagick> public method quantizeImages ] {
- Parameters [5] {
- Parameter #0 [ <required> $numColors ]
- Parameter #1 [ <required> $COLORSPACE ]
- Parameter #2 [ <required> $treeDepth ]
+ Parameter #0 [ <required> $number_colors ]
+ Parameter #1 [ <required> $colorspace ]
+ Parameter #2 [ <required> $tree_depth ]
Parameter #3 [ <required> $dither ]
- Parameter #4 [ <required> $measureError ]
+ Parameter #4 [ <required> $measure_error ]
}
}
- Method [ <internal, deprecated:imagick> public method reducenoiseimage ] {
+ Method [ <internal, deprecated:imagick> public method reduceNoiseImage ] {
- Parameters [1] {
Parameter #0 [ <required> $radius ]
}
}
- Method [ <internal:imagick> public method removeimageprofile ] {
+ Method [ <internal:imagick> public method removeImageProfile ] {
- Parameters [1] {
Parameter #0 [ <required> $name ]
}
}
- Method [ <internal:imagick> public method separateimagechannel ] {
+ Method [ <internal:imagick> public method separateImageChannel ] {
- Parameters [1] {
- Parameter #0 [ <required> $CHANNEL ]
+ Parameter #0 [ <required> $channel ]
}
}
- Method [ <internal:imagick> public method sepiatoneimage ] {
+ Method [ <internal:imagick> public method sepiaToneImage ] {
- Parameters [1] {
Parameter #0 [ <required> $threshold ]
}
}
- Method [ <internal, deprecated:imagick> public method setimagebias ] {
+ Method [ <internal, deprecated:imagick> public method setImageBias ] {
- Parameters [1] {
Parameter #0 [ <required> $bias ]
}
}
- Method [ <internal, deprecated:imagick> public method setimagebiasquantum ] {
+ Method [ <internal, deprecated:imagick> public method setImageBiasQuantum ] {
- Parameters [1] {
Parameter #0 [ <required> $bias ]
}
}
- Method [ <internal:imagick> public method setimageblueprimary ] {
+ Method [ <internal:imagick> public method setImageBluePrimary ] {
- Parameters [2] {
Parameter #0 [ <required> $x ]
@@ -3174,22 +3189,22 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method setimagebordercolor ] {
+ Method [ <internal:imagick> public method setImageBorderColor ] {
- Parameters [1] {
- Parameter #0 [ <required> $color ]
+ Parameter #0 [ <required> $border_color ]
}
}
- Method [ <internal:imagick> public method setimagechanneldepth ] {
+ Method [ <internal:imagick> public method setImageChannelDepth ] {
- Parameters [2] {
- Parameter #0 [ <required> $CHANNEL ]
+ Parameter #0 [ <required> $channel ]
Parameter #1 [ <required> $depth ]
}
}
- Method [ <internal:imagick> public method setimagecolormapcolor ] {
+ Method [ <internal:imagick> public method setImageColormapColor ] {
- Parameters [2] {
Parameter #0 [ <required> $index ]
@@ -3197,21 +3212,21 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method setimagecolorspace ] {
+ Method [ <internal:imagick> public method setImageColorspace ] {
- Parameters [1] {
- Parameter #0 [ <required> $COLORSPACE ]
+ Parameter #0 [ <required> $colorspace ]
}
}
- Method [ <internal:imagick> public method setimagedispose ] {
+ Method [ <internal:imagick> public method setImageDispose ] {
- Parameters [1] {
- Parameter #0 [ <required> $DISPOSETYPE ]
+ Parameter #0 [ <required> $dispose ]
}
}
- Method [ <internal:imagick> public method setimageextent ] {
+ Method [ <internal:imagick> public method setImageExtent ] {
- Parameters [2] {
Parameter #0 [ <required> $columns ]
@@ -3219,7 +3234,7 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method setimagegreenprimary ] {
+ Method [ <internal:imagick> public method setImageGreenPrimary ] {
- Parameters [2] {
Parameter #0 [ <required> $x ]
@@ -3227,14 +3242,14 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method setimageinterlacescheme ] {
+ Method [ <internal:imagick> public method setImageInterlaceScheme ] {
- Parameters [1] {
- Parameter #0 [ <required> $INTERLACE ]
+ Parameter #0 [ <required> $interlace ]
}
}
- Method [ <internal:imagick> public method setimageprofile ] {
+ Method [ <internal:imagick> public method setImageProfile ] {
- Parameters [2] {
Parameter #0 [ <required> $name ]
@@ -3242,7 +3257,7 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method setimageredprimary ] {
+ Method [ <internal:imagick> public method setImageRedPrimary ] {
- Parameters [2] {
Parameter #0 [ <required> $x ]
@@ -3250,21 +3265,21 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method setimagerenderingintent ] {
+ Method [ <internal:imagick> public method setImageRenderingIntent ] {
- Parameters [1] {
- Parameter #0 [ <required> $RENDERINGINTENT ]
+ Parameter #0 [ <required> $rendering_intent ]
}
}
- Method [ <internal:imagick> public method setimagevirtualpixelmethod ] {
+ Method [ <internal:imagick> public method setImageVirtualPixelMethod ] {
- Parameters [1] {
- Parameter #0 [ <required> $VIRTUALPIXELMETHOD ]
+ Parameter #0 [ <required> $method ]
}
}
- Method [ <internal:imagick> public method setimagewhitepoint ] {
+ Method [ <internal:imagick> public method setImageWhitePoint ] {
- Parameters [2] {
Parameter #0 [ <required> $x ]
@@ -3272,71 +3287,71 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method sigmoidalcontrastimage ] {
+ Method [ <internal:imagick> public method sigmoidalContrastImage ] {
- Parameters [4] {
Parameter #0 [ <required> $sharpen ]
- Parameter #1 [ <required> $contrast ]
- Parameter #2 [ <required> $midpoint ]
- Parameter #3 [ <optional> $CHANNEL ]
+ Parameter #1 [ <required> $alpha ]
+ Parameter #2 [ <required> $beta ]
+ Parameter #3 [ <optional> $channel ]
}
}
- Method [ <internal:imagick> public method stereoimage ] {
+ Method [ <internal:imagick> public method stereoImage ] {
- Parameters [1] {
- Parameter #0 [ <required> Imagick $Imagick ]
+ Parameter #0 [ <required> Imagick $offset_image ]
}
}
- Method [ <internal:imagick> public method textureimage ] {
+ Method [ <internal:imagick> public method textureImage ] {
- Parameters [1] {
- Parameter #0 [ <required> Imagick $Imagick ]
+ Parameter #0 [ <required> Imagick $texture ]
}
}
- Method [ <internal:imagick> public method tintimage ] {
+ Method [ <internal:imagick> public method tintImage ] {
- Parameters [3] {
Parameter #0 [ <required> $tint_color ]
- Parameter #1 [ <required> $opacity ]
+ Parameter #1 [ <required> $opacity_color ]
Parameter #2 [ <optional> $legacy ]
}
}
- Method [ <internal:imagick> public method unsharpmaskimage ] {
+ Method [ <internal:imagick> public method unsharpMaskImage ] {
- Parameters [5] {
Parameter #0 [ <required> $radius ]
Parameter #1 [ <required> $sigma ]
Parameter #2 [ <required> $amount ]
Parameter #3 [ <required> $threshold ]
- Parameter #4 [ <optional> $CHANNEL ]
+ Parameter #4 [ <optional> $channel ]
}
}
- Method [ <internal:imagick> public method getimage ] {
+ Method [ <internal:imagick> public method getImage ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method addimage ] {
+ Method [ <internal:imagick> public method addImage ] {
- Parameters [1] {
- Parameter #0 [ <required> Imagick $Imagick ]
+ Parameter #0 [ <required> Imagick $image ]
}
}
- Method [ <internal:imagick> public method setimage ] {
+ Method [ <internal:imagick> public method setImage ] {
- Parameters [1] {
- Parameter #0 [ <required> Imagick $Imagick ]
+ Parameter #0 [ <required> Imagick $image ]
}
}
- Method [ <internal:imagick> public method newimage ] {
+ Method [ <internal:imagick> public method newImage ] {
- Parameters [4] {
Parameter #0 [ <required> $columns ]
@@ -3346,113 +3361,113 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method newpseudoimage ] {
+ Method [ <internal:imagick> public method newPseudoImage ] {
- Parameters [3] {
Parameter #0 [ <required> $columns ]
Parameter #1 [ <required> $rows ]
- Parameter #2 [ <required> $pseudoString ]
+ Parameter #2 [ <required> $pseudo_format ]
}
}
- Method [ <internal:imagick> public method getcompression ] {
+ Method [ <internal:imagick> public method getCompression ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getcompressionquality ] {
+ Method [ <internal:imagick> public method getCompressionQuality ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getfilename ] {
+ Method [ <internal:imagick> public method getFilename ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getformat ] {
+ Method [ <internal:imagick> public method getFormat ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getinterlacescheme ] {
+ Method [ <internal:imagick> public method getInterlaceScheme ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getoption ] {
+ Method [ <internal:imagick> public method getOption ] {
- Parameters [1] {
Parameter #0 [ <required> $key ]
}
}
- Method [ <internal:imagick> public method getpage ] {
+ Method [ <internal:imagick> public method getPage ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getsamplingfactors ] {
+ Method [ <internal:imagick> public method getSamplingFactors ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getsize ] {
+ Method [ <internal:imagick> public method getSize ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method setbackgroundcolor ] {
+ Method [ <internal:imagick> public method setBackgroundColor ] {
- Parameters [1] {
- Parameter #0 [ <required> $color ]
+ Parameter #0 [ <required> $background_color ]
}
}
- Method [ <internal:imagick> public method setcompression ] {
+ Method [ <internal:imagick> public method setCompression ] {
- Parameters [1] {
Parameter #0 [ <required> $compression ]
}
}
- Method [ <internal:imagick> public method setcompressionquality ] {
+ Method [ <internal:imagick> public method setCompressionQuality ] {
- Parameters [1] {
- Parameter #0 [ <required> $compressionquality ]
+ Parameter #0 [ <required> $quality ]
}
}
- Method [ <internal:imagick> public method setfilename ] {
+ Method [ <internal:imagick> public method setFilename ] {
- Parameters [1] {
Parameter #0 [ <required> $filename ]
}
}
- Method [ <internal:imagick> public method setformat ] {
+ Method [ <internal:imagick> public method setFormat ] {
- Parameters [1] {
Parameter #0 [ <required> $format ]
}
}
- Method [ <internal:imagick> public method setinterlacescheme ] {
+ Method [ <internal:imagick> public method setInterlaceScheme ] {
- Parameters [1] {
- Parameter #0 [ <required> $INTERLACE ]
+ Parameter #0 [ <required> $interlace ]
}
}
- Method [ <internal:imagick> public method setoption ] {
+ Method [ <internal:imagick> public method setOption ] {
- Parameters [2] {
Parameter #0 [ <required> $key ]
@@ -3460,7 +3475,7 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method setpage ] {
+ Method [ <internal:imagick> public method setPage ] {
- Parameters [4] {
Parameter #0 [ <required> $width ]
@@ -3470,22 +3485,22 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method setresolution ] {
+ Method [ <internal:imagick> public method setResolution ] {
- Parameters [2] {
- Parameter #0 [ <required> $xResolution ]
- Parameter #1 [ <required> $yResolution ]
+ Parameter #0 [ <required> $x_resolution ]
+ Parameter #1 [ <required> $y_resolution ]
}
}
- Method [ <internal:imagick> public method setsamplingfactors ] {
+ Method [ <internal:imagick> public method setSamplingFactors ] {
- Parameters [1] {
Parameter #0 [ <required> $factors ]
}
}
- Method [ <internal:imagick> public method setsize ] {
+ Method [ <internal:imagick> public method setSize ] {
- Parameters [2] {
Parameter #0 [ <required> $columns ]
@@ -3493,10 +3508,10 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method settype ] {
+ Method [ <internal:imagick> public method setType ] {
- Parameters [1] {
- Parameter #0 [ <required> $IMGTYPE ]
+ Parameter #0 [ <required> $imgtype ]
}
}
@@ -3530,57 +3545,57 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method brightnesscontrastimage ] {
+ Method [ <internal:imagick> public method brightnessContrastImage ] {
- Parameters [3] {
Parameter #0 [ <required> $brightness ]
Parameter #1 [ <required> $contrast ]
- Parameter #2 [ <optional> $CHANNEL ]
+ Parameter #2 [ <optional> $channel ]
}
}
- Method [ <internal:imagick> public method colormatriximage ] {
+ Method [ <internal:imagick> public method colorMatrixImage ] {
- Parameters [1] {
- Parameter #0 [ <required> $color_matrix ]
+ Parameter #0 [ <optional> $color_matrix ]
}
}
- Method [ <internal:imagick> public method selectiveblurimage ] {
+ Method [ <internal:imagick> public method selectiveBlurImage ] {
- Parameters [4] {
Parameter #0 [ <required> $radius ]
Parameter #1 [ <required> $sigma ]
Parameter #2 [ <required> $threshold ]
- Parameter #3 [ <required> $CHANNEL ]
+ Parameter #3 [ <optional> $channel ]
}
}
- Method [ <internal:imagick> public method rotationalblurimage ] {
+ Method [ <internal:imagick> public method rotationalBlurImage ] {
- Parameters [2] {
Parameter #0 [ <required> $angle ]
- Parameter #1 [ <optional> $CHANNEL ]
+ Parameter #1 [ <optional> $channel ]
}
}
- Method [ <internal:imagick> public method statisticimage ] {
+ Method [ <internal:imagick> public method statisticImage ] {
- Parameters [4] {
Parameter #0 [ <required> $type ]
Parameter #1 [ <required> $width ]
Parameter #2 [ <required> $height ]
- Parameter #3 [ <optional> $CHANNEL ]
+ Parameter #3 [ <optional> $channel ]
}
}
- Method [ <internal:imagick> public method subimagematch ] {
+ Method [ <internal:imagick> public method subimageMatch ] {
- Parameters [5] {
- Parameter #0 [ <required> Imagick $Imagick ]
+ Parameter #0 [ <required> Imagick $image ]
Parameter #1 [ <optional> &$offset ]
Parameter #2 [ <optional> &$similarity ]
- Parameter #3 [ <optional> &$similarity_threshold ]
+ Parameter #3 [ <optional> &$threshold ]
Parameter #4 [ <optional> &$metric ]
}
}
@@ -3588,10 +3603,10 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
Method [ <internal:imagick> public method similarityimage ] {
- Parameters [5] {
- Parameter #0 [ <required> Imagick $Imagick ]
+ Parameter #0 [ <required> Imagick $image ]
Parameter #1 [ <optional> &$offset ]
Parameter #2 [ <optional> &$similarity ]
- Parameter #3 [ <optional> &$similarity_threshold ]
+ Parameter #3 [ <optional> &$threshold ]
Parameter #4 [ <optional> &$metric ]
}
}
@@ -3599,70 +3614,76 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
Method [ <internal:imagick> public method morphology ] {
- Parameters [4] {
- Parameter #0 [ <required> $morphologyMethod ]
+ Parameter #0 [ <required> $morphology ]
Parameter #1 [ <required> $iterations ]
- Parameter #2 [ <required> ImagickKernel $ImagickKernel ]
- Parameter #3 [ <optional> $CHANNEL ]
+ Parameter #2 [ <required> ImagickKernel $kernel ]
+ Parameter #3 [ <optional> $channel ]
}
}
Method [ <internal, deprecated:imagick> public method filter ] {
- Parameters [2] {
- Parameter #0 [ <required> ImagickKernel $ImagickKernel ]
- Parameter #1 [ <optional> $CHANNEL ]
+ Parameter #0 [ <required> ImagickKernel $kernel ]
+ Parameter #1 [ <optional> $channel ]
}
}
- Method [ <internal:imagick> public method setantialias ] {
+ Method [ <internal:imagick> public method setAntialias ] {
- Parameters [1] {
Parameter #0 [ <required> $antialias ]
}
}
- Method [ <internal:imagick> public method getantialias ] {
+ Method [ <internal:imagick> public method getAntialias ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method colordecisionlistimage ] {
+ Method [ <internal:imagick> public method colorDecisionListImage ] {
- Parameters [1] {
- Parameter #0 [ <required> $antialias ]
+ Parameter #0 [ <required> $color_correction_collection ]
}
}
- Method [ <internal:imagick> public method optimizeimagetransparency ] {
+ Method [ <internal:imagick> public method optimizeImageTransparency ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method autogammaimage ] {
+ Method [ <internal:imagick> public method autoGammaImage ] {
- Parameters [1] {
- Parameter #0 [ <required> $CHANNEL ]
+ Parameter #0 [ <optional> $channel ]
}
}
- Method [ <internal:imagick> public method autoorient ] {
+ Method [ <internal:imagick> public method autoOrient ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method compositeimagegravity ] {
+ Method [ <internal:imagick> public method autoOrientate ] {
+
+ - Parameters [0] {
+ }
+ }
+
+ Method [ <internal:imagick> public method compositeImageGravity ] {
- Parameters [3] {
- Parameter #0 [ <required> Imagick $Imagick ]
- Parameter #1 [ <required> $COMPOSITE ]
- Parameter #2 [ <required> $GRAVITY ]
+ Parameter #0 [ <required> Imagick $image ]
+ Parameter #1 [ <required> $composite_constant ]
+ Parameter #2 [ <required> $gravity ]
}
}
- Method [ <internal:imagick> public method localcontrastimage ] {
+ Method [ <internal:imagick> public method localContrastImage ] {
- Parameters [2] {
Parameter #0 [ <required> $radius ]
@@ -3687,45 +3708,45 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
- Methods [134] {
- Method [ <internal:imagick> public method resetvectorgraphics ] {
+ Method [ <internal:imagick> public method resetVectorGraphics ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method gettextkerning ] {
+ Method [ <internal:imagick> public method getTextKerning ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method settextkerning ] {
+ Method [ <internal:imagick> public method setTextKerning ] {
- Parameters [1] {
Parameter #0 [ <required> $kerning ]
}
}
- Method [ <internal:imagick> public method gettextinterwordspacing ] {
+ Method [ <internal:imagick> public method getTextInterwordSpacing ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method settextinterwordspacing ] {
+ Method [ <internal:imagick> public method setTextInterwordSpacing ] {
- Parameters [1] {
Parameter #0 [ <required> $spacing ]
}
}
- Method [ <internal:imagick> public method gettextinterlinespacing ] {
+ Method [ <internal:imagick> public method getTextInterlineSpacing ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method settextinterlinespacing ] {
+ Method [ <internal:imagick> public method setTextInterlineSpacing ] {
- Parameters [1] {
Parameter #0 [ <required> $spacing ]
@@ -3738,43 +3759,43 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method setfillcolor ] {
+ Method [ <internal:imagick> public method setFillColor ] {
- Parameters [1] {
- Parameter #0 [ <required> $color ]
+ Parameter #0 [ <required> $fill_color ]
}
}
- Method [ <internal:imagick> public method setfillalpha ] {
+ Method [ <internal:imagick> public method setFillAlpha ] {
- Parameters [1] {
Parameter #0 [ <required> $alpha ]
}
}
- Method [ <internal:imagick> public method setresolution ] {
+ Method [ <internal:imagick> public method setResolution ] {
- Parameters [2] {
- Parameter #0 [ <required> $x_resolution ]
- Parameter #1 [ <required> $y_resolution ]
+ Parameter #0 [ <required> $resolution_x ]
+ Parameter #1 [ <required> $resolution_y ]
}
}
- Method [ <internal:imagick> public method setstrokecolor ] {
+ Method [ <internal:imagick> public method setStrokeColor ] {
- Parameters [1] {
Parameter #0 [ <required> $color ]
}
}
- Method [ <internal:imagick> public method setstrokealpha ] {
+ Method [ <internal:imagick> public method setStrokeAlpha ] {
- Parameters [1] {
Parameter #0 [ <required> $alpha ]
}
}
- Method [ <internal:imagick> public method setstrokewidth ] {
+ Method [ <internal:imagick> public method setStrokeWidth ] {
- Parameters [1] {
Parameter #0 [ <required> $width ]
@@ -3790,10 +3811,10 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
Method [ <internal:imagick> public method circle ] {
- Parameters [4] {
- Parameter #0 [ <required> $ox ]
- Parameter #1 [ <required> $oy ]
- Parameter #2 [ <required> $px ]
- Parameter #3 [ <required> $py ]
+ Parameter #0 [ <required> $origin_x ]
+ Parameter #1 [ <required> $origin_y ]
+ Parameter #2 [ <required> $perimeter_x ]
+ Parameter #3 [ <required> $perimeter_y ]
}
}
@@ -3806,80 +3827,80 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method settextantialias ] {
+ Method [ <internal:imagick> public method setTextAntialias ] {
- Parameters [1] {
Parameter #0 [ <required> $antialias ]
}
}
- Method [ <internal:imagick> public method settextencoding ] {
+ Method [ <internal:imagick> public method setTextEncoding ] {
- Parameters [1] {
Parameter #0 [ <required> $encoding ]
}
}
- Method [ <internal:imagick> public method setfont ] {
+ Method [ <internal:imagick> public method setFont ] {
- Parameters [1] {
- Parameter #0 [ <required> $font ]
+ Parameter #0 [ <required> $font_name ]
}
}
- Method [ <internal:imagick> public method setfontfamily ] {
+ Method [ <internal:imagick> public method setFontFamily ] {
- Parameters [1] {
- Parameter #0 [ <required> $fontfamily ]
+ Parameter #0 [ <required> $font_family ]
}
}
- Method [ <internal:imagick> public method setfontsize ] {
+ Method [ <internal:imagick> public method setFontSize ] {
- Parameters [1] {
- Parameter #0 [ <required> $pointsize ]
+ Parameter #0 [ <required> $point_size ]
}
}
- Method [ <internal:imagick> public method setfontstyle ] {
+ Method [ <internal:imagick> public method setFontStyle ] {
- Parameters [1] {
- Parameter #0 [ <required> $STYLE ]
+ Parameter #0 [ <required> $style ]
}
}
- Method [ <internal:imagick> public method setfontweight ] {
+ Method [ <internal:imagick> public method setFontWeight ] {
- Parameters [1] {
Parameter #0 [ <required> $weight ]
}
}
- Method [ <internal:imagick> public method getfont ] {
+ Method [ <internal:imagick> public method getFont ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getfontfamily ] {
+ Method [ <internal:imagick> public method getFontFamily ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getfontsize ] {
+ Method [ <internal:imagick> public method getFontSize ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getfontstyle ] {
+ Method [ <internal:imagick> public method getFontStyle ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getfontweight ] {
+ Method [ <internal:imagick> public method getFontWeight ] {
- Parameters [0] {
}
@@ -3894,45 +3915,45 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
Method [ <internal:imagick> public method rectangle ] {
- Parameters [4] {
- Parameter #0 [ <required> $x1 ]
- Parameter #1 [ <required> $y1 ]
- Parameter #2 [ <required> $x2 ]
- Parameter #3 [ <required> $y2 ]
+ Parameter #0 [ <required> $top_left_x ]
+ Parameter #1 [ <required> $top_left_y ]
+ Parameter #2 [ <required> $bottom_right_x ]
+ Parameter #3 [ <required> $bottom_right_y ]
}
}
- Method [ <internal:imagick> public method roundrectangle ] {
+ Method [ <internal:imagick> public method roundRectangle ] {
- Parameters [6] {
- Parameter #0 [ <required> $x1 ]
- Parameter #1 [ <required> $y1 ]
- Parameter #2 [ <required> $x2 ]
- Parameter #3 [ <required> $y2 ]
- Parameter #4 [ <required> $rx ]
- Parameter #5 [ <required> $ry ]
+ Parameter #0 [ <required> $top_left_x ]
+ Parameter #1 [ <required> $top_left_y ]
+ Parameter #2 [ <required> $bottom_right_x ]
+ Parameter #3 [ <required> $bottom_right_y ]
+ Parameter #4 [ <required> $rounding_x ]
+ Parameter #5 [ <required> $rounding_y ]
}
}
Method [ <internal:imagick> public method ellipse ] {
- Parameters [6] {
- Parameter #0 [ <required> $ox ]
- Parameter #1 [ <required> $oy ]
- Parameter #2 [ <required> $px ]
- Parameter #3 [ <required> $py ]
- Parameter #4 [ <required> $start ]
- Parameter #5 [ <required> $end ]
+ Parameter #0 [ <required> $origin_x ]
+ Parameter #1 [ <required> $origin_y ]
+ Parameter #2 [ <required> $radius_x ]
+ Parameter #3 [ <required> $radius_y ]
+ Parameter #4 [ <required> $angle_start ]
+ Parameter #5 [ <required> $angle_end ]
}
}
- Method [ <internal:imagick> public method skewx ] {
+ Method [ <internal:imagick> public method skewX ] {
- Parameters [1] {
Parameter #0 [ <required> $degrees ]
}
}
- Method [ <internal:imagick> public method skewy ] {
+ Method [ <internal:imagick> public method skewY ] {
- Parameters [1] {
Parameter #0 [ <required> $degrees ]
@@ -3950,22 +3971,22 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
Method [ <internal:imagick> public method line ] {
- Parameters [4] {
- Parameter #0 [ <required> $sx ]
- Parameter #1 [ <required> $sy ]
- Parameter #2 [ <required> $ex ]
- Parameter #3 [ <required> $ey ]
+ Parameter #0 [ <required> $start_x ]
+ Parameter #1 [ <required> $start_y ]
+ Parameter #2 [ <required> $end_x ]
+ Parameter #3 [ <required> $end_y ]
}
}
Method [ <internal:imagick> public method arc ] {
- Parameters [6] {
- Parameter #0 [ <required> $sx ]
- Parameter #1 [ <required> $sy ]
- Parameter #2 [ <required> $ex ]
- Parameter #3 [ <required> $ey ]
- Parameter #4 [ <required> $sd ]
- Parameter #5 [ <required> $ed ]
+ Parameter #0 [ <required> $start_x ]
+ Parameter #1 [ <required> $start_y ]
+ Parameter #2 [ <required> $end_x ]
+ Parameter #3 [ <required> $end_y ]
+ Parameter #4 [ <required> $start_angle ]
+ Parameter #5 [ <required> $end_angle ]
}
}
@@ -3974,7 +3995,7 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
- Parameters [3] {
Parameter #0 [ <required> $x ]
Parameter #1 [ <required> $y ]
- Parameter #2 [ <required> $METHOD ]
+ Parameter #2 [ <required> $paint ]
}
}
@@ -3993,66 +4014,66 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method gettextdecoration ] {
+ Method [ <internal:imagick> public method getTextDecoration ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method gettextencoding ] {
+ Method [ <internal:imagick> public method getTextEncoding ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getfontstretch ] {
+ Method [ <internal:imagick> public method getFontStretch ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method setfontstretch ] {
+ Method [ <internal:imagick> public method setFontStretch ] {
- Parameters [1] {
- Parameter #0 [ <required> $STRETCH ]
+ Parameter #0 [ <required> $stretch ]
}
}
- Method [ <internal:imagick> public method setstrokeantialias ] {
+ Method [ <internal:imagick> public method setStrokeAntialias ] {
- Parameters [1] {
- Parameter #0 [ <required> $antialias ]
+ Parameter #0 [ <required> $enabled ]
}
}
- Method [ <internal:imagick> public method settextalignment ] {
+ Method [ <internal:imagick> public method setTextAlignment ] {
- Parameters [1] {
- Parameter #0 [ <required> $ALIGN ]
+ Parameter #0 [ <required> $align ]
}
}
- Method [ <internal:imagick> public method settextdecoration ] {
+ Method [ <internal:imagick> public method setTextDecoration ] {
- Parameters [1] {
- Parameter #0 [ <required> $DECORATION ]
+ Parameter #0 [ <required> $decoration ]
}
}
- Method [ <internal:imagick> public method settextundercolor ] {
+ Method [ <internal:imagick> public method setTextUnderColor ] {
- Parameters [1] {
- Parameter #0 [ <required> $color ]
+ Parameter #0 [ <required> $under_color ]
}
}
- Method [ <internal:imagick> public method setviewbox ] {
+ Method [ <internal:imagick> public method setViewbox ] {
- Parameters [4] {
- Parameter #0 [ <required> $sx ]
- Parameter #1 [ <required> $sy ]
- Parameter #2 [ <required> $ex ]
- Parameter #3 [ <required> $ey ]
+ Parameter #0 [ <required> $left_x ]
+ Parameter #1 [ <required> $top_y ]
+ Parameter #2 [ <required> $right_x ]
+ Parameter #3 [ <required> $bottom_y ]
}
}
@@ -4065,26 +4086,26 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
Method [ <internal:imagick> public method affine ] {
- Parameters [1] {
- Parameter #0 [ <required> $affineMatrix ]
+ Parameter #0 [ <required> $affine ]
}
}
Method [ <internal:imagick> public method bezier ] {
- Parameters [1] {
- Parameter #0 [ <required> $coordinateArray ]
+ Parameter #0 [ <required> $coordinates ]
}
}
Method [ <internal:imagick> public method composite ] {
- Parameters [6] {
- Parameter #0 [ <required> $COMPOSE ]
+ Parameter #0 [ <required> $composite ]
Parameter #1 [ <required> $x ]
Parameter #2 [ <required> $y ]
Parameter #3 [ <required> $width ]
Parameter #4 [ <required> $height ]
- Parameter #5 [ <required> Imagick $Imagick ]
+ Parameter #5 [ <required> Imagick $image ]
}
}
@@ -4093,7 +4114,7 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
- Parameters [3] {
Parameter #0 [ <required> $x ]
Parameter #1 [ <required> $y ]
- Parameter #2 [ <required> $PAINTMETHOD ]
+ Parameter #2 [ <required> $paint ]
}
}
@@ -4104,133 +4125,133 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method getclippath ] {
+ Method [ <internal:imagick> public method getClipPath ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getcliprule ] {
+ Method [ <internal:imagick> public method getClipRule ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getclipunits ] {
+ Method [ <internal:imagick> public method getClipUnits ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getfillcolor ] {
+ Method [ <internal:imagick> public method getFillColor ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getfillopacity ] {
+ Method [ <internal:imagick> public method getFillOpacity ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getfillrule ] {
+ Method [ <internal:imagick> public method getFillRule ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getgravity ] {
+ Method [ <internal:imagick> public method getGravity ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getstrokeantialias ] {
+ Method [ <internal:imagick> public method getStrokeAntialias ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getstrokecolor ] {
+ Method [ <internal:imagick> public method getStrokeColor ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getstrokedasharray ] {
+ Method [ <internal:imagick> public method getStrokeDashArray ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getstrokedashoffset ] {
+ Method [ <internal:imagick> public method getStrokeDashOffset ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getstrokelinecap ] {
+ Method [ <internal:imagick> public method getStrokeLineCap ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getstrokelinejoin ] {
+ Method [ <internal:imagick> public method getStrokeLineJoin ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getstrokemiterlimit ] {
+ Method [ <internal:imagick> public method getStrokeMiterLimit ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getstrokeopacity ] {
+ Method [ <internal:imagick> public method getStrokeOpacity ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getstrokewidth ] {
+ Method [ <internal:imagick> public method getStrokeWidth ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method gettextalignment ] {
+ Method [ <internal:imagick> public method getTextAlignment ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method gettextantialias ] {
+ Method [ <internal:imagick> public method getTextAntialias ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getvectorgraphics ] {
+ Method [ <internal:imagick> public method getVectorGraphics ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method gettextundercolor ] {
+ Method [ <internal:imagick> public method getTextUnderColor ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method pathclose ] {
+ Method [ <internal:imagick> public method pathClose ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method pathcurvetoabsolute ] {
+ Method [ <internal:imagick> public method pathCurveToAbsolute ] {
- Parameters [6] {
Parameter #0 [ <required> $x1 ]
@@ -4242,7 +4263,7 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method pathcurvetorelative ] {
+ Method [ <internal:imagick> public method pathCurveToRelative ] {
- Parameters [6] {
Parameter #0 [ <required> $x1 ]
@@ -4254,27 +4275,27 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method pathcurvetoquadraticbezierabsolute ] {
+ Method [ <internal:imagick> public method pathCurveToQuadraticBezierAbsolute ] {
- Parameters [4] {
Parameter #0 [ <required> $x1 ]
Parameter #1 [ <required> $y1 ]
- Parameter #2 [ <required> $x ]
+ Parameter #2 [ <required> $x_end ]
Parameter #3 [ <required> $y ]
}
}
- Method [ <internal:imagick> public method pathcurvetoquadraticbezierrelative ] {
+ Method [ <internal:imagick> public method pathCurveToQuadraticBezierRelative ] {
- Parameters [4] {
Parameter #0 [ <required> $x1 ]
Parameter #1 [ <required> $y1 ]
- Parameter #2 [ <required> $x ]
+ Parameter #2 [ <required> $x_end ]
Parameter #3 [ <required> $y ]
}
}
- Method [ <internal:imagick> public method pathcurvetoquadraticbeziersmoothabsolute ] {
+ Method [ <internal:imagick> public method pathCurveToQuadraticBezierSmoothAbsolute ] {
- Parameters [2] {
Parameter #0 [ <required> $x ]
@@ -4282,7 +4303,7 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method pathcurvetoquadraticbeziersmoothrelative ] {
+ Method [ <internal:imagick> public method pathCurveToQuadraticBezierSmoothRelative ] {
- Parameters [2] {
Parameter #0 [ <required> $x ]
@@ -4290,59 +4311,59 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method pathcurvetosmoothabsolute ] {
+ Method [ <internal:imagick> public method pathCurveToSmoothAbsolute ] {
- Parameters [4] {
- Parameter #0 [ <required> $x1 ]
- Parameter #1 [ <required> $y1 ]
+ Parameter #0 [ <required> $x2 ]
+ Parameter #1 [ <required> $y2 ]
Parameter #2 [ <required> $x ]
Parameter #3 [ <required> $y ]
}
}
- Method [ <internal:imagick> public method pathcurvetosmoothrelative ] {
+ Method [ <internal:imagick> public method pathCurveToSmoothRelative ] {
- Parameters [4] {
- Parameter #0 [ <required> $x1 ]
- Parameter #1 [ <required> $y1 ]
+ Parameter #0 [ <required> $x2 ]
+ Parameter #1 [ <required> $y2 ]
Parameter #2 [ <required> $x ]
Parameter #3 [ <required> $y ]
}
}
- Method [ <internal:imagick> public method pathellipticarcabsolute ] {
+ Method [ <internal:imagick> public method pathEllipticArcAbsolute ] {
- Parameters [7] {
Parameter #0 [ <required> $rx ]
Parameter #1 [ <required> $ry ]
- Parameter #2 [ <required> $xAxisRotation ]
- Parameter #3 [ <required> $largeArc ]
+ Parameter #2 [ <required> $x_axis_rotation ]
+ Parameter #3 [ <required> $large_arc ]
Parameter #4 [ <required> $sweep ]
Parameter #5 [ <required> $x ]
Parameter #6 [ <required> $y ]
}
}
- Method [ <internal:imagick> public method pathellipticarcrelative ] {
+ Method [ <internal:imagick> public method pathEllipticArcRelative ] {
- Parameters [7] {
Parameter #0 [ <required> $rx ]
Parameter #1 [ <required> $ry ]
- Parameter #2 [ <required> $xAxisRotation ]
- Parameter #3 [ <required> $largeArc ]
+ Parameter #2 [ <required> $x_axis_rotation ]
+ Parameter #3 [ <required> $large_arc ]
Parameter #4 [ <required> $sweep ]
Parameter #5 [ <required> $x ]
Parameter #6 [ <required> $y ]
}
}
- Method [ <internal:imagick> public method pathfinish ] {
+ Method [ <internal:imagick> public method pathFinish ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method pathlinetoabsolute ] {
+ Method [ <internal:imagick> public method pathLineToAbsolute ] {
- Parameters [2] {
Parameter #0 [ <required> $x ]
@@ -4350,7 +4371,7 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method pathlinetorelative ] {
+ Method [ <internal:imagick> public method pathLineToRelative ] {
- Parameters [2] {
Parameter #0 [ <required> $x ]
@@ -4358,35 +4379,35 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method pathlinetohorizontalabsolute ] {
+ Method [ <internal:imagick> public method pathLineToHorizontalAbsolute ] {
- Parameters [1] {
- Parameter #0 [ <required> $y ]
+ Parameter #0 [ <required> $x ]
}
}
- Method [ <internal:imagick> public method pathlinetohorizontalrelative ] {
+ Method [ <internal:imagick> public method pathLineToHorizontalRelative ] {
- Parameters [1] {
Parameter #0 [ <required> $x ]
}
}
- Method [ <internal:imagick> public method pathlinetoverticalabsolute ] {
+ Method [ <internal:imagick> public method pathLineToVerticalAbsolute ] {
- Parameters [1] {
Parameter #0 [ <required> $y ]
}
}
- Method [ <internal:imagick> public method pathlinetoverticalrelative ] {
+ Method [ <internal:imagick> public method pathLineToVerticalRelative ] {
- Parameters [1] {
- Parameter #0 [ <required> $x ]
+ Parameter #0 [ <required> $y ]
}
}
- Method [ <internal:imagick> public method pathmovetoabsolute ] {
+ Method [ <internal:imagick> public method pathMoveToAbsolute ] {
- Parameters [2] {
Parameter #0 [ <required> $x ]
@@ -4394,7 +4415,7 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method pathmovetorelative ] {
+ Method [ <internal:imagick> public method pathMoveToRelative ] {
- Parameters [2] {
Parameter #0 [ <required> $x ]
@@ -4402,7 +4423,7 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method pathstart ] {
+ Method [ <internal:imagick> public method pathStart ] {
- Parameters [0] {
}
@@ -4411,42 +4432,42 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
Method [ <internal:imagick> public method polyline ] {
- Parameters [1] {
- Parameter #0 [ <required> $coordinateArray ]
+ Parameter #0 [ <required> $coordinates ]
}
}
- Method [ <internal:imagick> public method popclippath ] {
+ Method [ <internal:imagick> public method popClipPath ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method popdefs ] {
+ Method [ <internal:imagick> public method popDefs ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method poppattern ] {
+ Method [ <internal:imagick> public method popPattern ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method pushclippath ] {
+ Method [ <internal:imagick> public method pushClipPath ] {
- Parameters [1] {
- Parameter #0 [ <required> $clipMask ]
+ Parameter #0 [ <required> $clip_mask_id ]
}
}
- Method [ <internal:imagick> public method pushdefs ] {
+ Method [ <internal:imagick> public method pushDefs ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method pushpattern ] {
+ Method [ <internal:imagick> public method pushPattern ] {
- Parameters [5] {
Parameter #0 [ <required> $pattern_id ]
@@ -4478,98 +4499,98 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method setclippath ] {
+ Method [ <internal:imagick> public method setClipPath ] {
- Parameters [1] {
- Parameter #0 [ <required> $clipMask ]
+ Parameter #0 [ <required> $clip_mask ]
}
}
- Method [ <internal:imagick> public method setcliprule ] {
+ Method [ <internal:imagick> public method setClipRule ] {
- Parameters [1] {
- Parameter #0 [ <required> $FILLRULE ]
+ Parameter #0 [ <required> $fillrule ]
}
}
- Method [ <internal:imagick> public method setclipunits ] {
+ Method [ <internal:imagick> public method setClipUnits ] {
- Parameters [1] {
- Parameter #0 [ <required> $PATHUNITS ]
+ Parameter #0 [ <required> $pathunits ]
}
}
- Method [ <internal:imagick> public method setfillopacity ] {
+ Method [ <internal:imagick> public method setFillOpacity ] {
- Parameters [1] {
- Parameter #0 [ <required> $fillOpacity ]
+ Parameter #0 [ <required> $opacity ]
}
}
- Method [ <internal:imagick> public method setfillpatternurl ] {
+ Method [ <internal:imagick> public method setFillPatternUrl ] {
- Parameters [1] {
- Parameter #0 [ <required> $url ]
+ Parameter #0 [ <required> $fill_url ]
}
}
- Method [ <internal:imagick> public method setfillrule ] {
+ Method [ <internal:imagick> public method setFillRule ] {
- Parameters [1] {
- Parameter #0 [ <required> $FILLRULE ]
+ Parameter #0 [ <required> $fillrule ]
}
}
- Method [ <internal:imagick> public method setgravity ] {
+ Method [ <internal:imagick> public method setGravity ] {
- Parameters [1] {
- Parameter #0 [ <required> $GRAVITY ]
+ Parameter #0 [ <required> $gravity ]
}
}
- Method [ <internal:imagick> public method setstrokepatternurl ] {
+ Method [ <internal:imagick> public method setStrokePatternUrl ] {
- Parameters [1] {
- Parameter #0 [ <required> $url ]
+ Parameter #0 [ <required> $stroke_url ]
}
}
- Method [ <internal:imagick> public method setstrokedashoffset ] {
+ Method [ <internal:imagick> public method setStrokeDashOffset ] {
- Parameters [1] {
- Parameter #0 [ <required> $offset ]
+ Parameter #0 [ <required> $dash_offset ]
}
}
- Method [ <internal:imagick> public method setstrokelinecap ] {
+ Method [ <internal:imagick> public method setStrokeLineCap ] {
- Parameters [1] {
- Parameter #0 [ <required> $LINECAP ]
+ Parameter #0 [ <required> $linecap ]
}
}
- Method [ <internal:imagick> public method setstrokelinejoin ] {
+ Method [ <internal:imagick> public method setStrokeLineJoin ] {
- Parameters [1] {
- Parameter #0 [ <required> $LINEJOIN ]
+ Parameter #0 [ <required> $linejoin ]
}
}
- Method [ <internal:imagick> public method setstrokemiterlimit ] {
+ Method [ <internal:imagick> public method setStrokeMiterLimit ] {
- Parameters [1] {
- Parameter #0 [ <required> $miterLimit ]
+ Parameter #0 [ <required> $miterlimit ]
}
}
- Method [ <internal:imagick> public method setstrokeopacity ] {
+ Method [ <internal:imagick> public method setStrokeOpacity ] {
- Parameters [1] {
- Parameter #0 [ <required> $strokeOpacity ]
+ Parameter #0 [ <required> $opacity ]
}
}
- Method [ <internal:imagick> public method setvectorgraphics ] {
+ Method [ <internal:imagick> public method setVectorGraphics ] {
- Parameters [1] {
Parameter #0 [ <required> $xml ]
@@ -4588,33 +4609,33 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method setstrokedasharray ] {
+ Method [ <internal:imagick> public method setStrokeDashArray ] {
- Parameters [1] {
- Parameter #0 [ <required> $dashArray ]
+ Parameter #0 [ <required> $dashes ]
}
}
- Method [ <internal:imagick> public method getopacity ] {
+ Method [ <internal:imagick> public method getOpacity ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method setopacity ] {
+ Method [ <internal:imagick> public method setOpacity ] {
- Parameters [1] {
Parameter #0 [ <required> $opacity ]
}
}
- Method [ <internal:imagick> public method getfontresolution ] {
+ Method [ <internal:imagick> public method getFontResolution ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method setfontresolution ] {
+ Method [ <internal:imagick> public method setFontResolution ] {
- Parameters [2] {
Parameter #0 [ <required> $x ]
@@ -4622,39 +4643,39 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
}
- Method [ <internal:imagick> public method getbordercolor ] {
+ Method [ <internal:imagick> public method getBorderColor ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method setbordercolor ] {
+ Method [ <internal:imagick> public method setBorderColor ] {
- Parameters [1] {
- Parameter #0 [ <required> $bordercolor ]
+ Parameter #0 [ <required> $color ]
}
}
- Method [ <internal:imagick> public method setdensity ] {
+ Method [ <internal:imagick> public method setDensity ] {
- Parameters [1] {
Parameter #0 [ <required> $density ]
}
}
- Method [ <internal:imagick> public method getdensity ] {
+ Method [ <internal:imagick> public method getDensity ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method gettextdirection ] {
+ Method [ <internal:imagick> public method getTextDirection ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method settextdirection ] {
+ Method [ <internal:imagick> public method setTextDirection ] {
- Parameters [1] {
Parameter #0 [ <required> $direction ]
@@ -4672,17 +4693,17 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
- Static methods [2] {
- Method [ <internal:imagick> static public method getpixeliterator ] {
+ Method [ <internal:imagick> static public method getPixelIterator ] {
- Parameters [1] {
- Parameter #0 [ <required> Imagick $Imagick ]
+ Parameter #0 [ <required> Imagick $imagick ]
}
}
- Method [ <internal:imagick> static public method getpixelregioniterator ] {
+ Method [ <internal:imagick> static public method getPixelRegionIterator ] {
- Parameters [5] {
- Parameter #0 [ <required> Imagick $Imagick ]
+ Parameter #0 [ <required> Imagick $imagick ]
Parameter #1 [ <required> $x ]
Parameter #2 [ <required> $y ]
Parameter #3 [ <required> $columns ]
@@ -4698,108 +4719,114 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
Method [ <internal:imagick, ctor> public method __construct ] {
- Parameters [1] {
- Parameter #0 [ <required> Imagick $Imagick ]
+ Parameter #0 [ <required> Imagick $imagick ]
}
}
- Method [ <internal:imagick> public method newpixeliterator ] {
+ Method [ <internal:imagick> public method clear ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method newpixelregioniterator ] {
+ Method [ <internal:imagick> public method destroy ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getiteratorrow ] {
+ Method [ <internal:imagick> public method getCurrentIteratorRow ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method setiteratorrow ] {
+ Method [ <internal:imagick> public method getIteratorRow ] {
- - Parameters [1] {
- Parameter #0 [ <required> $row ]
+ - Parameters [0] {
}
}
- Method [ <internal:imagick> public method setiteratorfirstrow ] {
+ Method [ <internal:imagick> public method getNextIteratorRow ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method setiteratorlastrow ] {
+ Method [ <internal:imagick> public method getPreviousIteratorRow ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getpreviousiteratorrow ] {
+ Method [ <internal:imagick, prototype Iterator> public method key ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getcurrentiteratorrow ] {
+ Method [ <internal:imagick, prototype Iterator> public method next ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method getnextiteratorrow ] {
+ Method [ <internal:imagick, prototype Iterator> public method rewind ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method resetiterator ] {
+ Method [ <internal:imagick, prototype Iterator> public method current ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method synciterator ] {
+ Method [ <internal:imagick> public method newPixelIterator ] {
- - Parameters [0] {
+ - Parameters [1] {
+ Parameter #0 [ <required> Imagick $imagick ]
}
}
- Method [ <internal:imagick> public method destroy ] {
+ Method [ <internal:imagick> public method newPixelRegionIterator ] {
- - Parameters [0] {
+ - Parameters [5] {
+ Parameter #0 [ <required> Imagick $imagick ]
+ Parameter #1 [ <required> $x ]
+ Parameter #2 [ <required> $y ]
+ Parameter #3 [ <required> $columns ]
+ Parameter #4 [ <required> $rows ]
}
}
- Method [ <internal:imagick> public method clear ] {
+ Method [ <internal:imagick> public method resetIterator ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick, prototype Iterator> public method key ] {
+ Method [ <internal:imagick> public method setIteratorFirstRow ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick, prototype Iterator> public method next ] {
+ Method [ <internal:imagick> public method setIteratorLastRow ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick, prototype Iterator> public method rewind ] {
+ Method [ <internal:imagick> public method setIteratorRow ] {
- - Parameters [0] {
+ - Parameters [1] {
+ Parameter #0 [ <required> $row ]
}
}
- Method [ <internal:imagick, prototype Iterator> public method current ] {
+ Method [ <internal:imagick> public method syncIterator ] {
- Parameters [0] {
}
@@ -4827,156 +4854,151 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
- Properties [0] {
}
- - Methods [22] {
- Method [ <internal:imagick> public method gethsl ] {
+ - Methods [21] {
+ Method [ <internal:imagick, ctor> public method __construct ] {
- - Parameters [0] {
+ - Parameters [1] {
+ Parameter #0 [ <required> $color ]
}
}
- Method [ <internal:imagick> public method sethsl ] {
+ Method [ <internal:imagick> public method clear ] {
- - Parameters [3] {
- Parameter #0 [ <required> $hue ]
- Parameter #1 [ <required> $saturation ]
- Parameter #2 [ <required> $luminosity ]
+ - Parameters [0] {
}
}
- Method [ <internal:imagick> public method getcolorvaluequantum ] {
+ Method [ <internal:imagick> public method destroy ] {
- - Parameters [1] {
- Parameter #0 [ <required> $color ]
+ - Parameters [0] {
}
}
- Method [ <internal:imagick> public method setcolorvaluequantum ] {
+ Method [ <internal:imagick> public method getColor ] {
- Parameters [1] {
- Parameter #0 [ <required> $color_value ]
+ Parameter #0 [ <optional> $normalized ]
}
}
- Method [ <internal:imagick> public method getindex ] {
+ Method [ <internal:imagick> public method getColorAsString ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method setindex ] {
+ Method [ <internal:imagick> public method getColorCount ] {
- - Parameters [1] {
- Parameter #0 [ <required> $index ]
+ - Parameters [0] {
}
}
- Method [ <internal:imagick, ctor> public method __construct ] {
+ Method [ <internal:imagick> public method getColorQuantum ] {
- - Parameters [1] {
- Parameter #0 [ <optional> $color ]
+ - Parameters [0] {
}
}
- Method [ <internal:imagick> public method setcolor ] {
+ Method [ <internal:imagick> public method getColorValue ] {
- Parameters [1] {
- Parameter #0 [ <required> $color ]
- }
- }
-
- Method [ <internal:imagick> public method setcolorvalue ] {
-
- - Parameters [2] {
- Parameter #0 [ <required> $color ]
- Parameter #1 [ <required> $value ]
+ Parameter #0 [ <optional> $color ]
}
}
- Method [ <internal:imagick> public method getcolorvalue ] {
+ Method [ <internal:imagick> public method getColorValueQuantum ] {
- Parameters [1] {
- Parameter #0 [ <required> $color ]
+ Parameter #0 [ <optional> $color ]
}
}
- Method [ <internal:imagick> public method clear ] {
+ Method [ <internal:imagick> public method getHSL ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method destroy ] {
+ Method [ <internal:imagick> public method getIndex ] {
- Parameters [0] {
}
}
- Method [ <internal:imagick> public method issimilar ] {
+ Method [ <internal:imagick> public method isPixelSimilar ] {
- Parameters [2] {
Parameter #0 [ <required> $color ]
- Parameter #1 [ <optional> $fuzz ]
+ Parameter #1 [ <required> $fuzz ]
}
}
- Method [ <internal:imagick> public method ispixelsimilarquantum ] {
+ Method [ <internal:imagick> public method isPixelSimilarQuantum ] {
- Parameters [2] {
Parameter #0 [ <required> $color ]
- Parameter #1 [ <optional> $fuzz ]
+ Parameter #1 [ <required> $fuzz_quantum_range_scaled_by_square_root_of_three ]
}
}
- Method [ <internal:imagick> public method ispixelsimilar ] {
+ Method [ <internal:imagick> public method isSimilar ] {
- Parameters [2] {
Parameter #0 [ <required> $color ]
- Parameter #1 [ <optional> $fuzz ]
+ Parameter #1 [ <required> $fuzz_quantum_range_scaled_by_square_root_of_three ]
}
}
- Method [ <internal:imagick> public method getcolor ] {
+ Method [ <internal:imagick> public method setColor ] {
- Parameters [1] {
- Parameter #0 [ <optional> $normalized ]
+ Parameter #0 [ <required> $color ]
}
}
- Method [ <internal:imagick> public method getcolorquantum ] {
+ Method [ <internal:imagick> public method setColorCount ] {
- - Parameters [0] {
+ - Parameters [1] {
+ Parameter #0 [ <required> $color_count ]
}
}
- Method [ <internal:imagick> public method getcolorasstring ] {
+ Method [ <internal:imagick> public method setColorValue ] {
- - Parameters [0] {
+ - Parameters [2] {
+ Parameter #0 [ <required> $color ]
+ Parameter #1 [ <required> $value ]
}
}
- Method [ <internal:imagick> public method getcolorcount ] {
+ Method [ <internal:imagick> public method setColorValueQuantum ] {
- - Parameters [0] {
+ - Parameters [2] {
+ Parameter #0 [ <required> $color ]
+ Parameter #1 [ <required> $value ]
}
}
- Method [ <internal:imagick> public method setcolorcount ] {
+ Method [ <internal:imagick> public method setHSL ] {
- - Parameters [1] {
- Parameter #0 [ <required> $colorCount ]
+ - Parameters [3] {
+ Parameter #0 [ <required> $hue ]
+ Parameter #1 [ <required> $saturation ]
+ Parameter #2 [ <required> $luminosity ]
}
}
- Method [ <internal:imagick> public method clone ] {
+ Method [ <internal:imagick> public method setIndex ] {
- - Parameters [0] {
+ - Parameters [1] {
+ Parameter #0 [ <required> $index ]
}
}
- Method [ <internal:imagick> public method setcolorfrompixel ] {
+ Method [ <internal:imagick> public method setColorFromPixel ] {
- Parameters [1] {
- Parameter #0 [ <required> ImagickPixel $srcPixel ]
+ Parameter #0 [ <required> ImagickPixel $pixel ]
}
}
}
@@ -4991,19 +5013,19 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
}
- Static methods [2] {
- Method [ <internal:imagick> static public method frommatrix ] {
+ Method [ <internal:imagick> static public method fromBuiltin ] {
- Parameters [2] {
- Parameter #0 [ <required> $array ]
- Parameter #1 [ <optional> $array ]
+ Parameter #0 [ <required> $kernel ]
+ Parameter #1 [ <required> $shape ]
}
}
- Method [ <internal:imagick> static public method frombuiltin ] {
+ Method [ <internal:imagick> static public method fromMatrix ] {
- Parameters [2] {
- Parameter #0 [ <required> $kerneltype ]
- Parameter #1 [ <required> $paramstring ]
+ Parameter #0 [ <required> $matrix ]
+ Parameter #1 [ <required> $origin ]
}
}
}
@@ -5011,27 +5033,22 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
- Properties [0] {
}
- - Methods [6] {
- Method [ <internal:imagick, ctor> private method __construct ] {
-
- - Parameters [0] {
- }
- }
-
- Method [ <internal:imagick> public method addkernel ] {
+ - Methods [5] {
+ Method [ <internal:imagick> public method addKernel ] {
- Parameters [1] {
- Parameter #0 [ <required> ImagickKernel $ImagickKernel ]
+ Parameter #0 [ <required> ImagickKernel $kernel ]
}
}
- Method [ <internal:imagick> public method getmatrix ] {
+ Method [ <internal:imagick> public method addUnityKernel ] {
- - Parameters [0] {
+ - Parameters [1] {
+ Parameter #0 [ <required> $scale ]
}
}
- Method [ <internal:imagick> public method separate ] {
+ Method [ <internal:imagick> public method getMatrix ] {
- Parameters [0] {
}
@@ -5041,14 +5058,13 @@ Extension [ <persistent> extension #77 imagick version 3.4.4 ] {
- Parameters [2] {
Parameter #0 [ <required> $scale ]
- Parameter #1 [ <optional> $normalize_flag ]
+ Parameter #1 [ <required> $normalize_kernel ]
}
}
- Method [ <internal:imagick> public method addunitykernel ] {
+ Method [ <internal:imagick> public method separate ] {
- - Parameters [1] {
- Parameter #0 [ <required> $scale ]
+ - Parameters [0] {
}
}
}
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
diff --git a/imagick-php8.patch b/imagick-php8.patch
deleted file mode 100644
index b18cc16..0000000
--- a/imagick-php8.patch
+++ /dev/null
@@ -1,1309 +0,0 @@
-diff --git a/imagick.c b/imagick.c
-index 8e58afe..1e6d174 100644
---- a/imagick.c
-+++ b/imagick.c
-@@ -40,7 +40,11 @@
- ZEND_DECLARE_MODULE_GLOBALS(imagick)
-
- #ifdef IMAGICK_WITH_KERNEL
--HashTable* php_imagickkernel_get_debug_info(zval *obj, int *is_temp TSRMLS_DC); /* {{{ */
-+ #if PHP_VERSION_ID >= 80000
-+ HashTable* php_imagickkernel_get_debug_info(zend_object *obj, int *is_temp TSRMLS_DC); /* {{{ */
-+ #else
-+ HashTable* php_imagickkernel_get_debug_info(zval *obj, int *is_temp TSRMLS_DC); /* {{{ */
-+ #endif
- #endif
-
- zend_class_entry *php_imagick_sc_entry;
-@@ -429,6 +433,14 @@ PHP_IMAGICK_API zend_class_entry *php_imagickpixel_get_class_entry()
- ZEND_ARG_INFO(0, threshold)
- ZEND_END_ARG_INFO()
-
-+#if PHP_IMAGICK_HAVE_HOUGHLINE
-+ ZEND_BEGIN_ARG_INFO_EX(imagick_houghlineimage_args, 0, 0, 3)
-+ ZEND_ARG_INFO(0, width)
-+ ZEND_ARG_INFO(0, height)
-+ ZEND_ARG_INFO(0, threshold)
-+ ZEND_END_ARG_INFO()
-+#endif
-+
- ZEND_BEGIN_ARG_INFO_EX(imagick_segmentimage_args, 0, 0, 3)
- ZEND_ARG_INFO(0, COLORSPACE)
- ZEND_ARG_INFO(0, cluster_threshold)
-@@ -2412,6 +2424,9 @@ static zend_function_entry php_imagick_class_methods[] =
- PHP_ME(imagick, sparsecolorimage, imagick_sparsecolorimage_args, ZEND_ACC_PUBLIC)
- PHP_ME(imagick, remapimage, imagick_remapimage_args, ZEND_ACC_PUBLIC)
- #endif
-+#if PHP_IMAGICK_HAVE_HOUGHLINE
-+ PHP_ME(imagick, houghlineimage, imagick_houghlineimage_args, ZEND_ACC_PUBLIC)
-+#endif
- #if MagickLibVersion > 0x646
- PHP_ME(imagick, exportimagepixels, imagick_exportimagepixels_args, ZEND_ACC_PUBLIC)
- #endif
-@@ -2441,7 +2456,7 @@ static zend_function_entry php_imagick_class_methods[] =
- PHP_ME(imagick, smushimages, imagick_smushimages_args, ZEND_ACC_PUBLIC)
- #endif
- PHP_ME(imagick, __construct, imagick_construct_args, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-- PHP_ME(imagick, __tostring, NULL, ZEND_ACC_PUBLIC)
-+ PHP_ME(imagick, __tostring, imagick_zero_args, ZEND_ACC_PUBLIC)
- #if PHP_VERSION_ID >= 50600
- PHP_ME(imagick, count, imagick_count_args, ZEND_ACC_PUBLIC)
- #else
-@@ -2657,7 +2672,7 @@ static zend_function_entry php_imagick_class_methods[] =
- PHP_ME(imagick, getimagegamma, imagick_zero_args, ZEND_ACC_PUBLIC)
- PHP_ME(imagick, getimagegreenprimary, imagick_zero_args, ZEND_ACC_PUBLIC)
- PHP_ME(imagick, getimageheight, imagick_zero_args, ZEND_ACC_PUBLIC)
-- PHP_ME(imagick, getimagehistogram, NULL, ZEND_ACC_PUBLIC)
-+ PHP_ME(imagick, getimagehistogram, imagick_zero_args, ZEND_ACC_PUBLIC)
- PHP_ME(imagick, getimageinterlacescheme, imagick_zero_args, ZEND_ACC_PUBLIC)
- PHP_ME(imagick, getimageiterations, imagick_zero_args, ZEND_ACC_PUBLIC)
- #if MagickLibVersion < 0x700
-@@ -3262,6 +3277,10 @@ PHP_INI_BEGIN()
- STD_PHP_INI_ENTRY("imagick.locale_fix", "0", PHP_INI_ALL, OnUpdateBool, locale_fix, zend_imagick_globals, imagick_globals)
- STD_PHP_INI_ENTRY("imagick.skip_version_check", "0", PHP_INI_ALL, OnUpdateBool, skip_version_check, zend_imagick_globals, imagick_globals)
- STD_PHP_INI_ENTRY("imagick.progress_monitor", "0", PHP_INI_SYSTEM, OnUpdateBool, progress_monitor, zend_imagick_globals, imagick_globals)
-+
-+ STD_PHP_INI_ENTRY("imagick.set_single_thread", "0", PHP_INI_SYSTEM, OnUpdateBool, set_single_thread, zend_imagick_globals, imagick_globals)
-+ STD_PHP_INI_ENTRY("imagick.shutdown_sleep_count", "10", PHP_INI_ALL, OnUpdateLong, shutdown_sleep_count, zend_imagick_globals, imagick_globals)
-+
- PHP_INI_END()
-
- static void php_imagick_init_globals(zend_imagick_globals *imagick_globals)
-@@ -3269,12 +3288,21 @@ static void php_imagick_init_globals(zend_imagick_globals *imagick_globals)
- imagick_globals->locale_fix = 0;
- imagick_globals->progress_monitor = 0;
- imagick_globals->skip_version_check = 0;
-+ imagick_globals->set_single_thread = 0;
-+ // 10 is magick number, that seems to be enough.
-+ imagick_globals->shutdown_sleep_count = 10;
- }
-
-
-+#if PHP_VERSION_ID >= 80000
-+static int php_imagick_count_elements(zend_object *object, im_long *count) /* {{{ */
-+{
-+ php_imagick_object *intern= php_imagick_fetch_object(object);
-+#else
- static int php_imagick_count_elements(zval *object, im_long *count TSRMLS_DC) /* {{{ */
- {
- php_imagick_object *intern= Z_IMAGICK_P(object);
-+#endif
-
- if (intern->magick_wand) {
- *count = MagickGetNumberImages(intern->magick_wand);
-@@ -3283,6 +3311,71 @@ static int php_imagick_count_elements(zval *object, im_long *count TSRMLS_DC) /*
- return FAILURE;
- }
-
-+
-+#if PHP_VERSION_ID >= 80000
-+static zval *php_imagick_read_property(zend_object *object, zend_string *member, int type, void **cache_slot, zval *rv)
-+{
-+ int ret;
-+ php_imagick_object *intern;
-+ zval *retval = NULL;
-+ const zend_object_handlers *std_hnd;
-+
-+
-+ std_hnd = zend_get_std_object_handlers();
-+
-+ ret = std_hnd->has_property(object, member, type, cache_slot TSRMLS_CC);
-+
-+ if (ret) {
-+ //TODO - this would allow better immutability
-+ //ZVAL_COPY_VALUE(retval, std_hnd->read_property(object, member, type, cache_slot, rv TSRMLS_CC));
-+ retval = std_hnd->read_property(object, member, type, cache_slot, rv TSRMLS_CC);
-+ }
-+ else {
-+
-+ intern = php_imagick_fetch_object(object);
-+ /* Do we have any images? */
-+ if (MagickGetNumberImages(intern->magick_wand)) {
-+
-+ //TODO - this seems redundant
-+ /* Is this overloaded? */
-+ if (!strcmp(ZSTR_VAL(member), "width") ||
-+ !strcmp(ZSTR_VAL(member), "height") ||
-+ !strcmp(ZSTR_VAL(member), "format")) {
-+
-+ if (!strcmp(ZSTR_VAL(member), "width")) {
-+ retval = rv;
-+ ZVAL_LONG(retval, MagickGetImageWidth(intern->magick_wand));
-+ } else if (!strcmp(ZSTR_VAL(member), "height")) {
-+ retval = rv;
-+ ZVAL_LONG(retval, MagickGetImageHeight(intern->magick_wand));
-+ } else if (!strcmp(ZSTR_VAL(member), "format")) {
-+ char *format = MagickGetImageFormat(intern->magick_wand);
-+
-+ if (format) {
-+ retval = rv;
-+ ZVAL_STRING(retval, format);
-+ IMAGICK_FREE_MAGICK_MEMORY(format);
-+ } else {
-+ retval = rv;
-+ ZVAL_STRING(retval, "");
-+ }
-+ }
-+ }
-+ }
-+ }
-+
-+ if (!retval) {
-+ //TODO - why is the error silent - it would be a small BC break
-+ //to enable the warning. I think it would be the correct thing to do though.
-+ //zend_error(E_NOTICE,"Undefined property: \Imagick::$%s", Z_STRVAL_P(member));
-+ retval = &EG(uninitialized_zval);
-+ }
-+
-+ return retval;
-+}
-+
-+#else // PHP_VERSION_ID >= 80000
-+
- #ifdef ZEND_ENGINE_3
- static zval *php_imagick_read_property(zval *object, zval *member, int type, void **cache_slot, zval *rv TSRMLS_DC)
- {
-@@ -3434,7 +3527,11 @@ static zval *php_imagick_read_property(zval *object, zval *member, int type, con
- }
- #endif
-
--#ifdef ZEND_ENGINE_3
-+#endif
-+
-+#if PHP_VERSION_ID >= 80000
-+static zend_object * php_imagick_clone_imagick_object(zend_object *this_ptr)
-+#elif PHP_VERSION_ID >= 70000
- static zend_object * php_imagick_clone_imagick_object(zval *this_ptr TSRMLS_DC)
- #else
- static zend_object_value php_imagick_clone_imagick_object(zval *this_ptr TSRMLS_DC)
-@@ -3442,7 +3539,11 @@ static zend_object_value php_imagick_clone_imagick_object(zval *this_ptr TSRMLS_
- {
- MagickWand *wand_copy = NULL;
- php_imagick_object *new_obj = NULL;
--#ifdef ZEND_ENGINE_3
-+#if PHP_VERSION_ID >= 80000
-+ php_imagick_object *old_obj = php_imagick_fetch_object(this_ptr);
-+ zend_object * new_zo = php_imagick_object_new_ex(old_obj->zo.ce, &new_obj, 0 TSRMLS_CC);
-+ zend_objects_clone_members(&new_obj->zo, &old_obj->zo TSRMLS_CC);
-+#elif PHP_VERSION_ID >= 70000
- php_imagick_object *old_obj = Z_IMAGICK_P(this_ptr);
- zend_object * new_zo = php_imagick_object_new_ex(old_obj->zo.ce, &new_obj, 0 TSRMLS_CC);
- zend_objects_clone_members(&new_obj->zo, &old_obj->zo TSRMLS_CC);
-@@ -3466,7 +3567,9 @@ static zend_object_value php_imagick_clone_imagick_object(zval *this_ptr TSRMLS_
- return new_zo;
- }
-
--#ifdef ZEND_ENGINE_3
-+#if PHP_VERSION_ID >= 80000
-+static zend_object * php_imagick_clone_imagickdraw_object(zend_object *this_ptr)
-+#elif PHP_VERSION_ID >= 70000
- static zend_object * php_imagick_clone_imagickdraw_object(zval *this_ptr TSRMLS_DC)
- #else
- static zend_object_value php_imagick_clone_imagickdraw_object(zval *this_ptr TSRMLS_DC)
-@@ -3474,7 +3577,11 @@ static zend_object_value php_imagick_clone_imagickdraw_object(zval *this_ptr TSR
- {
- DrawingWand *wand_copy = NULL;
- php_imagickdraw_object *new_obj = NULL;
--#ifdef ZEND_ENGINE_3
-+#if PHP_VERSION_ID >= 80000
-+ php_imagickdraw_object *old_obj = php_imagickdraw_fetch_object(this_ptr);
-+ zend_object * new_zo = php_imagickdraw_object_new_ex(old_obj->zo.ce, &new_obj, 0 TSRMLS_CC);
-+ zend_objects_clone_members(&new_obj->zo, &old_obj->zo TSRMLS_CC);
-+#elif PHP_VERSION_ID >= 70000
- php_imagickdraw_object *old_obj = Z_IMAGICKDRAW_P(this_ptr);
- zend_object * new_zo = php_imagickdraw_object_new_ex(old_obj->zo.ce, &new_obj, 0 TSRMLS_CC);
- zend_objects_clone_members(&new_obj->zo, &old_obj->zo TSRMLS_CC);
-@@ -3494,7 +3601,10 @@ static zend_object_value php_imagick_clone_imagickdraw_object(zval *this_ptr TSR
- return new_zo;
- }
-
--#ifdef ZEND_ENGINE_3
-+
-+#if PHP_VERSION_ID >= 80000
-+static zend_object * php_imagick_clone_imagickpixel_object(zend_object *this_ptr)
-+#elif PHP_VERSION_ID >= 70000
- static zend_object * php_imagick_clone_imagickpixel_object(zval *this_ptr TSRMLS_DC)
- #else
- static zend_object_value php_imagick_clone_imagickpixel_object(zval *this_ptr TSRMLS_DC)
-@@ -3502,12 +3612,18 @@ static zend_object_value php_imagick_clone_imagickpixel_object(zval *this_ptr TS
- {
- PixelWand *wand_copy = NULL;
- php_imagickpixel_object *new_obj = NULL;
--#ifdef ZEND_ENGINE_3
-+
-+#if PHP_VERSION_ID >= 80000
-+ zend_object *new_zo;
-+ php_imagickpixel_object *old_obj = php_imagickpixel_fetch_object(this_ptr);
-+ new_zo = php_imagickpixel_object_new_ex(old_obj->zo.ce, &new_obj TSRMLS_CC);
-+ zend_objects_clone_members(&new_obj->zo, &old_obj->zo TSRMLS_CC);
-+#elif PHP_VERSION_ID >= 70000
- zend_object *new_zo;
- php_imagickpixel_object *old_obj = Z_IMAGICKPIXEL_P(this_ptr);
- new_zo = php_imagickpixel_object_new_ex(old_obj->zo.ce, &new_obj TSRMLS_CC);
- zend_objects_clone_members(&new_obj->zo, &old_obj->zo TSRMLS_CC);
--#else
-+#else
- php_imagickpixel_object *old_obj = (php_imagickpixel_object *) zend_object_store_get_object(this_ptr TSRMLS_CC);
- zend_object_value new_zo = php_imagickpixel_object_new_ex(old_obj->zo.ce, &new_obj TSRMLS_CC);
- zend_objects_clone_members(&new_obj->zo, new_zo, &old_obj->zo, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC);
-@@ -3524,7 +3640,10 @@ static zend_object_value php_imagick_clone_imagickpixel_object(zval *this_ptr TS
- }
-
- #ifdef IMAGICK_WITH_KERNEL
--#ifdef ZEND_ENGINE_3
-+
-+#if PHP_VERSION_ID >= 80000
-+static zend_object * php_imagick_clone_imagickkernel_object(zend_object *this_ptr TSRMLS_DC)
-+#elif PHP_VERSION_ID >= 70000
- static zend_object * php_imagick_clone_imagickkernel_object(zval *this_ptr TSRMLS_DC)
- #else
- static zend_object_value php_imagick_clone_imagickkernel_object(zval *this_ptr TSRMLS_DC)
-@@ -3533,7 +3652,12 @@ static zend_object_value php_imagick_clone_imagickkernel_object(zval *this_ptr T
- KernelInfo *kernel_info_copy = NULL;
- php_imagickkernel_object *new_obj = NULL;
-
--#ifdef ZEND_ENGINE_3
-+#if PHP_VERSION_ID >= 80000
-+ zend_object *new_zo;
-+ php_imagickkernel_object *old_obj = php_imagickkernel_fetch_object(this_ptr);
-+ new_zo = php_imagickkernel_object_new_ex(old_obj->zo.ce, &new_obj TSRMLS_CC);
-+ zend_objects_clone_members(&new_obj->zo, &old_obj->zo TSRMLS_CC);
-+#elif PHP_VERSION_ID >= 70000
- zend_object *new_zo;
- php_imagickkernel_object *old_obj = Z_IMAGICKKERNEL_P(this_ptr);
- new_zo = php_imagickkernel_object_new_ex(old_obj->zo.ce, &new_obj TSRMLS_CC);
-@@ -3748,6 +3872,10 @@ PHP_MINIT_FUNCTION(imagick)
- checkImagickVersion();
- }
-
-+ if (IMAGICK_G(set_single_thread)) {
-+ MagickSetResourceLimit(ThreadResource, 1);
-+ }
-+
- return SUCCESS;
- }
-
-@@ -3757,7 +3885,7 @@ PHP_MINFO_FUNCTION(imagick)
-
- #ifdef ZEND_ENGINE_3
- smart_string formats = {0};
--#else
-+#else
- smart_str formats = {0};
- #endif
-
-@@ -3824,12 +3952,21 @@ PHP_MINFO_FUNCTION(imagick)
-
- PHP_MSHUTDOWN_FUNCTION(imagick)
- {
-+ int i;
-+
- // This suppresses an 'unused parameter' warning.
- (void)type;
-
--
- MagickWandTerminus();
-
-+ // Sleep for a bit to hopefully allow OpenMP to
-+ // shut down the threads it created, and avoid a segfault
-+ // This hack won't be needed once everyone is compiling ImageMagick
-+ // against a version of OpenMP that has omp_pause_resource_all()
-+ for (i = 0; i < 100 && i < IMAGICK_G(shutdown_sleep_count); i += 1) {
-+ usleep(1000);
-+ }
-+
- #if defined(ZTS) && defined(PHP_WIN32)
- tsrm_mutex_free(imagick_mutex);
- #endif
-diff --git a/imagick_class.c b/imagick_class.c
-index 164406a..3b041c5 100644
---- a/imagick_class.c
-+++ b/imagick_class.c
-@@ -2488,6 +2488,37 @@ PHP_METHOD(imagick, deskewimage)
- RETURN_TRUE;
- }
-
-+
-+#if PHP_IMAGICK_HAVE_HOUGHLINE
-+/* {{{ proto bool Imagick::houghLineImage(int width, int height, float threshold)
-+ Draw hough lines for the image
-+
-+*/
-+PHP_METHOD(imagick, houghlineimage)
-+{
-+ php_imagick_object *intern;
-+ MagickBooleanType status;
-+ double threshold;
-+ im_long width, height;
-+
-+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lld", &width, &height, &threshold) == FAILURE) {
-+ return;
-+ }
-+
-+ intern = Z_IMAGICK_P(getThis());
-+ if (php_imagick_ensure_not_empty (intern->magick_wand) == 0)
-+ return;
-+
-+ status = MagickHoughLineImage(intern->magick_wand, width, height, threshold);
-+ if (status == MagickFalse) {
-+ php_imagick_convert_imagick_exception(intern->magick_wand, "Unable to Hough line image" TSRMLS_CC);
-+ return;
-+ }
-+ RETURN_TRUE;
-+}
-+/* }}} */
-+#endif
-+
- PHP_METHOD(imagick, segmentimage)
- {
- php_imagick_object *intern;
-diff --git a/imagick_helpers.c b/imagick_helpers.c
-index 3d90aac..a85f72e 100644
---- a/imagick_helpers.c
-+++ b/imagick_helpers.c
-@@ -97,6 +97,11 @@ MagickBooleanType php_imagick_progress_monitor_callable(const char *text, const
- fci_cache = empty_fcall_info_cache;
-
- fci.size = sizeof(fci);
-+
-+#if PHP_VERSION_ID >= 80000
-+ fci.named_params = NULL;
-+#endif
-+
- #if PHP_VERSION_ID < 70100
- fci.function_table = EG(function_table);
- #endif
-@@ -113,7 +118,9 @@ MagickBooleanType php_imagick_progress_monitor_callable(const char *text, const
- #endif
- fci.param_count = 2;
- fci.params = zargs;
-+#if PHP_VERSION_ID < 80000
- fci.no_separation = 0;
-+#endif
- #if PHP_VERSION_ID < 70100
- fci.symbol_table = NULL;
- #endif
-@@ -804,7 +811,7 @@ PixelWand *php_imagick_zval_to_pixelwand (zval *param, php_imagick_class_type_t
- break;
-
- case IS_OBJECT:
-- if (instanceof_function_ex(Z_OBJCE_P(param), php_imagickpixel_sc_entry, 0 TSRMLS_CC)) {
-+ if (instanceof_function(Z_OBJCE_P(param), php_imagickpixel_sc_entry TSRMLS_CC)) {
- php_imagickpixel_object *intern = Z_IMAGICKPIXEL_P(param);
- pixel_wand = intern->pixel_wand;
- } else
-@@ -854,7 +861,7 @@ PixelWand *php_imagick_zval_to_opacity (zval *param, php_imagick_class_type_t ca
- break;
-
- case IS_OBJECT:
-- if (instanceof_function_ex(Z_OBJCE_P(param), php_imagickpixel_sc_entry, 0 TSRMLS_CC)) {
-+ if (instanceof_function(Z_OBJCE_P(param), php_imagickpixel_sc_entry TSRMLS_CC)) {
- php_imagickpixel_object *intern = Z_IMAGICKPIXEL_P(param);
- pixel_wand = intern->pixel_wand;
- } else
-diff --git a/imagickkernel_class.c b/imagickkernel_class.c
-index 7504d29..9cfc581 100644
---- a/imagickkernel_class.c
-+++ b/imagickkernel_class.c
-@@ -79,7 +79,11 @@ static void php_imagickkernelvalues_to_zval(zval *zv, KernelInfo *kernel_info) {
- }
-
-
-+#if PHP_VERSION_ID >= 80000
-+HashTable* php_imagickkernel_get_debug_info(zend_object *obj, int *is_temp TSRMLS_DC) /* {{{ */
-+#else
- HashTable* php_imagickkernel_get_debug_info(zval *obj, int *is_temp TSRMLS_DC) /* {{{ */
-+#endif
- {
- php_imagickkernel_object *internp;
- HashTable *debug_info;
-@@ -92,7 +96,11 @@ HashTable* php_imagickkernel_get_debug_info(zval *obj, int *is_temp TSRMLS_DC) /
-
- *is_temp = 1; //var_dump will destroy the hashtable
-
-+#if PHP_VERSION_ID >= 80000
-+ internp = php_imagickkernel_fetch_object(obj);
-+#else
- internp = Z_IMAGICKKERNEL_P(obj);
-+#endif
- kernel_info = internp->kernel_info;
-
- ALLOC_HASHTABLE(debug_info);
-diff --git a/php_imagick_defs.h b/php_imagick_defs.h
-index 5eb57e5..dd16896 100644
---- a/php_imagick_defs.h
-+++ b/php_imagick_defs.h
-@@ -42,6 +42,16 @@
- #include "php_ini.h"
- #include "Zend/zend.h"
-
-+#if PHP_VERSION_ID >= 80000
-+ #define HAVE_LOCALE_H
-+ #define TSRMLS_C
-+ #define TSRMLS_CC
-+ #define TSRMLS_D
-+ #define TSRMLS_DC
-+ #define TSRMLS_FETCH()
-+ #define TSRMLS_SET_CTX(ctx)
-+#endif
-+
- /* Include locale header */
- #ifdef HAVE_LOCALE_H
- # include <locale.h>
-@@ -83,6 +93,10 @@ ZEND_BEGIN_MODULE_GLOBALS(imagick)
- zend_bool locale_fix;
- zend_bool progress_monitor;
- zend_bool skip_version_check;
-+
-+ zend_bool set_single_thread;
-+ im_long shutdown_sleep_count;
-+
- php_imagick_callback *progress_callback;
- #ifdef PHP_IMAGICK_ZEND_MM
- MagickWand *keep_alive;
-@@ -388,6 +402,12 @@ extern zend_class_entry *php_imagickkernel_exception_class_entry;
-
- /* Forward declarations (Imagick) */
-
-+#if (MagickLibVersion >= 0x700 && MagickLibVersion >= 0x709)
-+ #define PHP_IMAGICK_HAVE_HOUGHLINE 1
-+#else
-+ #define PHP_IMAGICK_HAVE_HOUGHLINE 0
-+#endif
-+
- /* The conditional methods */
- #if MagickLibVersion > 0x628
- PHP_METHOD(imagick, pingimageblob);
-@@ -510,6 +530,11 @@ PHP_METHOD(imagick, setimagegravity);
- #if MagickLibVersion > 0x645
- PHP_METHOD(imagick, importimagepixels);
- PHP_METHOD(imagick, deskewimage);
-+
-+
-+#if PHP_IMAGICK_HAVE_HOUGHLINE
-+PHP_METHOD(imagick, houghlineimage);
-+#endif
- PHP_METHOD(imagick, segmentimage);
- PHP_METHOD(imagick, sparsecolorimage);
- PHP_METHOD(imagick, remapimage);
-diff --git a/tests/034_Imagick_annotateImage_basic.phpt b/tests/034_Imagick_annotateImage_basic.phpt
-index 65d113f..431df4b 100644
---- a/tests/034_Imagick_annotateImage_basic.phpt
-+++ b/tests/034_Imagick_annotateImage_basic.phpt
-@@ -8,6 +8,8 @@ require_once(dirname(__FILE__) . '/skipif.inc');
- --FILE--
- <?php
-
-+require_once(dirname(__FILE__) . '/functions.inc');
-+
- $strokeColor = 'rgb(0, 0, 0)';
- $fillColor = 'rgb(232, 227, 232)';
-
-@@ -24,6 +26,8 @@ function annotateImage($strokeColor, $fillColor) {
-
- $text = "Imagick is a native php \nextension to create and \nmodify images using the\nImageMagick API.";
-
-+ setFontForImagick($imagick);
-+ setFontForImagickDraw($draw);
- $imagick->annotateimage($draw, 40, 40, 0, $text);
-
- $bytes = $imagick->getImageBlob();
-diff --git a/tests/047_Imagick_convolveImage_6.phpt b/tests/047_Imagick_convolveImage_6.phpt
-index 0bca35f..1a4cb41 100644
---- a/tests/047_Imagick_convolveImage_6.phpt
-+++ b/tests/047_Imagick_convolveImage_6.phpt
-@@ -38,5 +38,5 @@ convolveImage($bias, $kernelMatrix) ;
- echo "Ok";
- ?>
- --EXPECTF--
--Deprecated: Function Imagick::setimagebias() is deprecated in %s
-+Deprecated: %s Imagick::setimagebias() is deprecated in %s
- Ok
-diff --git a/tests/097_Imagick_newPseudoImage_basic.phpt b/tests/097_Imagick_newPseudoImage_basic.phpt
-index 5b22164..fbb87ef 100644
---- a/tests/097_Imagick_newPseudoImage_basic.phpt
-+++ b/tests/097_Imagick_newPseudoImage_basic.phpt
-@@ -5,7 +5,7 @@ Test Imagick, newPseudoImage
- --FILE--
- <?php
-
--$canvasType = 'gradient:';
-+$canvasType = 'gradient:red';
-
- function newPseudoImage($canvasType) {
- $imagick = new \Imagick();
-@@ -19,4 +19,4 @@ newPseudoImage($canvasType) ;
- echo "Ok";
- ?>
- --EXPECTF--
--Ok
-\ No newline at end of file
-+Ok
-diff --git a/tests/098_Imagick_orderedPosterizeImage_basic.phpt b/tests/098_Imagick_orderedPosterizeImage_basic.phpt
-index e53ecb5..87192c5 100644
---- a/tests/098_Imagick_orderedPosterizeImage_basic.phpt
-+++ b/tests/098_Imagick_orderedPosterizeImage_basic.phpt
-@@ -28,5 +28,5 @@ orderedPosterizeImage($orderedPosterizeType) ;
- echo "Ok";
- ?>
- --EXPECTF--
--Deprecated: Function Imagick::orderedposterizeimage() is deprecated in %S
-+Deprecated: %s Imagick::orderedposterizeimage() is deprecated in %S
- Ok
-diff --git a/tests/102_Imagick_radialBlurImage_basic.phpt b/tests/102_Imagick_radialBlurImage_basic.phpt
-index bfcce5e..9820957 100644
---- a/tests/102_Imagick_radialBlurImage_basic.phpt
-+++ b/tests/102_Imagick_radialBlurImage_basic.phpt
-@@ -24,9 +24,9 @@ radialBlurImage() ;
- echo "Ok";
- ?>
- --EXPECTF--
--Deprecated: Function Imagick::radialblurimage() is deprecated in %s
-+Deprecated: %s Imagick::radialblurimage() is deprecated in %s
-
--Deprecated: Function Imagick::radialblurimage() is deprecated in %s
-+Deprecated: %s Imagick::radialblurimage() is deprecated in %s
-
--Deprecated: Function Imagick::radialblurimage() is deprecated in %s
-+Deprecated: %s Imagick::radialblurimage() is deprecated in %s
- Ok
-diff --git a/tests/112_Imagick_roundCorners_basic.phpt b/tests/112_Imagick_roundCorners_basic.phpt
-index cdf026f..98c798f 100644
---- a/tests/112_Imagick_roundCorners_basic.phpt
-+++ b/tests/112_Imagick_roundCorners_basic.phpt
-@@ -40,5 +40,5 @@ roundCorners() ;
- echo "Ok";
- ?>
- --EXPECTF--
--Deprecated: Function Imagick::roundcornersimage() is deprecated in %s
-+Deprecated: %s Imagick::roundcornersimage() is deprecated in %s
- Ok
-diff --git a/tests/121_Imagick_setImageBias_basic.phpt b/tests/121_Imagick_setImageBias_basic.phpt
-index 2ceab20..662a439 100644
---- a/tests/121_Imagick_setImageBias_basic.phpt
-+++ b/tests/121_Imagick_setImageBias_basic.phpt
-@@ -34,5 +34,5 @@ setImageBias($bias) ;
- echo "Ok";
- ?>
- --EXPECTF--
--Deprecated: Function Imagick::setimagebias() is deprecated in %s
-+Deprecated: %s Imagick::setimagebias() is deprecated in %s
- Ok
-diff --git a/tests/123_Imagick_setImageClipMask_basic.phpt b/tests/123_Imagick_setImageClipMask_basic.phpt
-index 7844fa7..a1620ba 100644
---- a/tests/123_Imagick_setImageClipMask_basic.phpt
-+++ b/tests/123_Imagick_setImageClipMask_basic.phpt
-@@ -48,5 +48,5 @@ setImageClipMask() ;
- echo "Ok";
- ?>
- --EXPECTF--
--Deprecated: Function Imagick::setimageclipmask() is deprecated in %s
-+Deprecated: %s Imagick::setimageclipmask() is deprecated in %s
- Ok
-diff --git a/tests/151_Imagick_subImageMatch_basic.phpt b/tests/151_Imagick_subImageMatch_basic.phpt
-index 491bb79..f11884f 100644
---- a/tests/151_Imagick_subImageMatch_basic.phpt
-+++ b/tests/151_Imagick_subImageMatch_basic.phpt
-@@ -2,7 +2,7 @@
- Test Imagick, subImageMatch
- --SKIPIF--
- <?php
--$imageMagickRequiredVersion=0x675;
-+$imageMagickRequiredVersion=0x687;
- require_once(dirname(__FILE__) . '/skipif.inc');
- ?>
- --FILE--
-diff --git a/tests/159_Imagick_transformImage_basic.phpt b/tests/159_Imagick_transformImage_basic.phpt
-index d3764c9..cf90987 100644
---- a/tests/159_Imagick_transformImage_basic.phpt
-+++ b/tests/159_Imagick_transformImage_basic.phpt
-@@ -22,5 +22,5 @@ transformimage() ;
- echo "Ok";
- ?>
- --EXPECTF--
--Deprecated: Function Imagick::transformimage() is deprecated in %s
-+Deprecated: %s Imagick::transformimage() is deprecated in %s
- Ok
-diff --git a/tests/177_ImagickDraw_composite_basic.phpt b/tests/177_ImagickDraw_composite_basic.phpt
-index 3c87524..00bd1a3 100644
---- a/tests/177_ImagickDraw_composite_basic.phpt
-+++ b/tests/177_ImagickDraw_composite_basic.phpt
-@@ -8,6 +8,8 @@ require_once(dirname(__FILE__) . '/skipif.inc');
- --FILE--
- <?php
-
-+require_once(dirname(__FILE__) . '/functions.inc');
-+
- $backgroundColor = 'rgb(225, 225, 225)';
- $strokeColor = 'rgb(0, 0, 0)';
- $fillColor = 'DodgerBlue2';
-@@ -16,6 +18,8 @@ function composite($strokeColor, $fillColor, $backgroundColor) {
-
- $draw = new \ImagickDraw();
-
-+ setFontForImagickDraw($draw);
-+
- $draw->setStrokeColor($strokeColor);
- $draw->setFillColor($fillColor);
- $draw->setFillOpacity(1);
-diff --git a/tests/180_ImagickDraw_matte_basic.phpt b/tests/180_ImagickDraw_matte_basic.phpt
-index 88befea..b2ea71a 100644
---- a/tests/180_ImagickDraw_matte_basic.phpt
-+++ b/tests/180_ImagickDraw_matte_basic.phpt
-@@ -41,5 +41,5 @@ matte($strokeColor, $fillColor, $backgroundColor, $paintType) ;
- echo "Ok";
- ?>
- --EXPECTF--
--Deprecated: Function ImagickDraw::matte() is deprecated in %s
-+Deprecated: %s ImagickDraw::matte() is deprecated in %s
- Ok
-diff --git a/tests/206_ImagickDraw_setFontSize_basic.phpt b/tests/206_ImagickDraw_setFontSize_basic.phpt
-index 9ac6d26..97b34b5 100644
---- a/tests/206_ImagickDraw_setFontSize_basic.phpt
-+++ b/tests/206_ImagickDraw_setFontSize_basic.phpt
-@@ -8,6 +8,8 @@ require_once(dirname(__FILE__) . '/skipif.inc');
- --FILE--
- <?php
-
-+require_once(dirname(__FILE__) . '/functions.inc');
-+
- $backgroundColor = 'rgb(225, 225, 225)';
- $strokeColor = 'rgb(0, 0, 0)';
- $fillColor = 'DodgerBlue2';
-@@ -16,6 +18,8 @@ function setFontSize($fillColor, $strokeColor, $backgroundColor) {
-
- $draw = new \ImagickDraw();
-
-+ setFontForImagickDraw($draw);
-+
- $draw->setStrokeOpacity(1);
- $draw->setStrokeColor($strokeColor);
- $draw->setFillColor($fillColor);
-diff --git a/tests/207_ImagickDraw_setFontFamily_basic.phpt b/tests/207_ImagickDraw_setFontFamily_basic.phpt
-index 230e77c..cf4ad1c 100644
---- a/tests/207_ImagickDraw_setFontFamily_basic.phpt
-+++ b/tests/207_ImagickDraw_setFontFamily_basic.phpt
-@@ -8,6 +8,8 @@ require_once(dirname(__FILE__) . '/skipif.inc');
- --FILE--
- <?php
-
-+require_once(dirname(__FILE__) . '/functions.inc');
-+
- $backgroundColor = 'rgb(225, 225, 225)';
- $strokeColor = 'rgb(0, 0, 0)';
- $fillColor = 'DodgerBlue2';
-@@ -15,6 +17,7 @@ $fillColor = 'DodgerBlue2';
- function setFontFamily($fillColor, $strokeColor, $backgroundColor) {
-
- $draw = new \ImagickDraw();
-+ setFontForImagickDraw($draw);
-
- $strokeColor = new \ImagickPixel($strokeColor);
- $fillColor = new \ImagickPixel($fillColor);
-diff --git a/tests/208_ImagickDraw_setFontStretch_basic.phpt b/tests/208_ImagickDraw_setFontStretch_basic.phpt
-index af3cb92..08c2d9e 100644
---- a/tests/208_ImagickDraw_setFontStretch_basic.phpt
-+++ b/tests/208_ImagickDraw_setFontStretch_basic.phpt
-@@ -8,6 +8,8 @@ require_once(dirname(__FILE__) . '/skipif.inc');
- --FILE--
- <?php
-
-+require_once(dirname(__FILE__) . '/functions.inc');
-+
- $backgroundColor = 'rgb(225, 225, 225)';
- $strokeColor = 'rgb(0, 0, 0)';
- $fillColor = 'DodgerBlue2';
-@@ -15,6 +17,7 @@ $fillColor = 'DodgerBlue2';
- function setFontStretch($fillColor, $strokeColor, $backgroundColor) {
-
- $draw = new \ImagickDraw();
-+ setFontForImagickDraw($draw);
-
- $draw->setStrokeColor($strokeColor);
- $draw->setFillColor($fillColor);
-diff --git a/tests/209_ImagickDraw_setFontWeight_basic.phpt b/tests/209_ImagickDraw_setFontWeight_basic.phpt
-index e98dc27..7fe9a6a 100644
---- a/tests/209_ImagickDraw_setFontWeight_basic.phpt
-+++ b/tests/209_ImagickDraw_setFontWeight_basic.phpt
-@@ -8,6 +8,8 @@ require_once(dirname(__FILE__) . '/skipif.inc');
- --FILE--
- <?php
-
-+require_once(dirname(__FILE__) . '/functions.inc');
-+
- $backgroundColor = 'rgb(225, 225, 225)';
- $strokeColor = 'rgb(0, 0, 0)';
- $fillColor = 'DodgerBlue2';
-@@ -15,6 +17,7 @@ $fillColor = 'DodgerBlue2';
- function setFontWeight($fillColor, $strokeColor, $backgroundColor) {
-
- $draw = new \ImagickDraw();
-+ setFontForImagickDraw($draw);
-
- $draw->setStrokeColor($strokeColor);
- $draw->setFillColor($fillColor);
-diff --git a/tests/210_ImagickDraw_setFontStyle_basic.phpt b/tests/210_ImagickDraw_setFontStyle_basic.phpt
-index 920cce2..0bbc882 100644
---- a/tests/210_ImagickDraw_setFontStyle_basic.phpt
-+++ b/tests/210_ImagickDraw_setFontStyle_basic.phpt
-@@ -8,12 +8,16 @@ require_once(dirname(__FILE__) . '/skipif.inc');
- --FILE--
- <?php
-
-+require_once(dirname(__FILE__) . '/functions.inc');
-+
- $backgroundColor = 'rgb(225, 225, 225)';
- $strokeColor = 'rgb(0, 0, 0)';
- $fillColor = 'DodgerBlue2';
-
- function setFontStyle($fillColor, $strokeColor, $backgroundColor) {
- $draw = new \ImagickDraw();
-+ setFontForImagickDraw($draw);
-+
- $draw->setStrokeColor($strokeColor);
- $draw->setFillColor($fillColor);
- $draw->setStrokeWidth(1);
-diff --git a/tests/212_ImagickDraw_setGravity_basic.phpt b/tests/212_ImagickDraw_setGravity_basic.phpt
-index b6ad07d..a803e1d 100644
---- a/tests/212_ImagickDraw_setGravity_basic.phpt
-+++ b/tests/212_ImagickDraw_setGravity_basic.phpt
-@@ -8,6 +8,8 @@ require_once(dirname(__FILE__) . '/skipif.inc');
- --FILE--
- <?php
-
-+require_once(dirname(__FILE__) . '/functions.inc');
-+
- $backgroundColor = 'rgb(225, 225, 225)';
- $strokeColor = 'rgb(0, 0, 0)';
- $fillColor = 'DodgerBlue2';
-@@ -15,6 +17,7 @@ $fillColor = 'DodgerBlue2';
- function setGravity($fillColor, $strokeColor, $backgroundColor) {
-
- $draw = new \ImagickDraw();
-+ setFontForImagickDraw($draw);
- $draw->setStrokeColor($strokeColor);
- $draw->setFillColor($fillColor);
- $draw->setStrokeWidth(1);
-diff --git a/tests/222_ImagickDraw_setTextAlignment_basic.phpt b/tests/222_ImagickDraw_setTextAlignment_basic.phpt
-index bda8249..939e473 100644
---- a/tests/222_ImagickDraw_setTextAlignment_basic.phpt
-+++ b/tests/222_ImagickDraw_setTextAlignment_basic.phpt
-@@ -8,12 +8,15 @@ require_once(dirname(__FILE__) . '/skipif.inc');
- --FILE--
- <?php
-
-+require_once(dirname(__FILE__) . '/functions.inc');
-+
- $backgroundColor = 'rgb(225, 225, 225)';
- $strokeColor = 'rgb(0, 0, 0)';
- $fillColor = 'DodgerBlue2';
-
- function setTextAlignment($strokeColor, $fillColor, $backgroundColor) {
- $draw = new \ImagickDraw();
-+ setFontForImagickDraw($draw);
- $draw->setStrokeColor($strokeColor);
- $draw->setFillColor($fillColor);
- $draw->setStrokeWidth(1);
-diff --git a/tests/223_ImagickDraw_setTextAntialias_basic.phpt b/tests/223_ImagickDraw_setTextAntialias_basic.phpt
-index 0c9bcaf..e7cd7f2 100644
---- a/tests/223_ImagickDraw_setTextAntialias_basic.phpt
-+++ b/tests/223_ImagickDraw_setTextAntialias_basic.phpt
-@@ -8,6 +8,8 @@ require_once(dirname(__FILE__) . '/skipif.inc');
- --FILE--
- <?php
-
-+require_once(dirname(__FILE__) . '/functions.inc');
-+
- $backgroundColor = 'rgb(225, 225, 225)';
- $strokeColor = 'rgb(0, 0, 0)';
- $fillColor = 'DodgerBlue2';
-@@ -15,6 +17,7 @@ $fillColor = 'DodgerBlue2';
- function setTextAntialias($fillColor, $backgroundColor) {
-
- $draw = new \ImagickDraw();
-+ setFontForImagickDraw($draw);
- $draw->setStrokeColor('none');
- $draw->setFillColor($fillColor);
- $draw->setStrokeWidth(1);
-diff --git a/tests/224_ImagickDraw_setTextUnderColor_basic.phpt b/tests/224_ImagickDraw_setTextUnderColor_basic.phpt
-index 69a788e..141eacc 100644
---- a/tests/224_ImagickDraw_setTextUnderColor_basic.phpt
-+++ b/tests/224_ImagickDraw_setTextUnderColor_basic.phpt
-@@ -8,6 +8,8 @@ require_once(dirname(__FILE__) . '/skipif.inc');
- --FILE--
- <?php
-
-+require_once(dirname(__FILE__) . '/functions.inc');
-+
- $backgroundColor = 'rgb(225, 225, 225)';
- $strokeColor = 'rgb(0, 0, 0)';
- $fillColor = 'DodgerBlue2';
-@@ -15,6 +17,7 @@ $textUnderColor = 'DeepPink2';
-
- function setTextUnderColor($strokeColor, $fillColor, $backgroundColor, $textUnderColor) {
- $draw = new \ImagickDraw();
-+ setFontForImagickDraw($draw);
-
- $draw->setStrokeColor($strokeColor);
- $draw->setFillColor($fillColor);
-diff --git a/tests/225_ImagickDraw_setTextDecoration_basic.phpt b/tests/225_ImagickDraw_setTextDecoration_basic.phpt
-index 5479971..b656158 100644
---- a/tests/225_ImagickDraw_setTextDecoration_basic.phpt
-+++ b/tests/225_ImagickDraw_setTextDecoration_basic.phpt
-@@ -8,6 +8,8 @@ require_once(dirname(__FILE__) . '/skipif.inc');
- --FILE--
- <?php
-
-+require_once(dirname(__FILE__) . '/functions.inc');
-+
- $backgroundColor = 'rgb(225, 225, 225)';
- $strokeColor = 'rgb(0, 0, 0)';
- $fillColor = 'DodgerBlue2';
-@@ -16,6 +18,7 @@ $textDecoration = 2;
- function setTextDecoration($strokeColor, $fillColor, $backgroundColor, $textDecoration) {
-
- $draw = new \ImagickDraw();
-+ setFontForImagickDraw($draw);
-
- $draw->setStrokeColor($strokeColor);
- $draw->setFillColor($fillColor);
-diff --git a/tests/241_Tutorial_psychedelicFont_basic.phpt b/tests/241_Tutorial_psychedelicFont_basic.phpt
-index b2e9873..9a9eba3 100644
---- a/tests/241_Tutorial_psychedelicFont_basic.phpt
-+++ b/tests/241_Tutorial_psychedelicFont_basic.phpt
-@@ -8,9 +8,11 @@ require_once(dirname(__FILE__) . '/skipif.inc');
- --FILE--
- <?php
-
-+require_once(dirname(__FILE__) . '/functions.inc');
-
- function psychedelicFont() {
- $draw = new \ImagickDraw();
-+ setFontForImagickDraw($draw);
- $name = 'Danack';
-
- $draw->setStrokeOpacity(1);
-diff --git a/tests/244_Tutorial_psychedelicFontGif_basic.phpt b/tests/244_Tutorial_psychedelicFontGif_basic.phpt
-index f03bdf7..3fde1d7 100644
---- a/tests/244_Tutorial_psychedelicFontGif_basic.phpt
-+++ b/tests/244_Tutorial_psychedelicFontGif_basic.phpt
-@@ -8,6 +8,7 @@ require_once(dirname(__FILE__) . '/skipif.inc');
- --FILE--
- <?php
-
-+require_once(dirname(__FILE__) . '/functions.inc');
-
- function psychedelicFontGif($name = 'Danack') {
-
-@@ -22,6 +23,7 @@ function psychedelicFontGif($name = 'Danack') {
- for ($frame = 0; $frame < $maxFrames; $frame++) {
-
- $draw = new \ImagickDraw();
-+ setFontForImagickDraw($draw);
-
- $draw->setStrokeOpacity(1);
- $draw->setfontsize(150 * $scale);
-diff --git a/tests/256_Imagick_exportImagePixels_basic.phpt b/tests/256_Imagick_exportImagePixels_basic.phpt
-index d3eceb5..96a57b9 100644
---- a/tests/256_Imagick_exportImagePixels_basic.phpt
-+++ b/tests/256_Imagick_exportImagePixels_basic.phpt
-@@ -2,7 +2,7 @@
- Test Imagick, Imagick::exportImagePixels
- --SKIPIF--
- <?php
--$imageMagickRequiredVersion=0x675;
-+$imageMagickRequiredVersion=0x687;
- require_once(dirname(__FILE__) . '/skipif.inc');
- ?>
- --FILE--
-diff --git a/tests/264_ImagickDraw_getTextDirection_basic.phpt b/tests/264_ImagickDraw_getTextDirection_basic.phpt
-index 8dbcbcd..210d99a 100644
---- a/tests/264_ImagickDraw_getTextDirection_basic.phpt
-+++ b/tests/264_ImagickDraw_getTextDirection_basic.phpt
-@@ -8,6 +8,8 @@ checkClassMethods('ImagickDraw', array('getTextDirection', 'setTextDirection'));
- --FILE--
- <?php
-
-+require_once(dirname(__FILE__) . '/functions.inc');
-+
- $backgroundColor = 'rgb(225, 225, 225)';
- $strokeColor = 'rgb(0, 0, 0)';
- $fillColor = 'DodgerBlue2';
-@@ -15,6 +17,7 @@ $fillColor = 'DodgerBlue2';
-
-
- $draw = new \ImagickDraw();
-+setFontForImagickDraw($draw);
-
- $draw->setStrokeColor($strokeColor);
- $draw->setFillColor($fillColor);
-diff --git a/tests/266_ImagickDraw_getFontResolution_basic.phpt b/tests/266_ImagickDraw_getFontResolution_basic.phpt
-index 43a2e46..31bccfc 100644
---- a/tests/266_ImagickDraw_getFontResolution_basic.phpt
-+++ b/tests/266_ImagickDraw_getFontResolution_basic.phpt
-@@ -8,13 +8,15 @@ checkClassMethods('ImagickDraw', array('getFontResolution', 'setFontResolution')
- --FILE--
- <?php
-
-+require_once(dirname(__FILE__) . '/functions.inc');
-+
- $backgroundColor = 'rgb(225, 225, 225)';
- $strokeColor = 'rgb(0, 0, 0)';
- $fillColor = 'DodgerBlue2';
-
-
--
- $draw = new \ImagickDraw();
-+setFontForImagickDraw($draw);
-
- $draw->setStrokeColor($strokeColor);
- $draw->setFillColor($fillColor);
-diff --git a/tests/274_imagick_setImageAlpha.phpt b/tests/274_imagick_setImageAlpha.phpt
-index 28f1ef1..760f088 100644
---- a/tests/274_imagick_setImageAlpha.phpt
-+++ b/tests/274_imagick_setImageAlpha.phpt
-@@ -8,6 +8,10 @@ require_once(dirname(__FILE__) . '/skipif.inc');
- --FILE--
- <?php
-
-+require_once __DIR__ . "/../util/functions.php";
-+
-+
-+
- $imagick = new Imagick();
- $imagick->newPseudoImage(256, 256, 'xc:purple');
- $imagick->setImageAlpha(0.5);
-@@ -18,19 +22,47 @@ $imagick->writeImage("./setAlphaTest.png");
- $pixelTypes = array(
- Imagick::PIXEL_CHAR => array(128, 0, 128, 128),
- Imagick::PIXEL_FLOAT => array(0.50196081399918, 0, 0.50196081399918, 0.5),
-- Imagick::PIXEL_DOUBLE => array(0.50196078431373, 0, 0.50196078431373, 0.5),
-+ Imagick::PIXEL_DOUBLE => array(0.50196078431373, 0, 0.50196078431373, 0.5),
- Imagick::PIXEL_SHORT => array(32896, 0, 32896, 32768),
- );
-
-+function getColorError($type, $expected, $actual) {
-+
-+ if ($type == Imagick::PIXEL_CHAR ||
-+ $type == Imagick::PIXEL_SHORT) {
-+ $string = "Expected: " . $actual . "\n";
-+ $string .= "Actual : " . $actual . "\n";
-+
-+ return $string;
-+ }
-+
-+ if ($type == Imagick::PIXEL_FLOAT) {
-+ return float_compare_32($expected, $actual);
-+ }
-+
-+ if ($type == Imagick::PIXEL_DOUBLE) {
-+ return float_compare($expected, $actual);
-+ }
-+
-+ echo "Unknown type: $type \n";
-+ exit(-1);
-+
-+}
-+
-
- foreach ($pixelTypes as $pixelType => $expectedValues) {
- $pixels = $imagick->exportImagePixels(0, 0, 1, 1, "RGBA", $pixelType);
-- for ($i=0; $i<4; $i++) {
-- $actual = $pixels[$i];
-- $expected = $expectedValues[$i];
-+ $channelNames = ['R', 'G', 'B', 'A'];
-+
-+ // Loop over the colours
-+ for ($channel=0; $channel<4; $channel++) {
-+ $actual = $pixels[$channel];
-+ $expected = $expectedValues[$channel];
- if (abs($actual - $expected) > 0.0000001) {
-- echo "Pixel values appear incorrect for pixelType $pixelType:";
-- var_dump($pixels);
-+ $channelName = $channelNames[$channel];
-+
-+ echo "Pixel values appear incorrect for pixelType $pixelType channel:$channelName\n";
-+ echo getColorError($pixelType, $expected, $actual);
- break;
- }
- }
-diff --git a/tests/279_ImagickDraw_setTextInterlineSpacing.phpt b/tests/279_ImagickDraw_setTextInterlineSpacing.phpt
-index 27250e3..c7e6462 100644
---- a/tests/279_ImagickDraw_setTextInterlineSpacing.phpt
-+++ b/tests/279_ImagickDraw_setTextInterlineSpacing.phpt
-@@ -23,6 +23,8 @@ foreach ($interlineSpacings as $interlineSpacing) {
-
- $draw = new \ImagickDraw();
-
-+ setFontForImagickDraw($draw);
-+
- $draw->setStrokeColor($strokeColor);
- $draw->setFillColor($fillColor);
-
-diff --git a/tests/281_ini_settings_default.phpt b/tests/281_ini_settings_default.phpt
-new file mode 100644
-index 0000000..e397e98
---- /dev/null
-+++ b/tests/281_ini_settings_default.phpt
-@@ -0,0 +1,29 @@
-+--TEST--
-+OpenMP segfault hacks
-+--SKIPIF--
-+<?php
-+
-+
-+require_once(dirname(__FILE__) . '/skipif.inc');
-+
-+?>
-+--FILE--
-+<?php
-+
-+
-+$sleepCount = ini_get('imagick.shutdown_sleep_count');
-+$setSingleThread = ini_get('imagick.set_single_thread');
-+
-+if ($sleepCount != 10) {
-+ echo "imagick.shutdown_sleep_count is not set to 10 but instead " . var_export($sleepCount, true) ."\n";
-+}
-+
-+if ($setSingleThread != 0) {
-+ echo "imagick.set_single_thread setting is not false but instead " . var_export($setSingleThread, true) ."\n";
-+}
-+
-+
-+echo "Complete".PHP_EOL;
-+?>
-+--EXPECTF--
-+Complete
-diff --git a/tests/282_ini_settings_set_falsy_string.phpt b/tests/282_ini_settings_set_falsy_string.phpt
-new file mode 100644
-index 0000000..4ed4f1d
---- /dev/null
-+++ b/tests/282_ini_settings_set_falsy_string.phpt
-@@ -0,0 +1,41 @@
-+--TEST--
-+OpenMP segfault hacks
-+
-+--INI--
-+imagick.shutdown_sleep_count=Off
-+imagick.set_single_thread=0
-+--SKIPIF--
-+<?php
-+
-+
-+require_once(dirname(__FILE__) . '/skipif.inc');
-+
-+?>
-+--FILE--
-+<?php
-+
-+
-+// So, this can't be tested for properly. ini values are stored as strings internally
-+// to PHP, and are not normalised to the actual type used by an extension. Which means
-+// you can't easily get the actual value being used by an extension, when the input
-+// type isn't the same type as the extension is going to use it as.
-+// aka 'Off' is stored as '' not 0.
-+//
-+//$sleepCount = ini_get('imagick.shutdown_sleep_count');
-+//if ($sleepCount !== 0) {
-+// echo "imagick.shutdown_sleep_count is not set to 0 but instead " . var_export($sleepCount, true) ."\n";
-+//}
-+
-+$setSingleThread = ini_get('imagick.set_single_thread');
-+
-+// This should be a strict compare but can't be because
-+// it's stored as a string...
-+if ($setSingleThread != 0) {
-+ echo "imagick.set_single_thread setting is not 0 but instead " . var_export($setSingleThread, true) ."\n";
-+}
-+
-+
-+echo "Complete".PHP_EOL;
-+?>
-+--EXPECTF--
-+Complete
-diff --git a/tests/283_ini_settings_set_falsy_zero.phpt b/tests/283_ini_settings_set_falsy_zero.phpt
-new file mode 100644
-index 0000000..8e41a35
---- /dev/null
-+++ b/tests/283_ini_settings_set_falsy_zero.phpt
-@@ -0,0 +1,33 @@
-+--TEST--
-+OpenMP segfault hacks
-+
-+--INI--
-+imagick.shutdown_sleep_count=0
-+imagick.set_single_thread=0
-+--SKIPIF--
-+<?php
-+
-+
-+require_once(dirname(__FILE__) . '/skipif.inc');
-+
-+?>
-+--FILE--
-+<?php
-+
-+
-+$sleepCount = ini_get('imagick.shutdown_sleep_count');
-+$setSingleThread = ini_get('imagick.set_single_thread');
-+
-+if ($sleepCount != 0) {
-+ echo "imagick.shutdown_sleep_count is not set to 10 but instead " . var_export($sleepCount, true) ."\n";
-+}
-+
-+if ($setSingleThread != 0) {
-+ echo "imagick.set_single_thread setting is not false but instead " . var_export($sleepCount, true) ."\n";
-+}
-+
-+
-+echo "Complete".PHP_EOL;
-+?>
-+--EXPECTF--
-+Complete
-diff --git a/tests/284_ini_settings_set_truthy_number.phpt b/tests/284_ini_settings_set_truthy_number.phpt
-new file mode 100644
-index 0000000..fc0a0bb
---- /dev/null
-+++ b/tests/284_ini_settings_set_truthy_number.phpt
-@@ -0,0 +1,33 @@
-+--TEST--
-+OpenMP segfault hacks
-+
-+--INI--
-+imagick.shutdown_sleep_count=20
-+imagick.set_single_thread=1
-+--SKIPIF--
-+<?php
-+
-+
-+require_once(dirname(__FILE__) . '/skipif.inc');
-+
-+?>
-+--FILE--
-+<?php
-+
-+
-+$sleepCount = intval(ini_get('imagick.shutdown_sleep_count'));
-+$setSingleThread = ini_get('imagick.set_single_thread');
-+
-+if ($sleepCount != 20) {
-+ echo "imagick.shutdown_sleep_count is not set to 10 but instead " . var_export($sleepCount, true) ."\n";
-+}
-+
-+if ($setSingleThread != 1) {
-+ echo "imagick.set_single_thread setting is not true but instead " . var_export($setSingleThread, true) ."\n";
-+}
-+
-+
-+echo "Complete".PHP_EOL;
-+?>
-+--EXPECTF--
-+Complete
-diff --git a/tests/285_ini_settings_set_truthy_string.phpt b/tests/285_ini_settings_set_truthy_string.phpt
-new file mode 100644
-index 0000000..c35a213
---- /dev/null
-+++ b/tests/285_ini_settings_set_truthy_string.phpt
-@@ -0,0 +1,33 @@
-+--TEST--
-+OpenMP segfault hacks
-+
-+--INI--
-+imagick.shutdown_sleep_count=On
-+imagick.set_single_thread=On
-+--SKIPIF--
-+<?php
-+
-+
-+require_once(dirname(__FILE__) . '/skipif.inc');
-+
-+?>
-+--FILE--
-+<?php
-+
-+
-+$sleepCount = intval(ini_get('imagick.shutdown_sleep_count'));
-+$setSingleThread = ini_get('imagick.set_single_thread');
-+
-+if ($sleepCount != 1) {
-+ echo "imagick.shutdown_sleep_count is not set to 1 but instead " . var_export($sleepCount, true) ."\n";
-+}
-+
-+if ($setSingleThread != 1) {
-+ echo "imagick.set_single_thread setting is not true but instead " . var_export($setSingleThread, true) ."\n";
-+}
-+
-+
-+echo "Complete".PHP_EOL;
-+?>
-+--EXPECTF--
-+Complete
-diff --git a/tests/bug20636.phpt b/tests/bug20636.phpt
-index adba98a..eb64b39 100644
---- a/tests/bug20636.phpt
-+++ b/tests/bug20636.phpt
-@@ -27,5 +27,5 @@ try {
-
- ?>
- --EXPECTF--
--Deprecated: Function Imagick::roundcorners() is deprecated in %s
-+Deprecated: %s Imagick::roundcorners() is deprecated in %s
- success
-diff --git a/tests/functions.inc b/tests/functions.inc
-index f5c1ef1..5fa3d2f 100644
---- a/tests/functions.inc
-+++ b/tests/functions.inc
-@@ -61,5 +61,52 @@ function isVersionGreaterEqual($testIm6Version, $im7Version)
- return false;
- }
-
-+/**
-+ * On some systems, where the standard fonts aren't available, trying
-+ * to draw any text fails as the ImageMagick default font is null.
-+ *
-+ * This function just find a 'sensible' font to use, either from the
-+ * preferred list, or just the first one from queryFonts(). That 'probably'
-+ * is the right thing to do, as it makes the tests more stable.
-+ */
-+function findDefaultFont()
-+{
-+ $knownFonts = [
-+ 'Courier',
-+ 'Helvetica',
-+ 'Times-Roman',
-+ 'Liberation-Mono',
-+ 'Utopia',
-+ ];
-+
-+ $fontList = \Imagick::queryFonts();
-+
-+ foreach ($knownFonts as $knownFont) {
-+
-+ if (in_array($knownFont, $fontList, true) === true) {
-+ return $knownFont;
-+ }
-+ }
-+
-+ if (count($fontList) !== 0) {
-+ return $fontList[0];
-+ }
-
-+ throw new \Exception("No fonts available on system, apparently.");
-+}
-
-+// Find and set a font for the Imagick object
-+function setFontForImagick(\Imagick $imagick)
-+{
-+ $font = findDefaultFont();
-+
-+ $imagick->setFont($font);
-+}
-+
-+// Find and set a font for the ImagickDraw object
-+function setFontForImagickDraw(\ImagickDraw $imagickDraw)
-+{
-+ $font = findDefaultFont();
-+
-+ $imagickDraw->setFont($font);
-+}
diff --git a/imagick-php81.patch b/imagick-php81.patch
deleted file mode 100644
index 8a799fe..0000000
--- a/imagick-php81.patch
+++ /dev/null
@@ -1,287 +0,0 @@
-From 81cc92ec24549c86be875b1a9977419a76f3471d Mon Sep 17 00:00:00 2001
-From: Danack <Danack@basereality.com>
-Date: Sat, 5 Jun 2021 15:25:05 +0100
-Subject: [PATCH] Add ifdef for PHP 8.1
-
----
- imagick.c | 2 +-
- php_imagick_defs.h | 5 +++++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/imagick.c b/imagick.c
-index f7a94ae0..d2cf9fef 100644
---- a/imagick.c
-+++ b/imagick.c
-@@ -3829,7 +3829,7 @@ PHP_MINIT_FUNCTION(imagick)
- #endif
-
- php_imagick_sc_entry = zend_register_internal_class(&ce TSRMLS_CC);
-- zend_class_implements(php_imagick_sc_entry TSRMLS_CC, 2, zend_ce_iterator, spl_ce_Countable);
-+ zend_class_implements(php_imagick_sc_entry TSRMLS_CC, 2, zend_ce_iterator, im_ce_countable);
-
- /*
- Initialize the class (ImagickDraw)
-diff --git a/php_imagick_defs.h b/php_imagick_defs.h
-index 859f35df..6017b33c 100644
---- a/php_imagick_defs.h
-+++ b/php_imagick_defs.h
-@@ -79,6 +79,11 @@
- #define im_long long
- #endif
-
-+#if PHP_VERSION_ID >= 80100
-+ #define im_ce_countable zend_ce_countable
-+#else
-+ #define im_ce_countable spl_ce_Countable
-+#endif
-
- typedef struct _php_imagick_callback {
- void ***thread_ctx;
-From 9a48afcca65beed794dee3da15eef9c077eba487 Mon Sep 17 00:00:00 2001
-From: Danack <Danack@basereality.com>
-Date: Sat, 5 Jun 2021 15:43:03 +0100
-Subject: [PATCH] Explicit casts to make php 8.1 happy.
-
----
- tests/244_Tutorial_psychedelicFontGif_basic.phpt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/244_Tutorial_psychedelicFontGif_basic.phpt b/tests/244_Tutorial_psychedelicFontGif_basic.phpt
-index 3fde1d74..a1bd1d98 100644
---- a/tests/244_Tutorial_psychedelicFontGif_basic.phpt
-+++ b/tests/244_Tutorial_psychedelicFontGif_basic.phpt
-@@ -34,7 +34,7 @@ function psychedelicFontGif($name = 'Danack') {
- $draw->setStrokeColor($color);
- $draw->setFillColor($color);
- $draw->setStrokeWidth($strokeWidth * 3 * $scale);
-- $draw->annotation(60 * $scale, 165 * $scale, $name);
-+ $draw->annotation((int)(60 * $scale), (int)(165 * $scale), $name);
- }
-
- $draw->setStrokeColor('none');
-@@ -44,7 +44,7 @@ function psychedelicFontGif($name = 'Danack') {
-
- //Create an image object which the draw commands can be rendered into
- $imagick = new \Imagick();
-- $imagick->newImage(650 * $scale, 230 * $scale, "#eee");
-+ $imagick->newImage((int)(650 * $scale), (int)(230 * $scale), "#eee");
- $imagick->setImageFormat("png");
-
- //Render the draw commands in the ImagickDraw object
-From a6ff2498e3f4cd1f9a200d5695dfddba458a9064 Mon Sep 17 00:00:00 2001
-From: Danack <Danack@basereality.com>
-Date: Sat, 5 Jun 2021 15:44:17 +0100
-Subject: [PATCH] Explicit casts to make php 8.1 happy.
-
----
- tests/245_Tutorial_screenEmbed_basic.phpt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/245_Tutorial_screenEmbed_basic.phpt b/tests/245_Tutorial_screenEmbed_basic.phpt
-index e25229da..36b9fbcf 100644
---- a/tests/245_Tutorial_screenEmbed_basic.phpt
-+++ b/tests/245_Tutorial_screenEmbed_basic.phpt
-@@ -33,7 +33,7 @@ function screenEmbed() {
- $overlay->modulateImage(97, 100, 0);
- $overlay->distortImage(\Imagick::DISTORTION_PERSPECTIVE, $points, true);
-
-- $imagick->compositeImage($overlay, \Imagick::COMPOSITE_OVER, 364.5 - $offset, 23.5);
-+ $imagick->compositeImage($overlay, \Imagick::COMPOSITE_OVER, (int)(364.5 - $offset), 23);
-
- $bytes = $imagick->getImageBlob();
- if (strlen($bytes) <= 0) { echo "Failed to generate image.";}
-From 8d550128a271b2d6659e81b023e25b2ed0b787fa Mon Sep 17 00:00:00 2001
-From: Danack <Danack@basereality.com>
-Date: Sat, 5 Jun 2021 15:46:21 +0100
-Subject: [PATCH] Explicit casts to make php 8.1 happy.
-
----
- tests/049_Imagick_deskewImage_basic.phpt | 7 ++++++-
- tests/110_Imagick_resizeImage_basic.phpt | 4 ++--
- 2 files changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/tests/049_Imagick_deskewImage_basic.phpt b/tests/049_Imagick_deskewImage_basic.phpt
-index 96364c2b..0ec546f2 100644
---- a/tests/049_Imagick_deskewImage_basic.phpt
-+++ b/tests/049_Imagick_deskewImage_basic.phpt
-@@ -26,7 +26,12 @@ function deskewImage($threshold) {
- $deskewImagick->cropImage($deskewImagick->getImageWidth() - $trim, $deskewImagick->getImageHeight(), $trim, 0);
- $imagick->cropImage($imagick->getImageWidth() - $trim, $imagick->getImageHeight(), $trim, 0);
- $deskewImagick->resizeimage($deskewImagick->getImageWidth() / 2, $deskewImagick->getImageHeight() / 2, \Imagick::FILTER_LANCZOS, 1);
-- $imagick->resizeimage($imagick->getImageWidth() / 2, $imagick->getImageHeight() / 2, \Imagick::FILTER_LANCZOS, 1);
-+ $imagick->resizeimage(
-+ (int)($imagick->getImageWidth() / 2),
-+ (int)($imagick->getImageHeight() / 2),
-+ \Imagick::FILTER_LANCZOS,
-+ 1
-+ );
- $newCanvas = new \Imagick();
- $newCanvas->newimage($imagick->getImageWidth() + $deskewImagick->getImageWidth() + 20, $imagick->getImageHeight(), 'red', 'jpg');
- $newCanvas->compositeimage($imagick, \Imagick::COMPOSITE_COPY, 5, 0);
-diff --git a/tests/110_Imagick_resizeImage_basic.phpt b/tests/110_Imagick_resizeImage_basic.phpt
-index c800e5fa..0628afb4 100644
---- a/tests/110_Imagick_resizeImage_basic.phpt
-+++ b/tests/110_Imagick_resizeImage_basic.phpt
-@@ -32,8 +32,8 @@ function resizeImage($width, $height, $filterType, $blur, $bestFit, $cropZoom) {
- $imagick->cropimage(
- $newWidth,
- $newHeight,
-- ($cropWidth - $newWidth) / 2,
-- ($cropHeight - $newHeight) / 2
-+ (int)(($cropWidth - $newWidth) / 2),
-+ (int)(($cropHeight - $newHeight) / 2)
- );
-
- $imagick->scaleimage(
-From c7578c71285fb11d129abb7b9781c91db91f93da Mon Sep 17 00:00:00 2001
-From: Danack <Danack@basereality.com>
-Date: Sat, 5 Jun 2021 19:23:29 +0100
-Subject: [PATCH] Fix parsing of nullable long parameters.
-
----
- imagick_class.c | 15 +++++++++++++--
- runTests.sh | 7 +++++--
- 2 files changed, 18 insertions(+), 4 deletions(-)
-
-diff --git a/imagick_class.c b/imagick_class.c
-index 23e42de0..9a390f2b 100644
---- a/imagick_class.c
-+++ b/imagick_class.c
-@@ -7855,13 +7855,24 @@ zend_bool s_resize_bounding_box(MagickWand *magick_wand, im_long box_width, im_l
- */
- PHP_METHOD(imagick, thumbnailimage)
- {
-- im_long width, height, new_width, new_height;
-+ im_long width = 0, height = 0, new_width, new_height;
- php_imagick_object *intern;
- zend_bool bestfit = 0, fill = 0;
- zend_bool legacy = 0;
-
-+ // Changing longs to be nullable "l!", means that zpp
-+ // wants to write whether they were null to a variable.
-+ bool width_is_null = 1;
-+ bool height_is_null = 1;
-+
-+
- /* Parse parameters given to function */
-- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ll|bbb", &width, &height, &bestfit, &fill, &legacy) == FAILURE) {
-+ if (zend_parse_parameters(
-+ ZEND_NUM_ARGS() TSRMLS_CC,
-+ "l!l!|bbb",
-+ &width, &width_is_null,
-+ &height, &height_is_null,
-+ &bestfit, &fill, &legacy) == FAILURE) {
- return;
- }
-
-
-From 212de567ef514e2a07f0c55502fe7ceb66ece6a7 Mon Sep 17 00:00:00 2001
-From: Danack <Danack@basereality.com>
-Date: Sat, 5 Jun 2021 19:46:41 +0100
-Subject: [PATCH] Wrap param parsing to use old method, until versions that
- don't require a compiler that understands bools are dropped.
-
----
- imagick_class.c | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/imagick_class.c b/imagick_class.c
-index 9a390f2b..2f9e6909 100644
---- a/imagick_class.c
-+++ b/imagick_class.c
-@@ -7860,11 +7860,16 @@ PHP_METHOD(Imagick, thumbnailImage)
- zend_bool bestfit = 0, fill = 0;
- zend_bool legacy = 0;
-
-+#if PHP_VERSION_ID < 80100
-+ // This uses an implicit conversion of null to 0 for longs
-+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ll|bbb", &width, &height, &bestfit, &fill, &legacy) == FAILURE) {
-+ return;
-+ }
-+#else
- // Changing longs to be nullable "l!", means that zpp
- // wants to write whether they were null to a variable.
-- bool width_is_null = 1;
-- bool height_is_null = 1;
--
-+ bool width_is_null = 0;
-+ bool height_is_null = 0;
-
- /* Parse parameters given to function */
- if (zend_parse_parameters(
-@@ -7875,6 +7880,7 @@ PHP_METHOD(Imagick, thumbnailImage)
- &bestfit, &fill, &legacy) == FAILURE) {
- return;
- }
-+#endif
-
- intern = Z_IMAGICK_P(getThis());
- if (php_imagick_ensure_not_empty (intern->magick_wand) == 0)
-From 78c9daa8bfc56aa5806b062ee5605f57e81f063e Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Wed, 9 Jun 2021 09:39:25 +0200
-Subject: [PATCH 1/2] get rid of ZVAL_NEW_ARR
-
----
- imagick_class.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/imagick_class.c b/imagick_class.c
-index e041f4e..2254313 100644
---- a/imagick_class.c
-+++ b/imagick_class.c
-@@ -6841,7 +6841,6 @@ PHP_METHOD(Imagick, getImageChannelStatistics)
- #if MagickLibVersion >= 0x700
- for (i=0; i < sizeof(channels)/sizeof(channels[0]); i++) {
- #ifdef ZEND_ENGINE_3
-- ZVAL_NEW_ARR(&tmp);
- array_init(&tmp);
- add_assoc_double(&tmp, "mean", statistics[i].mean);
- add_assoc_double(&tmp, "minima", statistics[i].minima);
-@@ -6869,7 +6868,6 @@ PHP_METHOD(Imagick, getImageChannelStatistics)
- #else //below MagickLibVersion>= 0x700
- for (i = 0; i < elements ; i++) {
- #ifdef ZEND_ENGINE_3
-- ZVAL_NEW_ARR(&tmp);
- array_init(&tmp);
- add_assoc_double(&tmp, "mean", statistics[channels[i]].mean);
- add_assoc_double(&tmp, "minima", statistics[channels[i]].minima);
-@@ -8703,7 +8701,7 @@ PHP_METHOD(Imagick, identifyImage)
- // Geometry is an associative array
-
- #ifdef ZEND_ENGINE_3
-- ZVAL_NEW_ARR(&array);
-+ array_init(&array);
- pArray = &array;
- #else
- MAKE_STD_ZVAL(array);
-
-From 3c387a2b1a0b3a9cc08f878a2541b814f3b831bf Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Wed, 9 Jun 2021 09:40:16 +0200
-Subject: [PATCH 2/2] fix Implicit conversion
-
----
- tests/172_ImagickPixel_setColorValueQuantum_basic.phpt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/172_ImagickPixel_setColorValueQuantum_basic.phpt b/tests/172_ImagickPixel_setColorValueQuantum_basic.phpt
-index e69108e..bf68edf 100644
---- a/tests/172_ImagickPixel_setColorValueQuantum_basic.phpt
-+++ b/tests/172_ImagickPixel_setColorValueQuantum_basic.phpt
-@@ -13,7 +13,7 @@ function setColorValueQuantum() {
-
- $draw = new \ImagickDraw();
- $color = new \ImagickPixel('blue');
-- $color->setcolorValueQuantum(\Imagick::COLOR_RED, 128 * $quantumRange['quantumRangeLong'] / 256);
-+ $color->setcolorValueQuantum(\Imagick::COLOR_RED, (int)(128 * $quantumRange['quantumRangeLong'] / 256));
-
- $draw->setstrokewidth(1.0);
- $draw->setStrokeColor($color);
-@@ -33,4 +33,4 @@ setColorValueQuantum() ;
- echo "Ok";
- ?>
- --EXPECTF--
--Ok
-\ No newline at end of file
-+Ok
diff --git a/php-pecl-imagick.spec b/php-pecl-imagick.spec
index 2399ecf..f4eed8a 100644
--- a/php-pecl-imagick.spec
+++ b/php-pecl-imagick.spec
@@ -29,8 +29,8 @@
%else
%global ini_name 40-%{pecl_name}.ini
%endif
-%global upstream_version 3.4.4
-#global upstream_prever RC2
+%global upstream_version 3.5.0
+%global upstream_prever RC1
Summary: Extension to create and modify images using ImageMagick
Name: %{?sub_prefix}php-pecl-imagick
@@ -39,19 +39,14 @@ Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
Release: 0.9.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz
%else
-Release: 18%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
%endif
License: PHP
URL: https://pecl.php.net/package/imagick
-Patch0: %{pecl_name}-php8.patch
-Patch1: https://patch-diff.githubusercontent.com/raw/Imagick/imagick/pull/346.patch
-Patch2: https://patch-diff.githubusercontent.com/raw/Imagick/imagick/pull/347.patch
-Patch3: https://patch-diff.githubusercontent.com/raw/Imagick/imagick/pull/348.patch
-Patch4: https://patch-diff.githubusercontent.com/raw/Imagick/imagick/pull/350.patch
-Patch5: https://patch-diff.githubusercontent.com/raw/Imagick/imagick/pull/375.patch
-Patch6: %{pecl_name}-php81.patch
+# From https://github.com/Imagick/imagick/pull/421
+Patch0: %{pecl_name}-arginfo.patch
BuildRequires: make
BuildRequires: %{?dtsprefix}gcc
@@ -170,13 +165,7 @@ then : "Font files detected!"
fi
cd NTS
-%patch0 -p1 -b .up
-%patch1 -p1 -b .pr346
-%patch2 -p1 -b .pr347
-%patch3 -p1 -b .pr348
-%patch4 -p1 -b .pr350
-%patch5 -p1 -b .pr375
-%patch6 -p1 -b .php81
+%patch0 -p1 -b .pr421
extver=$(sed -n '/#define PHP_IMAGICK_VERSION/{s/.* "//;s/".*$//;p}' php_imagick.h)
if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
@@ -203,6 +192,9 @@ imagick.skip_version_check=1
; multi-thread management
;imagick.set_single_thread => 1 => 1
;imagick.shutdown_sleep_count => 10 => 10
+
+; to allow null images
+;imagick.allow_zero_dimension_images => 0 => 0
EOF
%if %{with_zts}
@@ -331,6 +323,12 @@ cd ../ZTS
%changelog
+* Tue Jun 15 2021 Remi Collet <remi@remirepo.net> - 3.5.0~RC1-1
+- update to 3.5.0RC1
+- drop all patches, all merged upstream
+- add patch to fix some methods reflection from
+ https://github.com/Imagick/imagick/pull/421
+
* Wed Jun 9 2021 Remi Collet <remi@remirepo.net> - 3.4.4-18
- add patches for PHP 8.1 from upstream and from
https://github.com/Imagick/imagick/pull/413
generated by cgit (git 2.34.1) at 2024-11-22 22:54:01 +0000