From 562f84b239bcc69367b43c9ac9c1d7767bc92fa3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 15 Jun 2021 09:20:41 +0200 Subject: 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 --- 346.patch | 45 -- 347.patch | 36 - 348.patch | 47 -- 350.patch | 29 - 375.patch | 112 --- PHPINFO | 9 +- REFLECTION | 1794 +++++++++++++++++++++++++------------------------ imagick-arginfo.patch | 385 +++++++++++ imagick-php8.patch | 1309 ------------------------------------ imagick-php81.patch | 287 -------- php-pecl-imagick.spec | 32 +- 11 files changed, 1310 insertions(+), 2775 deletions(-) delete mode 100644 346.patch delete mode 100644 347.patch delete mode 100644 348.patch delete mode 100644 350.patch delete mode 100644 375.patch create mode 100644 imagick-arginfo.patch delete mode 100644 imagick-php8.patch delete mode 100644 imagick-php81.patch 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 -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 -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 -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 -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 -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 -+#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 -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_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 -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 [ extension #77 imagick version 3.4.4 ] { +Extension [ extension #75 imagick version 3.5.0RC1 ] { - Dependencies { Dependency [ gmagick (Conflicts) ] @@ -22,6 +22,9 @@ Extension [ extension #77 imagick version 3.4.4 ] { Entry [ imagick.shutdown_sleep_count ] Current = '10' } + Entry [ imagick.allow_zero_dimension_images ] + Current = '0' + } } - Classes [10] { @@ -312,7 +315,7 @@ Extension [ extension #77 imagick version 3.4.4 ] { Class [ 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 [ 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 [ 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 [ 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 [ extension #77 imagick version 3.4.4 ] { } - Static methods [20] { - Method [ static public method queryformats ] { + Method [ static public method queryFormats ] { - Parameters [1] { - Parameter #0 [ $pattern ] + Parameter #0 [ $pattern ] } } - Method [ static public method queryfonts ] { + Method [ static public method queryFonts ] { - Parameters [1] { - Parameter #0 [ $pattern ] + Parameter #0 [ $pattern ] } } - Method [ static public method calculatecrop ] { + Method [ static public method calculateCrop ] { - Parameters [5] { - Parameter #0 [ $orig_width ] - Parameter #1 [ $orig_height ] + Parameter #0 [ $original_width ] + Parameter #1 [ $original_height ] Parameter #2 [ $desired_width ] Parameter #3 [ $desired_height ] Parameter #4 [ $legacy ] } } - Method [ static public method getcopyright ] { + Method [ static public method getCopyright ] { - Parameters [0] { } } - Method [ static public method getconfigureoptions ] { + Method [ static public method getConfigureOptions ] { - Parameters [1] { Parameter #0 [ $pattern ] } } - Method [ static public method getfeatures ] { + Method [ static public method getFeatures ] { - Parameters [0] { } } - Method [ static public method gethomeurl ] { + Method [ static public method getHomeURL ] { - Parameters [0] { } } - Method [ static public method getpackagename ] { + Method [ static public method getPackageName ] { - Parameters [0] { } } - Method [ static public method getquantum ] { + Method [ static public method getQuantum ] { - Parameters [0] { } } - Method [ static public method gethdrienabled ] { + Method [ static public method getHdriEnabled ] { - Parameters [0] { } } - Method [ static public method getquantumdepth ] { + Method [ static public method getQuantumDepth ] { - Parameters [0] { } } - Method [ static public method getquantumrange ] { + Method [ static public method getQuantumRange ] { - Parameters [0] { } } - Method [ static public method getreleasedate ] { + Method [ static public method getReleaseDate ] { - Parameters [0] { } } - Method [ static public method getresource ] { + Method [ static public method getResource ] { - Parameters [1] { - Parameter #0 [ $resource_type ] + Parameter #0 [ $type ] } } - Method [ static public method getresourcelimit ] { + Method [ static public method getResourceLimit ] { - Parameters [1] { - Parameter #0 [ $resource_type ] + Parameter #0 [ $type ] } } - Method [ static public method getversion ] { + Method [ static public method getVersion ] { - Parameters [0] { } } - Method [ static public method setresourcelimit ] { + Method [ static public method setResourceLimit ] { - Parameters [2] { - Parameter #0 [ $RESOURCETYPE ] + Parameter #0 [ $type ] Parameter #1 [ $limit ] } } - Method [ static public method setregistry ] { + Method [ static public method setRegistry ] { - Parameters [2] { Parameter #0 [ $key ] @@ -1015,14 +1027,14 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ static public method getregistry ] { + Method [ static public method getRegistry ] { - Parameters [1] { Parameter #0 [ $key ] } } - Method [ static public method listregistry ] { + Method [ static public method listRegistry ] { - Parameters [0] { } @@ -1032,91 +1044,92 @@ Extension [ extension #77 imagick version 3.4.4 ] { - Properties [0] { } - - Methods [352] { - Method [ public method optimizeimagelayers ] { + - Methods [353] { + Method [ public method optimizeImageLayers ] { - Parameters [0] { } } - Method [ public method compareimagelayers ] { + Method [ public method compareImageLayers ] { - Parameters [1] { - Parameter #0 [ $LAYER ] + Parameter #0 [ $metric ] } } - Method [ public method pingimageblob ] { + Method [ public method pingImageBlob ] { - Parameters [1] { - Parameter #0 [ $imageContents ] + Parameter #0 [ $image ] } } - Method [ public method pingimagefile ] { + Method [ public method pingImageFile ] { - - Parameters [1] { - Parameter #0 [ $fp ] + - Parameters [2] { + Parameter #0 [ $filehandle ] + Parameter #1 [ $filename ] } } - Method [ public method transposeimage ] { + Method [ public method transposeImage ] { - Parameters [0] { } } - Method [ public method transverseimage ] { + Method [ public method transverseImage ] { - Parameters [0] { } } - Method [ public method trimimage ] { + Method [ public method trimImage ] { - Parameters [1] { Parameter #0 [ $fuzz ] } } - Method [ public method waveimage ] { + Method [ public method waveImage ] { - Parameters [2] { Parameter #0 [ $amplitude ] - Parameter #1 [ $waveLenght ] + Parameter #1 [ $length ] } } - Method [ public method vignetteimage ] { + Method [ public method vignetteImage ] { - Parameters [4] { - Parameter #0 [ $blackPoint ] - Parameter #1 [ $whitePoint ] + Parameter #0 [ $black_point ] + Parameter #1 [ $white_point ] Parameter #2 [ $x ] Parameter #3 [ $y ] } } - Method [ public method uniqueimagecolors ] { + Method [ public method uniqueImageColors ] { - Parameters [0] { } } - Method [ public method getimagematte ] { + Method [ public method getImageMatte ] { - Parameters [0] { } } - Method [ public method setimagematte ] { + Method [ public method setImageMatte ] { - Parameters [1] { - Parameter #0 [ $enable ] + Parameter #0 [ $matte ] } } - Method [ public method adaptiveresizeimage ] { + Method [ public method adaptiveResizeImage ] { - Parameters [4] { Parameter #0 [ $columns ] @@ -1126,7 +1139,7 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method sketchimage ] { + Method [ public method sketchImage ] { - Parameters [3] { Parameter #0 [ $radius ] @@ -1135,7 +1148,7 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method shadeimage ] { + Method [ public method shadeImage ] { - Parameters [3] { Parameter #0 [ $gray ] @@ -1144,13 +1157,13 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method getsizeoffset ] { + Method [ public method getSizeOffset ] { - Parameters [0] { } } - Method [ public method setsizeoffset ] { + Method [ public method setSizeOffset ] { - Parameters [3] { Parameter #0 [ $columns ] @@ -1159,78 +1172,78 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method adaptiveblurimage ] { + Method [ public method adaptiveBlurImage ] { - Parameters [3] { Parameter #0 [ $radius ] Parameter #1 [ $sigma ] - Parameter #2 [ $CHANNEL ] + Parameter #2 [ $channel ] } } - Method [ public method contraststretchimage ] { + Method [ public method contrastStretchImage ] { - Parameters [3] { - Parameter #0 [ $blackPoint ] - Parameter #1 [ $whitePoint ] - Parameter #2 [ $CHANNEL ] + Parameter #0 [ $black_point ] + Parameter #1 [ $white_point ] + Parameter #2 [ $channel ] } } - Method [ public method adaptivesharpenimage ] { + Method [ public method adaptiveSharpenImage ] { - Parameters [3] { Parameter #0 [ $radius ] Parameter #1 [ $sigma ] - Parameter #2 [ $CHANNEL ] + Parameter #2 [ $channel ] } } - Method [ public method randomthresholdimage ] { + Method [ public method randomThresholdImage ] { - Parameters [3] { Parameter #0 [ $low ] Parameter #1 [ $high ] - Parameter #2 [ $CHANNELTYPE ] + Parameter #2 [ $channel ] } } - Method [ public method roundcornersimage ] { + Method [ public method roundCornersImage ] { - Parameters [5] { - Parameter #0 [ $xRounding ] - Parameter #1 [ $yRounding ] - Parameter #2 [ $strokeWidth ] + Parameter #0 [ $x_rounding ] + Parameter #1 [ $y_rounding ] + Parameter #2 [ $stroke_width ] Parameter #3 [ $displace ] - Parameter #4 [ $sizeCorrection ] + Parameter #4 [ $size_correction ] } } - Method [ public method roundcorners ] { + Method [ public method roundCorners ] { - Parameters [5] { - Parameter #0 [ $xRounding ] - Parameter #1 [ $yRounding ] - Parameter #2 [ $strokeWidth ] + Parameter #0 [ $x_rounding ] + Parameter #1 [ $y_rounding ] + Parameter #2 [ $stroke_width ] Parameter #3 [ $displace ] - Parameter #4 [ $sizeCorrection ] + Parameter #4 [ $size_correction ] } } - Method [ public method setiteratorindex ] { + Method [ public method setIteratorIndex ] { - Parameters [1] { Parameter #0 [ $index ] } } - Method [ public method getiteratorindex ] { + Method [ public method getIteratorIndex ] { - Parameters [0] { } } - Method [ public method transformimage ] { + Method [ public method transformImage ] { - Parameters [2] { Parameter #0 [ $crop ] @@ -1238,37 +1251,37 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method setimageopacity ] { + Method [ public method setImageOpacity ] { - Parameters [1] { Parameter #0 [ $opacity ] } } - Method [ public method orderedposterizeimage ] { + Method [ public method orderedPosterizeImage ] { - Parameters [2] { Parameter #0 [ $threshold_map ] - Parameter #1 [ $CHANNEL ] + Parameter #1 [ $channel ] } } - Method [ public method polaroidimage ] { + Method [ public method polaroidImage ] { - Parameters [2] { - Parameter #0 [ ImagickDraw $ImagickDraw ] + Parameter #0 [ ImagickDraw $settings ] Parameter #1 [ $angle ] } } - Method [ public method getimageproperty ] { + Method [ public method getImageProperty ] { - Parameters [1] { Parameter #0 [ $name ] } } - Method [ public method setimageproperty ] { + Method [ public method setImageProperty ] { - Parameters [2] { Parameter #0 [ $name ] @@ -1276,48 +1289,48 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method deleteimageproperty ] { + Method [ public method deleteImageProperty ] { - Parameters [1] { Parameter #0 [ $name ] } } - Method [ public method identifyformat ] { + Method [ public method identifyFormat ] { - Parameters [1] { - Parameter #0 [ $embedText ] + Parameter #0 [ $format ] } } - Method [ public method setimageinterpolatemethod ] { + Method [ public method setImageInterpolateMethod ] { - Parameters [1] { - Parameter #0 [ $INTERPOLATE ] + Parameter #0 [ $method ] } } - Method [ public method getimageinterpolatemethod ] { + Method [ public method getImageInterpolateMethod ] { - Parameters [0] { } } - Method [ public method linearstretchimage ] { + Method [ public method linearStretchImage ] { - Parameters [2] { - Parameter #0 [ $blackPoint ] - Parameter #1 [ $whitePoint ] + Parameter #0 [ $black_point ] + Parameter #1 [ $white_point ] } } - Method [ public method getimagelength ] { + Method [ public method getImageLength ] { - Parameters [0] { } } - Method [ public method extentimage ] { + Method [ public method extentImage ] { - Parameters [4] { Parameter #0 [ $width ] @@ -1327,261 +1340,261 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method getimageorientation ] { + Method [ public method getImageOrientation ] { - Parameters [0] { } } - Method [ public method setimageorientation ] { + Method [ public method setImageOrientation ] { - Parameters [1] { - Parameter #0 [ $ORIENTATION ] + Parameter #0 [ $orientation ] } } - Method [ public method paintfloodfillimage ] { + Method [ public method paintFloodfillImage ] { - Parameters [6] { - Parameter #0 [ $CHANNEL ] - Parameter #1 [ $fill ] - Parameter #2 [ $fuzz ] - Parameter #3 [ $bordercolor ] - Parameter #4 [ $x ] - Parameter #5 [ $y ] + Parameter #0 [ $fill_color ] + Parameter #1 [ $fuzz ] + Parameter #2 [ $border_color ] + Parameter #3 [ $x ] + Parameter #4 [ $y ] + Parameter #5 [ $channel ] } } - Method [ public method clutimage ] { + Method [ public method clutImage ] { - Parameters [2] { - Parameter #0 [ Imagick $Imagick ] - Parameter #1 [ $CHANNELTYPE ] + Parameter #0 [ Imagick $lookup_table ] + Parameter #1 [ $channel ] } } - Method [ public method getimageproperties ] { + Method [ public method getImageProperties ] { - Parameters [2] { Parameter #0 [ $pattern ] - Parameter #1 [ $values ] + Parameter #1 [ $include_values ] } } - Method [ public method getimageprofiles ] { + Method [ public method getImageProfiles ] { - Parameters [2] { Parameter #0 [ $pattern ] - Parameter #1 [ $values ] + Parameter #1 [ $include_values ] } } - Method [ public method distortimage ] { + Method [ public method distortImage ] { - Parameters [3] { - Parameter #0 [ $method ] + Parameter #0 [ $distortion ] Parameter #1 [ $arguments ] Parameter #2 [ $bestfit ] } } - Method [ public method writeimagefile ] { + Method [ public method writeImageFile ] { - Parameters [2] { - Parameter #0 [ $handle ] + Parameter #0 [ $filehandle ] Parameter #1 [ $format ] } } - Method [ public method writeimagesfile ] { + Method [ public method writeImagesFile ] { - Parameters [2] { - Parameter #0 [ $handle ] + Parameter #0 [ $filehandle ] Parameter #1 [ $format ] } } - Method [ public method resetimagepage ] { + Method [ public method resetImagePage ] { - Parameters [1] { Parameter #0 [ $page ] } } - Method [ public method setimageclipmask ] { + Method [ public method setImageClipMask ] { - Parameters [1] { - Parameter #0 [ Imagick $Imagick ] + Parameter #0 [ imagick $clip_mask ] } } - Method [ public method getimageclipmask ] { + Method [ public method getImageClipMask ] { - Parameters [0] { } } - Method [ public method animateimages ] { + Method [ public method animateImages ] { - Parameters [1] { - Parameter #0 [ $server_name ] + Parameter #0 [ $x_server ] } } - Method [ public method recolorimage ] { + Method [ public method recolorImage ] { - Parameters [1] { Parameter #0 [ $matrix ] } } - Method [ public method setfont ] { + Method [ public method setFont ] { - Parameters [1] { Parameter #0 [ $font ] } } - Method [ public method getfont ] { + Method [ public method getFont ] { - Parameters [0] { } } - Method [ public method setpointsize ] { + Method [ public method setPointSize ] { - Parameters [1] { - Parameter #0 [ $pointsize ] + Parameter #0 [ $point_size ] } } - Method [ public method getpointsize ] { + Method [ public method getPointSize ] { - Parameters [0] { } } - Method [ public method mergeimagelayers ] { + Method [ public method mergeImageLayers ] { - Parameters [1] { - Parameter #0 [ $LAYERMETHOD ] + Parameter #0 [ $layermethod ] } } - Method [ public method setimagealphachannel ] { + Method [ public method setImageAlphaChannel ] { - Parameters [1] { - Parameter #0 [ $ALPHACHANNELTYPE ] + Parameter #0 [ $alphachannel ] } } - Method [ public method floodfillpaintimage ] { + Method [ public method floodfillPaintImage ] { - Parameters [7] { - Parameter #0 [ $fill ] + Parameter #0 [ $fill_color ] Parameter #1 [ $fuzz ] - Parameter #2 [ $bordercolor ] + Parameter #2 [ $border_color ] Parameter #3 [ $x ] Parameter #4 [ $y ] Parameter #5 [ $invert ] - Parameter #6 [ $CHANNEL ] + Parameter #6 [ $channel ] } } - Method [ public method opaquepaintimage ] { + Method [ public method opaquePaintImage ] { - Parameters [5] { - Parameter #0 [ $target ] - Parameter #1 [ $fill ] + Parameter #0 [ $target_color ] + Parameter #1 [ $fill_color ] Parameter #2 [ $fuzz ] Parameter #3 [ $invert ] - Parameter #4 [ $CHANNEL ] + Parameter #4 [ $channel ] } } - Method [ public method transparentpaintimage ] { + Method [ public method transparentPaintImage ] { - Parameters [4] { - Parameter #0 [ $target ] + Parameter #0 [ $target_color ] Parameter #1 [ $alpha ] Parameter #2 [ $fuzz ] Parameter #3 [ $invert ] } } - Method [ public method liquidrescaleimage ] { + Method [ public method liquidRescaleImage ] { - Parameters [4] { - Parameter #0 [ $columns ] - Parameter #1 [ $rows ] + Parameter #0 [ $width ] + Parameter #1 [ $height ] Parameter #2 [ $delta_x ] Parameter #3 [ $rigidity ] } } - Method [ public method encipherimage ] { + Method [ public method encipherImage ] { - Parameters [1] { Parameter #0 [ $passphrase ] } } - Method [ public method decipherimage ] { + Method [ public method decipherImage ] { - Parameters [1] { Parameter #0 [ $passphrase ] } } - Method [ public method setgravity ] { + Method [ public method setGravity ] { - Parameters [1] { - Parameter #0 [ $GRAVITY ] + Parameter #0 [ $gravity ] } } - Method [ public method getgravity ] { + Method [ public method getGravity ] { - Parameters [0] { } } - Method [ public method getimagechannelrange ] { + Method [ public method getImageChannelRange ] { - Parameters [1] { - Parameter #0 [ $CHANNEL ] + Parameter #0 [ $channel ] } } - Method [ public method getimagealphachannel ] { + Method [ public method getImageAlphaChannel ] { - Parameters [0] { } } - Method [ public method getimagechanneldistortions ] { + Method [ public method getImageChannelDistortions ] { - Parameters [3] { - Parameter #0 [ Imagick $Imagick ] - Parameter #1 [ $METRICTYPE ] - Parameter #2 [ $CHANNEL ] + Parameter #0 [ Imagick $reference_image ] + Parameter #1 [ $metric ] + Parameter #2 [ $channel ] } } - Method [ public method setimagegravity ] { + Method [ public method setImageGravity ] { - Parameters [1] { - Parameter #0 [ $GRAVITY ] + Parameter #0 [ $gravity ] } } - Method [ public method getimagegravity ] { + Method [ public method getImageGravity ] { - Parameters [0] { } } - Method [ public method importimagepixels ] { + Method [ public method importImagePixels ] { - Parameters [7] { Parameter #0 [ $x ] @@ -1589,46 +1602,46 @@ Extension [ extension #77 imagick version 3.4.4 ] { Parameter #2 [ $width ] Parameter #3 [ $height ] Parameter #4 [ $map ] - Parameter #5 [ $storage ] - Parameter #6 [ $PIXEL ] + Parameter #5 [ $pixelstorage ] + Parameter #6 [ $pixels ] } } - Method [ public method deskewimage ] { + Method [ public method deskewImage ] { - Parameters [1] { Parameter #0 [ $threshold ] } } - Method [ public method segmentimage ] { + Method [ public method segmentImage ] { - Parameters [4] { - Parameter #0 [ $COLORSPACE ] + Parameter #0 [ $colorspace ] Parameter #1 [ $cluster_threshold ] Parameter #2 [ $smooth_threshold ] Parameter #3 [ $verbose ] } } - Method [ public method sparsecolorimage ] { + Method [ public method sparseColorImage ] { - Parameters [3] { - Parameter #0 [ $SPARSE_METHOD ] + Parameter #0 [ $sparsecolormethod ] Parameter #1 [ $arguments ] - Parameter #2 [ $CHANNEL ] + Parameter #2 [ $channel ] } } - Method [ public method remapimage ] { + Method [ public method remapImage ] { - Parameters [2] { - Parameter #0 [ Imagick $Imagick ] - Parameter #1 [ $DITHER ] + Parameter #0 [ Imagick $replacement ] + Parameter #1 [ $dither_method ] } } - Method [ public method exportimagepixels ] { + Method [ public method exportImagePixels ] { - Parameters [6] { Parameter #0 [ $x ] @@ -1636,62 +1649,63 @@ Extension [ extension #77 imagick version 3.4.4 ] { Parameter #2 [ $width ] Parameter #3 [ $height ] Parameter #4 [ $map ] - Parameter #5 [ $STORAGE ] + Parameter #5 [ $pixelstorage ] } } - Method [ public method getimagechannelkurtosis ] { + Method [ public method getImageChannelKurtosis ] { - Parameters [1] { - Parameter #0 [ $CHANNEL ] + Parameter #0 [ $channel ] } } - Method [ public method functionimage ] { + Method [ public method functionImage ] { - - Parameters [2] { - Parameter #0 [ $FUNCTION ] - Parameter #1 [ $arguments ] + - Parameters [3] { + Parameter #0 [ $function ] + Parameter #1 [ $parameters ] + Parameter #2 [ $channel ] } } - Method [ public method transformimagecolorspace ] { + Method [ public method transformImageColorspace ] { - Parameters [1] { - Parameter #0 [ $COLORSPACE ] + Parameter #0 [ $colorspace ] } } - Method [ public method haldclutimage ] { + Method [ public method haldClutImage ] { - Parameters [2] { - Parameter #0 [ Imagick $Imagick ] - Parameter #1 [ $CHANNEL ] + Parameter #0 [ Imagick $clut ] + Parameter #1 [ $channel ] } } - Method [ public method autolevelimage ] { + Method [ public method autoLevelImage ] { - Parameters [1] { - Parameter #0 [ $CHANNEL ] + Parameter #0 [ $channel ] } } - Method [ public method blueshiftimage ] { + Method [ public method blueShiftImage ] { - Parameters [1] { Parameter #0 [ $factor ] } } - Method [ public method getimageartifact ] { + Method [ public method getImageArtifact ] { - Parameters [1] { Parameter #0 [ $artifact ] } } - Method [ public method setimageartifact ] { + Method [ public method setImageArtifact ] { - Parameters [2] { Parameter #0 [ $artifact ] @@ -1699,34 +1713,34 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method deleteimageartifact ] { + Method [ public method deleteImageArtifact ] { - Parameters [1] { Parameter #0 [ $artifact ] } } - Method [ public method getcolorspace ] { + Method [ public method getColorspace ] { - Parameters [0] { } } - Method [ public method setcolorspace ] { + Method [ public method setColorspace ] { - Parameters [1] { - Parameter #0 [ $COLORSPACE ] + Parameter #0 [ $colorspace ] } } - Method [ public method clampimage ] { + Method [ public method clampImage ] { - Parameters [1] { - Parameter #0 [ $CHANNEL ] + Parameter #0 [ $channel ] } } - Method [ public method smushimages ] { + Method [ public method smushImages ] { - Parameters [2] { Parameter #0 [ $stack ] @@ -1741,7 +1755,7 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method __tostring ] { + Method [ public method __toString ] { - Parameters [0] { } @@ -1754,70 +1768,69 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method getpixeliterator ] { + Method [ public method getPixelIterator ] { - Parameters [0] { } } - Method [ public method getpixelregioniterator ] { + Method [ public method getPixelRegionIterator ] { - - Parameters [5] { + - Parameters [4] { Parameter #0 [ $x ] Parameter #1 [ $y ] Parameter #2 [ $columns ] Parameter #3 [ $rows ] - Parameter #4 [ $modify ] } } - Method [ public method readimage ] { + Method [ public method readImage ] { - Parameters [1] { Parameter #0 [ $filename ] } } - Method [ public method readimages ] { + Method [ public method readImages ] { - Parameters [1] { Parameter #0 [ $filenames ] } } - Method [ public method readimageblob ] { + Method [ public method readImageBlob ] { - Parameters [2] { - Parameter #0 [ $imageContents ] + Parameter #0 [ $image ] Parameter #1 [ $filename ] } } - Method [ public method setimageformat ] { + Method [ public method setImageFormat ] { - Parameters [1] { - Parameter #0 [ $imageFormat ] + Parameter #0 [ $format ] } } - Method [ public method scaleimage ] { + Method [ public method scaleImage ] { - Parameters [4] { - Parameter #0 [ $width ] - Parameter #1 [ $height ] + Parameter #0 [ $columns ] + Parameter #1 [ $rows ] Parameter #2 [ $bestfit ] Parameter #3 [ $legacy ] } } - Method [ public method writeimage ] { + Method [ public method writeImage ] { - Parameters [1] { Parameter #0 [ $filename ] } } - Method [ public method writeimages ] { + Method [ public method writeImages ] { - Parameters [2] { Parameter #0 [ $filename ] @@ -1825,27 +1838,27 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method blurimage ] { + Method [ public method blurImage ] { - Parameters [3] { Parameter #0 [ $radius ] Parameter #1 [ $sigma ] - Parameter #2 [ $CHANNELTYPE ] + Parameter #2 [ $channel ] } } - Method [ public method thumbnailimage ] { + Method [ public method thumbnailImage ] { - Parameters [5] { - Parameter #0 [ $width ] - Parameter #1 [ $height ] + Parameter #0 [ $columns ] + Parameter #1 [ $rows ] Parameter #2 [ $bestfit ] Parameter #3 [ $fill ] Parameter #4 [ $legacy ] } } - Method [ public method cropthumbnailimage ] { + Method [ public method cropThumbnailImage ] { - Parameters [3] { Parameter #0 [ $width ] @@ -1854,32 +1867,32 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method getimagefilename ] { + Method [ public method getImageFilename ] { - Parameters [0] { } } - Method [ public method setimagefilename ] { + Method [ public method setImageFilename ] { - Parameters [1] { Parameter #0 [ $filename ] } } - Method [ public method getimageformat ] { + Method [ public method getImageFormat ] { - Parameters [0] { } } - Method [ public method getimagemimetype ] { + Method [ public method getImageMimeType ] { - Parameters [0] { } } - Method [ public method removeimage ] { + Method [ public method removeImage ] { - Parameters [0] { } @@ -1903,87 +1916,87 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method getimagesize ] { + Method [ public method getImageSize ] { - Parameters [0] { } } - Method [ public method getimageblob ] { + Method [ public method getImageBlob ] { - Parameters [0] { } } - Method [ public method getimagesblob ] { + Method [ public method getImagesBlob ] { - Parameters [0] { } } - Method [ public method setfirstiterator ] { + Method [ public method setFirstIterator ] { - Parameters [0] { } } - Method [ public method setlastiterator ] { + Method [ public method setLastIterator ] { - Parameters [0] { } } - Method [ public method resetiterator ] { + Method [ public method resetIterator ] { - Parameters [0] { } } - Method [ public method previousimage ] { + Method [ public method previousImage ] { - Parameters [0] { } } - Method [ public method nextimage ] { + Method [ public method nextImage ] { - Parameters [0] { } } - Method [ public method haspreviousimage ] { + Method [ public method hasPreviousImage ] { - Parameters [0] { } } - Method [ public method hasnextimage ] { + Method [ public method hasNextImage ] { - Parameters [0] { } } - Method [ public method setimageindex ] { + Method [ public method setImageIndex ] { - Parameters [1] { Parameter #0 [ $index ] } } - Method [ public method getimageindex ] { + Method [ public method getImageIndex ] { - Parameters [0] { } } - Method [ public method commentimage ] { + Method [ public method commentImage ] { - Parameters [1] { Parameter #0 [ $comment ] } } - Method [ public method cropimage ] { + Method [ public method cropImage ] { - Parameters [4] { Parameter #0 [ $width ] @@ -1993,56 +2006,56 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method labelimage ] { + Method [ public method labelImage ] { - Parameters [1] { Parameter #0 [ $label ] } } - Method [ public method getimagegeometry ] { + Method [ public method getImageGeometry ] { - Parameters [0] { } } - Method [ public method drawimage ] { + Method [ public method drawImage ] { - Parameters [1] { - Parameter #0 [ ImagickDraw $ImagickDraw ] + Parameter #0 [ ImagickDraw $drawing ] } } - Method [ public method setimagecompressionquality ] { + Method [ public method setImageCompressionQuality ] { - Parameters [1] { Parameter #0 [ $quality ] } } - Method [ public method getimagecompressionquality ] { + Method [ public method getImageCompressionQuality ] { - Parameters [0] { } } - Method [ public method setimagecompression ] { + Method [ public method setImageCompression ] { - Parameters [1] { - Parameter #0 [ $COMPRESSION ] + Parameter #0 [ $compression ] } } - Method [ public method getimagecompression ] { + Method [ public method getImageCompression ] { - Parameters [0] { } } - Method [ public method annotateimage ] { + Method [ public method annotateImage ] { - Parameters [5] { - Parameter #0 [ ImagickDraw $ImagickDraw ] + Parameter #0 [ ImagickDraw $settings ] Parameter #1 [ $x ] Parameter #2 [ $y ] Parameter #3 [ $angle ] @@ -2050,18 +2063,18 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method compositeimage ] { + Method [ public method compositeImage ] { - Parameters [5] { - Parameter #0 [ Imagick $Imagick ] - Parameter #1 [ $COMPOSITE ] + Parameter #0 [ Imagick $composite_image ] + Parameter #1 [ $composite ] Parameter #2 [ $x ] Parameter #3 [ $y ] - Parameter #4 [ $CHANNELTYPE ] + Parameter #4 [ $channel ] } } - Method [ public method modulateimage ] { + Method [ public method modulateImage ] { - Parameters [3] { Parameter #0 [ $brightness ] @@ -2070,39 +2083,39 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method getimagecolors ] { + Method [ public method getImageColors ] { - Parameters [0] { } } - Method [ public method montageimage ] { + Method [ public method montageImage ] { - Parameters [5] { - Parameter #0 [ ImagickDraw $ImagickDraw ] - Parameter #1 [ $tileGeometry ] - Parameter #2 [ $thumbnailGeometry ] - Parameter #3 [ $MONTAGEMODE ] + Parameter #0 [ ImagickDraw $settings ] + Parameter #1 [ $tile_geometry ] + Parameter #2 [ $thumbnail_geometry ] + Parameter #3 [ $monatgemode ] Parameter #4 [ $frame ] } } - Method [ public method identifyimage ] { + Method [ public method identifyImage ] { - Parameters [1] { - Parameter #0 [ $appendRawOutput ] + Parameter #0 [ $append_raw_output ] } } - Method [ public method thresholdimage ] { + Method [ public method thresholdImage ] { - Parameters [2] { Parameter #0 [ $threshold ] - Parameter #1 [ $CHANNELTYPE ] + Parameter #1 [ $channel ] } } - Method [ public method adaptivethresholdimage ] { + Method [ public method adaptiveThresholdImage ] { - Parameters [3] { Parameter #0 [ $width ] @@ -2111,28 +2124,28 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method blackthresholdimage ] { + Method [ public method blackThresholdImage ] { - Parameters [1] { - Parameter #0 [ $color ] + Parameter #0 [ $threshold_color ] } } - Method [ public method whitethresholdimage ] { + Method [ public method whiteThresholdImage ] { - Parameters [1] { - Parameter #0 [ $color ] + Parameter #0 [ $threshold_color ] } } - Method [ public method appendimages ] { + Method [ public method appendImages ] { - Parameters [1] { Parameter #0 [ $stack ] } } - Method [ public method charcoalimage ] { + Method [ public method charcoalImage ] { - Parameters [2] { Parameter #0 [ $radius ] @@ -2140,21 +2153,21 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method normalizeimage ] { + Method [ public method normalizeImage ] { - Parameters [1] { - Parameter #0 [ $CHANNEL ] + Parameter #0 [ $channel ] } } - Method [ public method oilpaintimage ] { + Method [ public method oilPaintImage ] { - Parameters [1] { Parameter #0 [ $radius ] } } - Method [ public method posterizeimage ] { + Method [ public method posterizeImage ] { - Parameters [2] { Parameter #0 [ $levels ] @@ -2162,15 +2175,15 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method radialblurimage ] { + Method [ public method radialBlurImage ] { - Parameters [2] { Parameter #0 [ $angle ] - Parameter #1 [ $CHANNEL ] + Parameter #1 [ $channel ] } } - Method [ public method raiseimage ] { + Method [ public method raiseImage ] { - Parameters [5] { Parameter #0 [ $width ] @@ -2181,29 +2194,29 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method resampleimage ] { + Method [ public method resampleImage ] { - Parameters [4] { - Parameter #0 [ $xResolution ] - Parameter #1 [ $yResolution ] - Parameter #2 [ $FILTER ] + Parameter #0 [ $x_resolution ] + Parameter #1 [ $y_resolution ] + Parameter #2 [ $filter ] Parameter #3 [ $blur ] } } - Method [ public method resizeimage ] { + Method [ public method resizeImage ] { - Parameters [6] { - Parameter #0 [ $x ] - Parameter #1 [ $y ] - Parameter #2 [ $filter ] - Parameter #3 [ $blur ] + Parameter #0 [ $columns ] + Parameter #1 [ $rows ] + Parameter #2 [ $filter ] + Parameter #3 [ $blur ] Parameter #4 [ $bestfit ] Parameter #5 [ $legacy ] } } - Method [ public method rollimage ] { + Method [ public method rollImage ] { - Parameters [2] { Parameter #0 [ $x ] @@ -2211,15 +2224,15 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method rotateimage ] { + Method [ public method rotateImage ] { - Parameters [2] { - Parameter #0 [ $color ] + Parameter #0 [ $background_color ] Parameter #1 [ $degrees ] } } - Method [ public method sampleimage ] { + Method [ public method sampleImage ] { - Parameters [2] { Parameter #0 [ $columns ] @@ -2227,14 +2240,14 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method solarizeimage ] { + Method [ public method solarizeImage ] { - Parameters [1] { Parameter #0 [ $threshold ] } } - Method [ public method shadowimage ] { + Method [ public method shadowImage ] { - Parameters [4] { Parameter #0 [ $opacity ] @@ -2244,7 +2257,7 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method setimageattribute ] { + Method [ public method setImageAttribute ] { - Parameters [2] { Parameter #0 [ $key ] @@ -2252,56 +2265,56 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method setimagebackgroundcolor ] { + Method [ public method setImageBackgroundColor ] { - Parameters [1] { - Parameter #0 [ $color ] + Parameter #0 [ $background_color ] } } - Method [ public method setimagecompose ] { + Method [ public method setImageCompose ] { - Parameters [1] { - Parameter #0 [ $COMPOSITE ] + Parameter #0 [ $compose ] } } - Method [ public method setimagedelay ] { + Method [ public method setImageDelay ] { - Parameters [1] { Parameter #0 [ $delay ] } } - Method [ public method setimagedepth ] { + Method [ public method setImageDepth ] { - Parameters [1] { Parameter #0 [ $depth ] } } - Method [ public method setimagegamma ] { + Method [ public method setImageGamma ] { - Parameters [1] { Parameter #0 [ $gamma ] } } - Method [ public method setimageiterations ] { + Method [ public method setImageIterations ] { - Parameters [1] { Parameter #0 [ $iterations ] } } - Method [ public method setimagemattecolor ] { + Method [ public method setImageMatteColor ] { - Parameters [1] { - Parameter #0 [ $color ] + Parameter #0 [ $matte_color ] } } - Method [ public method setimagepage ] { + Method [ public method setImagePage ] { - Parameters [4] { Parameter #0 [ $width ] @@ -2311,66 +2324,66 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method setimageprogressmonitor ] { + Method [ public method setImageProgressMonitor ] { - Parameters [1] { Parameter #0 [ $filename ] } } - Method [ public method setprogressmonitor ] { + Method [ public method setProgressMonitor ] { - Parameters [1] { Parameter #0 [ $callback ] } } - Method [ public method setimageresolution ] { + Method [ public method setImageResolution ] { - Parameters [2] { - Parameter #0 [ $xResolution ] - Parameter #1 [ $yResolution ] + Parameter #0 [ $x_resolution ] + Parameter #1 [ $y_resolution ] } } - Method [ public method setimagescene ] { + Method [ public method setImageScene ] { - Parameters [1] { Parameter #0 [ $scene ] } } - Method [ public method setimagetickspersecond ] { + Method [ public method setImageTicksPerSecond ] { - Parameters [1] { - Parameter #0 [ $ticksPerSecond ] + Parameter #0 [ $ticks_per_second ] } } - Method [ public method setimagetype ] { + Method [ public method setImageType ] { - Parameters [1] { - Parameter #0 [ $IMGTYPE ] + Parameter #0 [ $image_type ] } } - Method [ public method setimageunits ] { + Method [ public method setImageUnits ] { - Parameters [1] { - Parameter #0 [ $RESOLUTION ] + Parameter #0 [ $units ] } } - Method [ public method sharpenimage ] { + Method [ public method sharpenImage ] { - Parameters [3] { Parameter #0 [ $radius ] Parameter #1 [ $sigma ] - Parameter #2 [ $CHANNEL ] + Parameter #2 [ $channel ] } } - Method [ public method shaveimage ] { + Method [ public method shaveImage ] { - Parameters [2] { Parameter #0 [ $columns ] @@ -2378,16 +2391,16 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method shearimage ] { + Method [ public method shearImage ] { - Parameters [3] { - Parameter #0 [ $color ] - Parameter #1 [ $xShear ] - Parameter #2 [ $yShear ] + Parameter #0 [ $background_color ] + Parameter #1 [ $x_shear ] + Parameter #2 [ $y_shear ] } } - Method [ public method spliceimage ] { + Method [ public method spliceImage ] { - Parameters [4] { Parameter #0 [ $width ] @@ -2397,131 +2410,132 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method pingimage ] { + Method [ public method pingImage ] { - Parameters [1] { Parameter #0 [ $filename ] } } - Method [ public method readimagefile ] { + Method [ public method readImageFile ] { - - Parameters [1] { - Parameter #0 [ $fp ] + - Parameters [2] { + Parameter #0 [ $filehandle ] + Parameter #1 [ $filename ] } } - Method [ public method displayimage ] { + Method [ public method displayImage ] { - Parameters [1] { - Parameter #0 [ $serverName ] + Parameter #0 [ $servername ] } } - Method [ public method displayimages ] { + Method [ public method displayImages ] { - Parameters [1] { - Parameter #0 [ $serverName ] + Parameter #0 [ $servername ] } } - Method [ public method spreadimage ] { + Method [ public method spreadImage ] { - Parameters [1] { Parameter #0 [ $radius ] } } - Method [ public method swirlimage ] { + Method [ public method swirlImage ] { - Parameters [1] { Parameter #0 [ $degrees ] } } - Method [ public method stripimage ] { + Method [ public method stripImage ] { - Parameters [0] { } } - Method [ public method queryfontmetrics ] { + Method [ public method queryFontMetrics ] { - Parameters [3] { - Parameter #0 [ ImagickDraw $ImagickDraw ] + Parameter #0 [ ImagickDraw $settings ] Parameter #1 [ $text ] Parameter #2 [ $multiline ] } } - Method [ public method steganoimage ] { + Method [ public method steganoImage ] { - Parameters [2] { - Parameter #0 [ Imagick $Imagick ] + Parameter #0 [ Imagick $watermark ] Parameter #1 [ $offset ] } } - Method [ public method addnoiseimage ] { + Method [ public method addNoiseImage ] { - Parameters [2] { - Parameter #0 [ $NOISE ] - Parameter #1 [ $CHANNEL ] + Parameter #0 [ $noise ] + Parameter #1 [ $channel ] } } - Method [ public method motionblurimage ] { + Method [ public method motionBlurImage ] { - Parameters [4] { Parameter #0 [ $radius ] Parameter #1 [ $sigma ] Parameter #2 [ $angle ] - Parameter #3 [ $CHANNEL ] + Parameter #3 [ $channel ] } } - Method [ public method mosaicimages ] { + Method [ public method mosaicImages ] { - Parameters [0] { } } - Method [ public method morphimages ] { + Method [ public method morphImages ] { - Parameters [1] { - Parameter #0 [ $frames ] + Parameter #0 [ $number_frames ] } } - Method [ public method minifyimage ] { + Method [ public method minifyImage ] { - Parameters [0] { } } - Method [ public method affinetransformimage ] { + Method [ public method affineTransformImage ] { - Parameters [1] { - Parameter #0 [ ImagickDraw $ImagickDraw ] + Parameter #0 [ ImagickDraw $settings ] } } - Method [ public method averageimages ] { + Method [ public method averageImages ] { - Parameters [0] { } } - Method [ public method borderimage ] { + Method [ public method borderImage ] { - Parameters [3] { - Parameter #0 [ $color ] + Parameter #0 [ $border_color ] Parameter #1 [ $width ] Parameter #2 [ $height ] } } - Method [ public method chopimage ] { + Method [ public method chopImage ] { - Parameters [4] { Parameter #0 [ $width ] @@ -2531,13 +2545,13 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method clipimage ] { + Method [ public method clipImage ] { - Parameters [0] { } } - Method [ public method clippathimage ] { + Method [ public method clipPathImage ] { - Parameters [2] { Parameter #0 [ $pathname ] @@ -2545,7 +2559,7 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method clipimagepath ] { + Method [ public method clipImagePath ] { - Parameters [2] { Parameter #0 [ $pathname ] @@ -2553,97 +2567,98 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method coalesceimages ] { + Method [ public method coalesceImages ] { - Parameters [0] { } } - Method [ public method colorfloodfillimage ] { + Method [ public method colorFloodfillImage ] { - Parameters [5] { Parameter #0 [ $fill_color ] Parameter #1 [ $fuzz ] Parameter #2 [ $border_color ] - Parameter #3 [ $y ] - Parameter #4 [ $x ] + Parameter #3 [ $x ] + Parameter #4 [ $y ] } } - Method [ public method colorizeimage ] { + Method [ public method colorizeImage ] { - Parameters [3] { Parameter #0 [ $colorize_color ] - Parameter #1 [ $opacity ] + Parameter #1 [ $opacity_color ] Parameter #2 [ $legacy ] } } - Method [ public method compareimagechannels ] { + Method [ public method compareImageChannels ] { - Parameters [3] { - Parameter #0 [ Imagick $Imagick ] - Parameter #1 [ $CHANNEL ] - Parameter #2 [ $METRIC ] + Parameter #0 [ Imagick $reference ] + Parameter #1 [ $channel ] + Parameter #2 [ $metric ] } } - Method [ public method compareimages ] { + Method [ public method compareImages ] { - Parameters [2] { - Parameter #0 [ Imagick $Imagick ] - Parameter #1 [ $METRIC ] + Parameter #0 [ Imagick $reference ] + Parameter #1 [ $metric ] } } - Method [ public method contrastimage ] { + Method [ public method contrastImage ] { - Parameters [1] { Parameter #0 [ $sharpen ] } } - Method [ public method combineimages ] { + Method [ public method combineImages ] { - - Parameters [0] { + - Parameters [1] { + Parameter #0 [ $colorspace ] } } - Method [ public method convolveimage ] { + Method [ public method convolveImage ] { - Parameters [2] { Parameter #0 [ $kernel ] - Parameter #1 [ $CHANNEL ] + Parameter #1 [ $channel ] } } - Method [ public method cyclecolormapimage ] { + Method [ public method cycleColormapImage ] { - Parameters [1] { Parameter #0 [ $displace ] } } - Method [ public method deconstructimages ] { + Method [ public method deconstructImages ] { - Parameters [0] { } } - Method [ public method despeckleimage ] { + Method [ public method despeckleImage ] { - Parameters [0] { } } - Method [ public method edgeimage ] { + Method [ public method edgeImage ] { - Parameters [1] { Parameter #0 [ $radius ] } } - Method [ public method embossimage ] { + Method [ public method embossImage ] { - Parameters [2] { Parameter #0 [ $radius ] @@ -2651,256 +2666,256 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method enhanceimage ] { + Method [ public method enhanceImage ] { - Parameters [0] { } } - Method [ public method equalizeimage ] { + Method [ public method equalizeImage ] { - Parameters [0] { } } - Method [ public method evaluateimage ] { + Method [ public method evaluateImage ] { - Parameters [3] { - Parameter #0 [ $EVALUATE ] + Parameter #0 [ $evaluate ] Parameter #1 [ $constant ] - Parameter #2 [ $CHANNEL ] + Parameter #2 [ $channel ] } } - Method [ public method evaluateimages ] { + Method [ public method evaluateImages ] { - Parameters [1] { - Parameter #0 [ $EVALUATE ] + Parameter #0 [ $evaluate ] } } - Method [ public method flattenimages ] { + Method [ public method flattenImages ] { - Parameters [0] { } } - Method [ public method flipimage ] { + Method [ public method flipImage ] { - Parameters [0] { } } - Method [ public method flopimage ] { + Method [ public method flopImage ] { - Parameters [0] { } } - Method [ public method forwardfouriertransformimage ] { + Method [ public method forwardFourierTransformImage ] { - Parameters [1] { Parameter #0 [ $magnitude ] } } - Method [ public method frameimage ] { + Method [ public method frameImage ] { - Parameters [5] { - Parameter #0 [ $color ] + Parameter #0 [ $matte_color ] Parameter #1 [ $width ] Parameter #2 [ $height ] - Parameter #3 [ $innerBevel ] - Parameter #4 [ $outerBevel ] + Parameter #3 [ $inner_bevel ] + Parameter #4 [ $outer_bevel ] } } - Method [ public method fximage ] { + Method [ public method fxImage ] { - Parameters [2] { Parameter #0 [ $expression ] - Parameter #1 [ $CHANNEL ] + Parameter #1 [ $channel ] } } - Method [ public method gammaimage ] { + Method [ public method gammaImage ] { - Parameters [2] { Parameter #0 [ $gamma ] - Parameter #1 [ $CHANNEL ] + Parameter #1 [ $channel ] } } - Method [ public method gaussianblurimage ] { + Method [ public method gaussianBlurImage ] { - Parameters [3] { Parameter #0 [ $radius ] Parameter #1 [ $sigma ] - Parameter #2 [ $CHANNEL ] + Parameter #2 [ $channel ] } } - Method [ public method getimageattribute ] { + Method [ public method getImageAttribute ] { - Parameters [1] { Parameter #0 [ $key ] } } - Method [ public method getimagebackgroundcolor ] { + Method [ public method getImageBackgroundColor ] { - Parameters [0] { } } - Method [ public method getimageblueprimary ] { + Method [ public method getImageBluePrimary ] { - Parameters [0] { } } - Method [ public method getimagebordercolor ] { + Method [ public method getImageBorderColor ] { - Parameters [0] { } } - Method [ public method getimagechanneldepth ] { + Method [ public method getImageChannelDepth ] { - Parameters [1] { - Parameter #0 [ $CHANNEL ] + Parameter #0 [ $channel ] } } - Method [ public method getimagechanneldistortion ] { + Method [ public method getImageChannelDistortion ] { - Parameters [3] { - Parameter #0 [ Imagick $Imagick ] - Parameter #1 [ $CHANNEL ] - Parameter #2 [ $METRIC ] + Parameter #0 [ Imagick $reference ] + Parameter #1 [ $channel ] + Parameter #2 [ $metric ] } } - Method [ public method getimagechannelextrema ] { + Method [ public method getImageChannelExtrema ] { - Parameters [1] { - Parameter #0 [ $CHANNEL ] + Parameter #0 [ $channel ] } } - Method [ public method getimagechannelmean ] { + Method [ public method getImageChannelMean ] { - Parameters [1] { - Parameter #0 [ $CHANNEL ] + Parameter #0 [ $channel ] } } - Method [ public method getimagechannelstatistics ] { + Method [ public method getImageChannelStatistics ] { - Parameters [0] { } } - Method [ public method getimagecolormapcolor ] { + Method [ public method getImageColormapColor ] { - Parameters [1] { Parameter #0 [ $index ] } } - Method [ public method getimagecolorspace ] { + Method [ public method getImageColorspace ] { - Parameters [0] { } } - Method [ public method getimagecompose ] { + Method [ public method getImageCompose ] { - Parameters [0] { } } - Method [ public method getimagedelay ] { + Method [ public method getImageDelay ] { - Parameters [0] { } } - Method [ public method getimagedepth ] { + Method [ public method getImageDepth ] { - Parameters [0] { } } - Method [ public method getimagedistortion ] { + Method [ public method getImageDistortion ] { - Parameters [2] { - Parameter #0 [ Imagick $Imagick ] - Parameter #1 [ $METRIC ] + Parameter #0 [ Imagick $reference ] + Parameter #1 [ $metric ] } } - Method [ public method getimageextrema ] { + Method [ public method getImageExtrema ] { - Parameters [0] { } } - Method [ public method getimagedispose ] { + Method [ public method getImageDispose ] { - Parameters [0] { } } - Method [ public method getimagegamma ] { + Method [ public method getImageGamma ] { - Parameters [0] { } } - Method [ public method getimagegreenprimary ] { + Method [ public method getImageGreenPrimary ] { - Parameters [0] { } } - Method [ public method getimageheight ] { + Method [ public method getImageHeight ] { - Parameters [0] { } } - Method [ public method getimagehistogram ] { + Method [ public method getImageHistogram ] { - Parameters [0] { } } - Method [ public method getimageinterlacescheme ] { + Method [ public method getImageInterlaceScheme ] { - Parameters [0] { } } - Method [ public method getimageiterations ] { + Method [ public method getImageIterations ] { - Parameters [0] { } } - Method [ public method getimagemattecolor ] { + Method [ public method getImageMatteColor ] { - Parameters [0] { } } - Method [ public method getimagepage ] { + Method [ public method getImagePage ] { - Parameters [0] { } } - Method [ public method getimagepixelcolor ] { + Method [ public method getImagePixelColor ] { - Parameters [2] { Parameter #0 [ $x ] @@ -2908,92 +2923,92 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method getimageprofile ] { + Method [ public method getImageProfile ] { - Parameters [1] { Parameter #0 [ $name ] } } - Method [ public method getimageredprimary ] { + Method [ public method getImageRedPrimary ] { - Parameters [0] { } } - Method [ public method getimagerenderingintent ] { + Method [ public method getImageRenderingIntent ] { - Parameters [0] { } } - Method [ public method getimageresolution ] { + Method [ public method getImageResolution ] { - Parameters [0] { } } - Method [ public method getimagescene ] { + Method [ public method getImageScene ] { - Parameters [0] { } } - Method [ public method getimagesignature ] { + Method [ public method getImageSignature ] { - Parameters [0] { } } - Method [ public method getimagetickspersecond ] { + Method [ public method getImageTicksPerSecond ] { - Parameters [0] { } } - Method [ public method getimagetype ] { + Method [ public method getImageType ] { - Parameters [0] { } } - Method [ public method getimageunits ] { + Method [ public method getImageUnits ] { - Parameters [0] { } } - Method [ public method getimagevirtualpixelmethod ] { + Method [ public method getImageVirtualPixelMethod ] { - Parameters [0] { } } - Method [ public method getimagewhitepoint ] { + Method [ public method getImageWhitePoint ] { - Parameters [0] { } } - Method [ public method getimagewidth ] { + Method [ public method getImageWidth ] { - Parameters [0] { } } - Method [ public method getnumberimages ] { + Method [ public method getNumberImages ] { - Parameters [0] { } } - Method [ public method getimagetotalinkdensity ] { + Method [ public method getImageTotalInkDensity ] { - Parameters [0] { } } - Method [ public method getimageregion ] { + Method [ public method getImageRegion ] { - Parameters [4] { Parameter #0 [ $width ] @@ -3003,82 +3018,82 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method implodeimage ] { + Method [ public method implodeImage ] { - Parameters [1] { Parameter #0 [ $radius ] } } - Method [ public method inversefouriertransformimage ] { + Method [ public method inverseFourierTransformImage ] { - Parameters [2] { - Parameter #0 [ $complement ] + Parameter #0 [ Imagick $complement ] Parameter #1 [ $magnitude ] } } - Method [ public method levelimage ] { + Method [ public method levelImage ] { - Parameters [4] { - Parameter #0 [ $blackPoint ] + Parameter #0 [ $black_point ] Parameter #1 [ $gamma ] - Parameter #2 [ $whitePoint ] - Parameter #3 [ $CHANNEL ] + Parameter #2 [ $white_point ] + Parameter #3 [ $channel ] } } - Method [ public method magnifyimage ] { + Method [ public method magnifyImage ] { - Parameters [0] { } } - Method [ public method mapimage ] { + Method [ public method mapImage ] { - Parameters [2] { - Parameter #0 [ Imagick $Imagick ] + Parameter #0 [ imagick $map ] Parameter #1 [ $dither ] } } - Method [ public method mattefloodfillimage ] { + Method [ public method matteFloodfillImage ] { - Parameters [5] { Parameter #0 [ $alpha ] Parameter #1 [ $fuzz ] - Parameter #2 [ $color ] + Parameter #2 [ $border_color ] Parameter #3 [ $x ] Parameter #4 [ $y ] } } - Method [ public method medianfilterimage ] { + Method [ public method medianFilterImage ] { - Parameters [1] { Parameter #0 [ $radius ] } } - Method [ public method negateimage ] { + Method [ public method negateImage ] { - Parameters [2] { Parameter #0 [ $gray ] - Parameter #1 [ $CHANNEL ] + Parameter #1 [ $channel ] } } - Method [ public method paintopaqueimage ] { + Method [ public method paintOpaqueImage ] { - Parameters [4] { Parameter #0 [ $target_color ] Parameter #1 [ $fill_color ] Parameter #2 [ $fuzz ] - Parameter #3 [ $CHANNEL ] + Parameter #3 [ $channel ] } } - Method [ public method painttransparentimage ] { + Method [ public method paintTransparentImage ] { - Parameters [3] { Parameter #0 [ $target_color ] @@ -3087,14 +3102,14 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method previewimages ] { + Method [ public method previewImages ] { - Parameters [1] { - Parameter #0 [ $PREVIEW ] + Parameter #0 [ $preview ] } } - Method [ public method profileimage ] { + Method [ public method profileImage ] { - Parameters [2] { Parameter #0 [ $name ] @@ -3102,71 +3117,71 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method quantizeimage ] { + Method [ public method quantizeImage ] { - Parameters [5] { - Parameter #0 [ $numColors ] - Parameter #1 [ $COLORSPACE ] - Parameter #2 [ $treeDepth ] + Parameter #0 [ $number_colors ] + Parameter #1 [ $colorspace ] + Parameter #2 [ $tree_depth ] Parameter #3 [ $dither ] - Parameter #4 [ $measureError ] + Parameter #4 [ $measure_error ] } } - Method [ public method quantizeimages ] { + Method [ public method quantizeImages ] { - Parameters [5] { - Parameter #0 [ $numColors ] - Parameter #1 [ $COLORSPACE ] - Parameter #2 [ $treeDepth ] + Parameter #0 [ $number_colors ] + Parameter #1 [ $colorspace ] + Parameter #2 [ $tree_depth ] Parameter #3 [ $dither ] - Parameter #4 [ $measureError ] + Parameter #4 [ $measure_error ] } } - Method [ public method reducenoiseimage ] { + Method [ public method reduceNoiseImage ] { - Parameters [1] { Parameter #0 [ $radius ] } } - Method [ public method removeimageprofile ] { + Method [ public method removeImageProfile ] { - Parameters [1] { Parameter #0 [ $name ] } } - Method [ public method separateimagechannel ] { + Method [ public method separateImageChannel ] { - Parameters [1] { - Parameter #0 [ $CHANNEL ] + Parameter #0 [ $channel ] } } - Method [ public method sepiatoneimage ] { + Method [ public method sepiaToneImage ] { - Parameters [1] { Parameter #0 [ $threshold ] } } - Method [ public method setimagebias ] { + Method [ public method setImageBias ] { - Parameters [1] { Parameter #0 [ $bias ] } } - Method [ public method setimagebiasquantum ] { + Method [ public method setImageBiasQuantum ] { - Parameters [1] { Parameter #0 [ $bias ] } } - Method [ public method setimageblueprimary ] { + Method [ public method setImageBluePrimary ] { - Parameters [2] { Parameter #0 [ $x ] @@ -3174,22 +3189,22 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method setimagebordercolor ] { + Method [ public method setImageBorderColor ] { - Parameters [1] { - Parameter #0 [ $color ] + Parameter #0 [ $border_color ] } } - Method [ public method setimagechanneldepth ] { + Method [ public method setImageChannelDepth ] { - Parameters [2] { - Parameter #0 [ $CHANNEL ] + Parameter #0 [ $channel ] Parameter #1 [ $depth ] } } - Method [ public method setimagecolormapcolor ] { + Method [ public method setImageColormapColor ] { - Parameters [2] { Parameter #0 [ $index ] @@ -3197,21 +3212,21 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method setimagecolorspace ] { + Method [ public method setImageColorspace ] { - Parameters [1] { - Parameter #0 [ $COLORSPACE ] + Parameter #0 [ $colorspace ] } } - Method [ public method setimagedispose ] { + Method [ public method setImageDispose ] { - Parameters [1] { - Parameter #0 [ $DISPOSETYPE ] + Parameter #0 [ $dispose ] } } - Method [ public method setimageextent ] { + Method [ public method setImageExtent ] { - Parameters [2] { Parameter #0 [ $columns ] @@ -3219,7 +3234,7 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method setimagegreenprimary ] { + Method [ public method setImageGreenPrimary ] { - Parameters [2] { Parameter #0 [ $x ] @@ -3227,14 +3242,14 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method setimageinterlacescheme ] { + Method [ public method setImageInterlaceScheme ] { - Parameters [1] { - Parameter #0 [ $INTERLACE ] + Parameter #0 [ $interlace ] } } - Method [ public method setimageprofile ] { + Method [ public method setImageProfile ] { - Parameters [2] { Parameter #0 [ $name ] @@ -3242,7 +3257,7 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method setimageredprimary ] { + Method [ public method setImageRedPrimary ] { - Parameters [2] { Parameter #0 [ $x ] @@ -3250,21 +3265,21 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method setimagerenderingintent ] { + Method [ public method setImageRenderingIntent ] { - Parameters [1] { - Parameter #0 [ $RENDERINGINTENT ] + Parameter #0 [ $rendering_intent ] } } - Method [ public method setimagevirtualpixelmethod ] { + Method [ public method setImageVirtualPixelMethod ] { - Parameters [1] { - Parameter #0 [ $VIRTUALPIXELMETHOD ] + Parameter #0 [ $method ] } } - Method [ public method setimagewhitepoint ] { + Method [ public method setImageWhitePoint ] { - Parameters [2] { Parameter #0 [ $x ] @@ -3272,71 +3287,71 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method sigmoidalcontrastimage ] { + Method [ public method sigmoidalContrastImage ] { - Parameters [4] { Parameter #0 [ $sharpen ] - Parameter #1 [ $contrast ] - Parameter #2 [ $midpoint ] - Parameter #3 [ $CHANNEL ] + Parameter #1 [ $alpha ] + Parameter #2 [ $beta ] + Parameter #3 [ $channel ] } } - Method [ public method stereoimage ] { + Method [ public method stereoImage ] { - Parameters [1] { - Parameter #0 [ Imagick $Imagick ] + Parameter #0 [ Imagick $offset_image ] } } - Method [ public method textureimage ] { + Method [ public method textureImage ] { - Parameters [1] { - Parameter #0 [ Imagick $Imagick ] + Parameter #0 [ Imagick $texture ] } } - Method [ public method tintimage ] { + Method [ public method tintImage ] { - Parameters [3] { Parameter #0 [ $tint_color ] - Parameter #1 [ $opacity ] + Parameter #1 [ $opacity_color ] Parameter #2 [ $legacy ] } } - Method [ public method unsharpmaskimage ] { + Method [ public method unsharpMaskImage ] { - Parameters [5] { Parameter #0 [ $radius ] Parameter #1 [ $sigma ] Parameter #2 [ $amount ] Parameter #3 [ $threshold ] - Parameter #4 [ $CHANNEL ] + Parameter #4 [ $channel ] } } - Method [ public method getimage ] { + Method [ public method getImage ] { - Parameters [0] { } } - Method [ public method addimage ] { + Method [ public method addImage ] { - Parameters [1] { - Parameter #0 [ Imagick $Imagick ] + Parameter #0 [ Imagick $image ] } } - Method [ public method setimage ] { + Method [ public method setImage ] { - Parameters [1] { - Parameter #0 [ Imagick $Imagick ] + Parameter #0 [ Imagick $image ] } } - Method [ public method newimage ] { + Method [ public method newImage ] { - Parameters [4] { Parameter #0 [ $columns ] @@ -3346,113 +3361,113 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method newpseudoimage ] { + Method [ public method newPseudoImage ] { - Parameters [3] { Parameter #0 [ $columns ] Parameter #1 [ $rows ] - Parameter #2 [ $pseudoString ] + Parameter #2 [ $pseudo_format ] } } - Method [ public method getcompression ] { + Method [ public method getCompression ] { - Parameters [0] { } } - Method [ public method getcompressionquality ] { + Method [ public method getCompressionQuality ] { - Parameters [0] { } } - Method [ public method getfilename ] { + Method [ public method getFilename ] { - Parameters [0] { } } - Method [ public method getformat ] { + Method [ public method getFormat ] { - Parameters [0] { } } - Method [ public method getinterlacescheme ] { + Method [ public method getInterlaceScheme ] { - Parameters [0] { } } - Method [ public method getoption ] { + Method [ public method getOption ] { - Parameters [1] { Parameter #0 [ $key ] } } - Method [ public method getpage ] { + Method [ public method getPage ] { - Parameters [0] { } } - Method [ public method getsamplingfactors ] { + Method [ public method getSamplingFactors ] { - Parameters [0] { } } - Method [ public method getsize ] { + Method [ public method getSize ] { - Parameters [0] { } } - Method [ public method setbackgroundcolor ] { + Method [ public method setBackgroundColor ] { - Parameters [1] { - Parameter #0 [ $color ] + Parameter #0 [ $background_color ] } } - Method [ public method setcompression ] { + Method [ public method setCompression ] { - Parameters [1] { Parameter #0 [ $compression ] } } - Method [ public method setcompressionquality ] { + Method [ public method setCompressionQuality ] { - Parameters [1] { - Parameter #0 [ $compressionquality ] + Parameter #0 [ $quality ] } } - Method [ public method setfilename ] { + Method [ public method setFilename ] { - Parameters [1] { Parameter #0 [ $filename ] } } - Method [ public method setformat ] { + Method [ public method setFormat ] { - Parameters [1] { Parameter #0 [ $format ] } } - Method [ public method setinterlacescheme ] { + Method [ public method setInterlaceScheme ] { - Parameters [1] { - Parameter #0 [ $INTERLACE ] + Parameter #0 [ $interlace ] } } - Method [ public method setoption ] { + Method [ public method setOption ] { - Parameters [2] { Parameter #0 [ $key ] @@ -3460,7 +3475,7 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method setpage ] { + Method [ public method setPage ] { - Parameters [4] { Parameter #0 [ $width ] @@ -3470,22 +3485,22 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method setresolution ] { + Method [ public method setResolution ] { - Parameters [2] { - Parameter #0 [ $xResolution ] - Parameter #1 [ $yResolution ] + Parameter #0 [ $x_resolution ] + Parameter #1 [ $y_resolution ] } } - Method [ public method setsamplingfactors ] { + Method [ public method setSamplingFactors ] { - Parameters [1] { Parameter #0 [ $factors ] } } - Method [ public method setsize ] { + Method [ public method setSize ] { - Parameters [2] { Parameter #0 [ $columns ] @@ -3493,10 +3508,10 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method settype ] { + Method [ public method setType ] { - Parameters [1] { - Parameter #0 [ $IMGTYPE ] + Parameter #0 [ $imgtype ] } } @@ -3530,57 +3545,57 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method brightnesscontrastimage ] { + Method [ public method brightnessContrastImage ] { - Parameters [3] { Parameter #0 [ $brightness ] Parameter #1 [ $contrast ] - Parameter #2 [ $CHANNEL ] + Parameter #2 [ $channel ] } } - Method [ public method colormatriximage ] { + Method [ public method colorMatrixImage ] { - Parameters [1] { - Parameter #0 [ $color_matrix ] + Parameter #0 [ $color_matrix ] } } - Method [ public method selectiveblurimage ] { + Method [ public method selectiveBlurImage ] { - Parameters [4] { Parameter #0 [ $radius ] Parameter #1 [ $sigma ] Parameter #2 [ $threshold ] - Parameter #3 [ $CHANNEL ] + Parameter #3 [ $channel ] } } - Method [ public method rotationalblurimage ] { + Method [ public method rotationalBlurImage ] { - Parameters [2] { Parameter #0 [ $angle ] - Parameter #1 [ $CHANNEL ] + Parameter #1 [ $channel ] } } - Method [ public method statisticimage ] { + Method [ public method statisticImage ] { - Parameters [4] { Parameter #0 [ $type ] Parameter #1 [ $width ] Parameter #2 [ $height ] - Parameter #3 [ $CHANNEL ] + Parameter #3 [ $channel ] } } - Method [ public method subimagematch ] { + Method [ public method subimageMatch ] { - Parameters [5] { - Parameter #0 [ Imagick $Imagick ] + Parameter #0 [ Imagick $image ] Parameter #1 [ &$offset ] Parameter #2 [ &$similarity ] - Parameter #3 [ &$similarity_threshold ] + Parameter #3 [ &$threshold ] Parameter #4 [ &$metric ] } } @@ -3588,10 +3603,10 @@ Extension [ extension #77 imagick version 3.4.4 ] { Method [ public method similarityimage ] { - Parameters [5] { - Parameter #0 [ Imagick $Imagick ] + Parameter #0 [ Imagick $image ] Parameter #1 [ &$offset ] Parameter #2 [ &$similarity ] - Parameter #3 [ &$similarity_threshold ] + Parameter #3 [ &$threshold ] Parameter #4 [ &$metric ] } } @@ -3599,70 +3614,76 @@ Extension [ extension #77 imagick version 3.4.4 ] { Method [ public method morphology ] { - Parameters [4] { - Parameter #0 [ $morphologyMethod ] + Parameter #0 [ $morphology ] Parameter #1 [ $iterations ] - Parameter #2 [ ImagickKernel $ImagickKernel ] - Parameter #3 [ $CHANNEL ] + Parameter #2 [ ImagickKernel $kernel ] + Parameter #3 [ $channel ] } } Method [ public method filter ] { - Parameters [2] { - Parameter #0 [ ImagickKernel $ImagickKernel ] - Parameter #1 [ $CHANNEL ] + Parameter #0 [ ImagickKernel $kernel ] + Parameter #1 [ $channel ] } } - Method [ public method setantialias ] { + Method [ public method setAntialias ] { - Parameters [1] { Parameter #0 [ $antialias ] } } - Method [ public method getantialias ] { + Method [ public method getAntialias ] { - Parameters [0] { } } - Method [ public method colordecisionlistimage ] { + Method [ public method colorDecisionListImage ] { - Parameters [1] { - Parameter #0 [ $antialias ] + Parameter #0 [ $color_correction_collection ] } } - Method [ public method optimizeimagetransparency ] { + Method [ public method optimizeImageTransparency ] { - Parameters [0] { } } - Method [ public method autogammaimage ] { + Method [ public method autoGammaImage ] { - Parameters [1] { - Parameter #0 [ $CHANNEL ] + Parameter #0 [ $channel ] } } - Method [ public method autoorient ] { + Method [ public method autoOrient ] { - Parameters [0] { } } - Method [ public method compositeimagegravity ] { + Method [ public method autoOrientate ] { + + - Parameters [0] { + } + } + + Method [ public method compositeImageGravity ] { - Parameters [3] { - Parameter #0 [ Imagick $Imagick ] - Parameter #1 [ $COMPOSITE ] - Parameter #2 [ $GRAVITY ] + Parameter #0 [ Imagick $image ] + Parameter #1 [ $composite_constant ] + Parameter #2 [ $gravity ] } } - Method [ public method localcontrastimage ] { + Method [ public method localContrastImage ] { - Parameters [2] { Parameter #0 [ $radius ] @@ -3687,45 +3708,45 @@ Extension [ extension #77 imagick version 3.4.4 ] { } - Methods [134] { - Method [ public method resetvectorgraphics ] { + Method [ public method resetVectorGraphics ] { - Parameters [0] { } } - Method [ public method gettextkerning ] { + Method [ public method getTextKerning ] { - Parameters [0] { } } - Method [ public method settextkerning ] { + Method [ public method setTextKerning ] { - Parameters [1] { Parameter #0 [ $kerning ] } } - Method [ public method gettextinterwordspacing ] { + Method [ public method getTextInterwordSpacing ] { - Parameters [0] { } } - Method [ public method settextinterwordspacing ] { + Method [ public method setTextInterwordSpacing ] { - Parameters [1] { Parameter #0 [ $spacing ] } } - Method [ public method gettextinterlinespacing ] { + Method [ public method getTextInterlineSpacing ] { - Parameters [0] { } } - Method [ public method settextinterlinespacing ] { + Method [ public method setTextInterlineSpacing ] { - Parameters [1] { Parameter #0 [ $spacing ] @@ -3738,43 +3759,43 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method setfillcolor ] { + Method [ public method setFillColor ] { - Parameters [1] { - Parameter #0 [ $color ] + Parameter #0 [ $fill_color ] } } - Method [ public method setfillalpha ] { + Method [ public method setFillAlpha ] { - Parameters [1] { Parameter #0 [ $alpha ] } } - Method [ public method setresolution ] { + Method [ public method setResolution ] { - Parameters [2] { - Parameter #0 [ $x_resolution ] - Parameter #1 [ $y_resolution ] + Parameter #0 [ $resolution_x ] + Parameter #1 [ $resolution_y ] } } - Method [ public method setstrokecolor ] { + Method [ public method setStrokeColor ] { - Parameters [1] { Parameter #0 [ $color ] } } - Method [ public method setstrokealpha ] { + Method [ public method setStrokeAlpha ] { - Parameters [1] { Parameter #0 [ $alpha ] } } - Method [ public method setstrokewidth ] { + Method [ public method setStrokeWidth ] { - Parameters [1] { Parameter #0 [ $width ] @@ -3790,10 +3811,10 @@ Extension [ extension #77 imagick version 3.4.4 ] { Method [ public method circle ] { - Parameters [4] { - Parameter #0 [ $ox ] - Parameter #1 [ $oy ] - Parameter #2 [ $px ] - Parameter #3 [ $py ] + Parameter #0 [ $origin_x ] + Parameter #1 [ $origin_y ] + Parameter #2 [ $perimeter_x ] + Parameter #3 [ $perimeter_y ] } } @@ -3806,80 +3827,80 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method settextantialias ] { + Method [ public method setTextAntialias ] { - Parameters [1] { Parameter #0 [ $antialias ] } } - Method [ public method settextencoding ] { + Method [ public method setTextEncoding ] { - Parameters [1] { Parameter #0 [ $encoding ] } } - Method [ public method setfont ] { + Method [ public method setFont ] { - Parameters [1] { - Parameter #0 [ $font ] + Parameter #0 [ $font_name ] } } - Method [ public method setfontfamily ] { + Method [ public method setFontFamily ] { - Parameters [1] { - Parameter #0 [ $fontfamily ] + Parameter #0 [ $font_family ] } } - Method [ public method setfontsize ] { + Method [ public method setFontSize ] { - Parameters [1] { - Parameter #0 [ $pointsize ] + Parameter #0 [ $point_size ] } } - Method [ public method setfontstyle ] { + Method [ public method setFontStyle ] { - Parameters [1] { - Parameter #0 [ $STYLE ] + Parameter #0 [ $style ] } } - Method [ public method setfontweight ] { + Method [ public method setFontWeight ] { - Parameters [1] { Parameter #0 [ $weight ] } } - Method [ public method getfont ] { + Method [ public method getFont ] { - Parameters [0] { } } - Method [ public method getfontfamily ] { + Method [ public method getFontFamily ] { - Parameters [0] { } } - Method [ public method getfontsize ] { + Method [ public method getFontSize ] { - Parameters [0] { } } - Method [ public method getfontstyle ] { + Method [ public method getFontStyle ] { - Parameters [0] { } } - Method [ public method getfontweight ] { + Method [ public method getFontWeight ] { - Parameters [0] { } @@ -3894,45 +3915,45 @@ Extension [ extension #77 imagick version 3.4.4 ] { Method [ public method rectangle ] { - Parameters [4] { - Parameter #0 [ $x1 ] - Parameter #1 [ $y1 ] - Parameter #2 [ $x2 ] - Parameter #3 [ $y2 ] + Parameter #0 [ $top_left_x ] + Parameter #1 [ $top_left_y ] + Parameter #2 [ $bottom_right_x ] + Parameter #3 [ $bottom_right_y ] } } - Method [ public method roundrectangle ] { + Method [ public method roundRectangle ] { - Parameters [6] { - Parameter #0 [ $x1 ] - Parameter #1 [ $y1 ] - Parameter #2 [ $x2 ] - Parameter #3 [ $y2 ] - Parameter #4 [ $rx ] - Parameter #5 [ $ry ] + Parameter #0 [ $top_left_x ] + Parameter #1 [ $top_left_y ] + Parameter #2 [ $bottom_right_x ] + Parameter #3 [ $bottom_right_y ] + Parameter #4 [ $rounding_x ] + Parameter #5 [ $rounding_y ] } } Method [ public method ellipse ] { - Parameters [6] { - Parameter #0 [ $ox ] - Parameter #1 [ $oy ] - Parameter #2 [ $px ] - Parameter #3 [ $py ] - Parameter #4 [ $start ] - Parameter #5 [ $end ] + Parameter #0 [ $origin_x ] + Parameter #1 [ $origin_y ] + Parameter #2 [ $radius_x ] + Parameter #3 [ $radius_y ] + Parameter #4 [ $angle_start ] + Parameter #5 [ $angle_end ] } } - Method [ public method skewx ] { + Method [ public method skewX ] { - Parameters [1] { Parameter #0 [ $degrees ] } } - Method [ public method skewy ] { + Method [ public method skewY ] { - Parameters [1] { Parameter #0 [ $degrees ] @@ -3950,22 +3971,22 @@ Extension [ extension #77 imagick version 3.4.4 ] { Method [ public method line ] { - Parameters [4] { - Parameter #0 [ $sx ] - Parameter #1 [ $sy ] - Parameter #2 [ $ex ] - Parameter #3 [ $ey ] + Parameter #0 [ $start_x ] + Parameter #1 [ $start_y ] + Parameter #2 [ $end_x ] + Parameter #3 [ $end_y ] } } Method [ public method arc ] { - Parameters [6] { - Parameter #0 [ $sx ] - Parameter #1 [ $sy ] - Parameter #2 [ $ex ] - Parameter #3 [ $ey ] - Parameter #4 [ $sd ] - Parameter #5 [ $ed ] + Parameter #0 [ $start_x ] + Parameter #1 [ $start_y ] + Parameter #2 [ $end_x ] + Parameter #3 [ $end_y ] + Parameter #4 [ $start_angle ] + Parameter #5 [ $end_angle ] } } @@ -3974,7 +3995,7 @@ Extension [ extension #77 imagick version 3.4.4 ] { - Parameters [3] { Parameter #0 [ $x ] Parameter #1 [ $y ] - Parameter #2 [ $METHOD ] + Parameter #2 [ $paint ] } } @@ -3993,66 +4014,66 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method gettextdecoration ] { + Method [ public method getTextDecoration ] { - Parameters [0] { } } - Method [ public method gettextencoding ] { + Method [ public method getTextEncoding ] { - Parameters [0] { } } - Method [ public method getfontstretch ] { + Method [ public method getFontStretch ] { - Parameters [0] { } } - Method [ public method setfontstretch ] { + Method [ public method setFontStretch ] { - Parameters [1] { - Parameter #0 [ $STRETCH ] + Parameter #0 [ $stretch ] } } - Method [ public method setstrokeantialias ] { + Method [ public method setStrokeAntialias ] { - Parameters [1] { - Parameter #0 [ $antialias ] + Parameter #0 [ $enabled ] } } - Method [ public method settextalignment ] { + Method [ public method setTextAlignment ] { - Parameters [1] { - Parameter #0 [ $ALIGN ] + Parameter #0 [ $align ] } } - Method [ public method settextdecoration ] { + Method [ public method setTextDecoration ] { - Parameters [1] { - Parameter #0 [ $DECORATION ] + Parameter #0 [ $decoration ] } } - Method [ public method settextundercolor ] { + Method [ public method setTextUnderColor ] { - Parameters [1] { - Parameter #0 [ $color ] + Parameter #0 [ $under_color ] } } - Method [ public method setviewbox ] { + Method [ public method setViewbox ] { - Parameters [4] { - Parameter #0 [ $sx ] - Parameter #1 [ $sy ] - Parameter #2 [ $ex ] - Parameter #3 [ $ey ] + Parameter #0 [ $left_x ] + Parameter #1 [ $top_y ] + Parameter #2 [ $right_x ] + Parameter #3 [ $bottom_y ] } } @@ -4065,26 +4086,26 @@ Extension [ extension #77 imagick version 3.4.4 ] { Method [ public method affine ] { - Parameters [1] { - Parameter #0 [ $affineMatrix ] + Parameter #0 [ $affine ] } } Method [ public method bezier ] { - Parameters [1] { - Parameter #0 [ $coordinateArray ] + Parameter #0 [ $coordinates ] } } Method [ public method composite ] { - Parameters [6] { - Parameter #0 [ $COMPOSE ] + Parameter #0 [ $composite ] Parameter #1 [ $x ] Parameter #2 [ $y ] Parameter #3 [ $width ] Parameter #4 [ $height ] - Parameter #5 [ Imagick $Imagick ] + Parameter #5 [ Imagick $image ] } } @@ -4093,7 +4114,7 @@ Extension [ extension #77 imagick version 3.4.4 ] { - Parameters [3] { Parameter #0 [ $x ] Parameter #1 [ $y ] - Parameter #2 [ $PAINTMETHOD ] + Parameter #2 [ $paint ] } } @@ -4104,133 +4125,133 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method getclippath ] { + Method [ public method getClipPath ] { - Parameters [0] { } } - Method [ public method getcliprule ] { + Method [ public method getClipRule ] { - Parameters [0] { } } - Method [ public method getclipunits ] { + Method [ public method getClipUnits ] { - Parameters [0] { } } - Method [ public method getfillcolor ] { + Method [ public method getFillColor ] { - Parameters [0] { } } - Method [ public method getfillopacity ] { + Method [ public method getFillOpacity ] { - Parameters [0] { } } - Method [ public method getfillrule ] { + Method [ public method getFillRule ] { - Parameters [0] { } } - Method [ public method getgravity ] { + Method [ public method getGravity ] { - Parameters [0] { } } - Method [ public method getstrokeantialias ] { + Method [ public method getStrokeAntialias ] { - Parameters [0] { } } - Method [ public method getstrokecolor ] { + Method [ public method getStrokeColor ] { - Parameters [0] { } } - Method [ public method getstrokedasharray ] { + Method [ public method getStrokeDashArray ] { - Parameters [0] { } } - Method [ public method getstrokedashoffset ] { + Method [ public method getStrokeDashOffset ] { - Parameters [0] { } } - Method [ public method getstrokelinecap ] { + Method [ public method getStrokeLineCap ] { - Parameters [0] { } } - Method [ public method getstrokelinejoin ] { + Method [ public method getStrokeLineJoin ] { - Parameters [0] { } } - Method [ public method getstrokemiterlimit ] { + Method [ public method getStrokeMiterLimit ] { - Parameters [0] { } } - Method [ public method getstrokeopacity ] { + Method [ public method getStrokeOpacity ] { - Parameters [0] { } } - Method [ public method getstrokewidth ] { + Method [ public method getStrokeWidth ] { - Parameters [0] { } } - Method [ public method gettextalignment ] { + Method [ public method getTextAlignment ] { - Parameters [0] { } } - Method [ public method gettextantialias ] { + Method [ public method getTextAntialias ] { - Parameters [0] { } } - Method [ public method getvectorgraphics ] { + Method [ public method getVectorGraphics ] { - Parameters [0] { } } - Method [ public method gettextundercolor ] { + Method [ public method getTextUnderColor ] { - Parameters [0] { } } - Method [ public method pathclose ] { + Method [ public method pathClose ] { - Parameters [0] { } } - Method [ public method pathcurvetoabsolute ] { + Method [ public method pathCurveToAbsolute ] { - Parameters [6] { Parameter #0 [ $x1 ] @@ -4242,7 +4263,7 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method pathcurvetorelative ] { + Method [ public method pathCurveToRelative ] { - Parameters [6] { Parameter #0 [ $x1 ] @@ -4254,27 +4275,27 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method pathcurvetoquadraticbezierabsolute ] { + Method [ public method pathCurveToQuadraticBezierAbsolute ] { - Parameters [4] { Parameter #0 [ $x1 ] Parameter #1 [ $y1 ] - Parameter #2 [ $x ] + Parameter #2 [ $x_end ] Parameter #3 [ $y ] } } - Method [ public method pathcurvetoquadraticbezierrelative ] { + Method [ public method pathCurveToQuadraticBezierRelative ] { - Parameters [4] { Parameter #0 [ $x1 ] Parameter #1 [ $y1 ] - Parameter #2 [ $x ] + Parameter #2 [ $x_end ] Parameter #3 [ $y ] } } - Method [ public method pathcurvetoquadraticbeziersmoothabsolute ] { + Method [ public method pathCurveToQuadraticBezierSmoothAbsolute ] { - Parameters [2] { Parameter #0 [ $x ] @@ -4282,7 +4303,7 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method pathcurvetoquadraticbeziersmoothrelative ] { + Method [ public method pathCurveToQuadraticBezierSmoothRelative ] { - Parameters [2] { Parameter #0 [ $x ] @@ -4290,59 +4311,59 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method pathcurvetosmoothabsolute ] { + Method [ public method pathCurveToSmoothAbsolute ] { - Parameters [4] { - Parameter #0 [ $x1 ] - Parameter #1 [ $y1 ] + Parameter #0 [ $x2 ] + Parameter #1 [ $y2 ] Parameter #2 [ $x ] Parameter #3 [ $y ] } } - Method [ public method pathcurvetosmoothrelative ] { + Method [ public method pathCurveToSmoothRelative ] { - Parameters [4] { - Parameter #0 [ $x1 ] - Parameter #1 [ $y1 ] + Parameter #0 [ $x2 ] + Parameter #1 [ $y2 ] Parameter #2 [ $x ] Parameter #3 [ $y ] } } - Method [ public method pathellipticarcabsolute ] { + Method [ public method pathEllipticArcAbsolute ] { - Parameters [7] { Parameter #0 [ $rx ] Parameter #1 [ $ry ] - Parameter #2 [ $xAxisRotation ] - Parameter #3 [ $largeArc ] + Parameter #2 [ $x_axis_rotation ] + Parameter #3 [ $large_arc ] Parameter #4 [ $sweep ] Parameter #5 [ $x ] Parameter #6 [ $y ] } } - Method [ public method pathellipticarcrelative ] { + Method [ public method pathEllipticArcRelative ] { - Parameters [7] { Parameter #0 [ $rx ] Parameter #1 [ $ry ] - Parameter #2 [ $xAxisRotation ] - Parameter #3 [ $largeArc ] + Parameter #2 [ $x_axis_rotation ] + Parameter #3 [ $large_arc ] Parameter #4 [ $sweep ] Parameter #5 [ $x ] Parameter #6 [ $y ] } } - Method [ public method pathfinish ] { + Method [ public method pathFinish ] { - Parameters [0] { } } - Method [ public method pathlinetoabsolute ] { + Method [ public method pathLineToAbsolute ] { - Parameters [2] { Parameter #0 [ $x ] @@ -4350,7 +4371,7 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method pathlinetorelative ] { + Method [ public method pathLineToRelative ] { - Parameters [2] { Parameter #0 [ $x ] @@ -4358,35 +4379,35 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method pathlinetohorizontalabsolute ] { + Method [ public method pathLineToHorizontalAbsolute ] { - Parameters [1] { - Parameter #0 [ $y ] + Parameter #0 [ $x ] } } - Method [ public method pathlinetohorizontalrelative ] { + Method [ public method pathLineToHorizontalRelative ] { - Parameters [1] { Parameter #0 [ $x ] } } - Method [ public method pathlinetoverticalabsolute ] { + Method [ public method pathLineToVerticalAbsolute ] { - Parameters [1] { Parameter #0 [ $y ] } } - Method [ public method pathlinetoverticalrelative ] { + Method [ public method pathLineToVerticalRelative ] { - Parameters [1] { - Parameter #0 [ $x ] + Parameter #0 [ $y ] } } - Method [ public method pathmovetoabsolute ] { + Method [ public method pathMoveToAbsolute ] { - Parameters [2] { Parameter #0 [ $x ] @@ -4394,7 +4415,7 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method pathmovetorelative ] { + Method [ public method pathMoveToRelative ] { - Parameters [2] { Parameter #0 [ $x ] @@ -4402,7 +4423,7 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method pathstart ] { + Method [ public method pathStart ] { - Parameters [0] { } @@ -4411,42 +4432,42 @@ Extension [ extension #77 imagick version 3.4.4 ] { Method [ public method polyline ] { - Parameters [1] { - Parameter #0 [ $coordinateArray ] + Parameter #0 [ $coordinates ] } } - Method [ public method popclippath ] { + Method [ public method popClipPath ] { - Parameters [0] { } } - Method [ public method popdefs ] { + Method [ public method popDefs ] { - Parameters [0] { } } - Method [ public method poppattern ] { + Method [ public method popPattern ] { - Parameters [0] { } } - Method [ public method pushclippath ] { + Method [ public method pushClipPath ] { - Parameters [1] { - Parameter #0 [ $clipMask ] + Parameter #0 [ $clip_mask_id ] } } - Method [ public method pushdefs ] { + Method [ public method pushDefs ] { - Parameters [0] { } } - Method [ public method pushpattern ] { + Method [ public method pushPattern ] { - Parameters [5] { Parameter #0 [ $pattern_id ] @@ -4478,98 +4499,98 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method setclippath ] { + Method [ public method setClipPath ] { - Parameters [1] { - Parameter #0 [ $clipMask ] + Parameter #0 [ $clip_mask ] } } - Method [ public method setcliprule ] { + Method [ public method setClipRule ] { - Parameters [1] { - Parameter #0 [ $FILLRULE ] + Parameter #0 [ $fillrule ] } } - Method [ public method setclipunits ] { + Method [ public method setClipUnits ] { - Parameters [1] { - Parameter #0 [ $PATHUNITS ] + Parameter #0 [ $pathunits ] } } - Method [ public method setfillopacity ] { + Method [ public method setFillOpacity ] { - Parameters [1] { - Parameter #0 [ $fillOpacity ] + Parameter #0 [ $opacity ] } } - Method [ public method setfillpatternurl ] { + Method [ public method setFillPatternUrl ] { - Parameters [1] { - Parameter #0 [ $url ] + Parameter #0 [ $fill_url ] } } - Method [ public method setfillrule ] { + Method [ public method setFillRule ] { - Parameters [1] { - Parameter #0 [ $FILLRULE ] + Parameter #0 [ $fillrule ] } } - Method [ public method setgravity ] { + Method [ public method setGravity ] { - Parameters [1] { - Parameter #0 [ $GRAVITY ] + Parameter #0 [ $gravity ] } } - Method [ public method setstrokepatternurl ] { + Method [ public method setStrokePatternUrl ] { - Parameters [1] { - Parameter #0 [ $url ] + Parameter #0 [ $stroke_url ] } } - Method [ public method setstrokedashoffset ] { + Method [ public method setStrokeDashOffset ] { - Parameters [1] { - Parameter #0 [ $offset ] + Parameter #0 [ $dash_offset ] } } - Method [ public method setstrokelinecap ] { + Method [ public method setStrokeLineCap ] { - Parameters [1] { - Parameter #0 [ $LINECAP ] + Parameter #0 [ $linecap ] } } - Method [ public method setstrokelinejoin ] { + Method [ public method setStrokeLineJoin ] { - Parameters [1] { - Parameter #0 [ $LINEJOIN ] + Parameter #0 [ $linejoin ] } } - Method [ public method setstrokemiterlimit ] { + Method [ public method setStrokeMiterLimit ] { - Parameters [1] { - Parameter #0 [ $miterLimit ] + Parameter #0 [ $miterlimit ] } } - Method [ public method setstrokeopacity ] { + Method [ public method setStrokeOpacity ] { - Parameters [1] { - Parameter #0 [ $strokeOpacity ] + Parameter #0 [ $opacity ] } } - Method [ public method setvectorgraphics ] { + Method [ public method setVectorGraphics ] { - Parameters [1] { Parameter #0 [ $xml ] @@ -4588,33 +4609,33 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method setstrokedasharray ] { + Method [ public method setStrokeDashArray ] { - Parameters [1] { - Parameter #0 [ $dashArray ] + Parameter #0 [ $dashes ] } } - Method [ public method getopacity ] { + Method [ public method getOpacity ] { - Parameters [0] { } } - Method [ public method setopacity ] { + Method [ public method setOpacity ] { - Parameters [1] { Parameter #0 [ $opacity ] } } - Method [ public method getfontresolution ] { + Method [ public method getFontResolution ] { - Parameters [0] { } } - Method [ public method setfontresolution ] { + Method [ public method setFontResolution ] { - Parameters [2] { Parameter #0 [ $x ] @@ -4622,39 +4643,39 @@ Extension [ extension #77 imagick version 3.4.4 ] { } } - Method [ public method getbordercolor ] { + Method [ public method getBorderColor ] { - Parameters [0] { } } - Method [ public method setbordercolor ] { + Method [ public method setBorderColor ] { - Parameters [1] { - Parameter #0 [ $bordercolor ] + Parameter #0 [ $color ] } } - Method [ public method setdensity ] { + Method [ public method setDensity ] { - Parameters [1] { Parameter #0 [ $density ] } } - Method [ public method getdensity ] { + Method [ public method getDensity ] { - Parameters [0] { } } - Method [ public method gettextdirection ] { + Method [ public method getTextDirection ] { - Parameters [0] { } } - Method [ public method settextdirection ] { + Method [ public method setTextDirection ] { - Parameters [1] { Parameter #0 [ $direction ] @@ -4672,17 +4693,17 @@ Extension [ extension #77 imagick version 3.4.4 ] { } - Static methods [2] { - Method [ static public method getpixeliterator ] { + Method [ static public method getPixelIterator ] { - Parameters [1] { - Parameter #0 [ Imagick $Imagick ] + Parameter #0 [ Imagick $imagick ] } } - Method [ static public method getpixelregioniterator ] { + Method [ static public method getPixelRegionIterator ] { - Parameters [5] { - Parameter #0 [ Imagick $Imagick ] + Parameter #0 [ Imagick $imagick ] Parameter #1 [ $x ] Parameter #2 [ $y ] Parameter #3 [ $columns ] @@ -4698,108 +4719,114 @@ Extension [ extension #77 imagick version 3.4.4 ] { Method [ public method __construct ] { - Parameters [1] { - Parameter #0 [ Imagick $Imagick ] + Parameter #0 [ Imagick $imagick ] } } - Method [ public method newpixeliterator ] { + Method [ public method clear ] { - Parameters [0] { } } - Method [ public method newpixelregioniterator ] { + Method [ public method destroy ] { - Parameters [0] { } } - Method [ public method getiteratorrow ] { + Method [ public method getCurrentIteratorRow ] { - Parameters [0] { } } - Method [ public method setiteratorrow ] { + Method [ public method getIteratorRow ] { - - Parameters [1] { - Parameter #0 [ $row ] + - Parameters [0] { } } - Method [ public method setiteratorfirstrow ] { + Method [ public method getNextIteratorRow ] { - Parameters [0] { } } - Method [ public method setiteratorlastrow ] { + Method [ public method getPreviousIteratorRow ] { - Parameters [0] { } } - Method [ public method getpreviousiteratorrow ] { + Method [ public method key ] { - Parameters [0] { } } - Method [ public method getcurrentiteratorrow ] { + Method [ public method next ] { - Parameters [0] { } } - Method [ public method getnextiteratorrow ] { + Method [ public method rewind ] { - Parameters [0] { } } - Method [ public method resetiterator ] { + Method [ public method current ] { - Parameters [0] { } } - Method [ public method synciterator ] { + Method [ public method newPixelIterator ] { - - Parameters [0] { + - Parameters [1] { + Parameter #0 [ Imagick $imagick ] } } - Method [ public method destroy ] { + Method [ public method newPixelRegionIterator ] { - - Parameters [0] { + - Parameters [5] { + Parameter #0 [ Imagick $imagick ] + Parameter #1 [ $x ] + Parameter #2 [ $y ] + Parameter #3 [ $columns ] + Parameter #4 [ $rows ] } } - Method [ public method clear ] { + Method [ public method resetIterator ] { - Parameters [0] { } } - Method [ public method key ] { + Method [ public method setIteratorFirstRow ] { - Parameters [0] { } } - Method [ public method next ] { + Method [ public method setIteratorLastRow ] { - Parameters [0] { } } - Method [ public method rewind ] { + Method [ public method setIteratorRow ] { - - Parameters [0] { + - Parameters [1] { + Parameter #0 [ $row ] } } - Method [ public method current ] { + Method [ public method syncIterator ] { - Parameters [0] { } @@ -4827,156 +4854,151 @@ Extension [ extension #77 imagick version 3.4.4 ] { - Properties [0] { } - - Methods [22] { - Method [ public method gethsl ] { + - Methods [21] { + Method [ public method __construct ] { - - Parameters [0] { + - Parameters [1] { + Parameter #0 [ $color ] } } - Method [ public method sethsl ] { + Method [ public method clear ] { - - Parameters [3] { - Parameter #0 [ $hue ] - Parameter #1 [ $saturation ] - Parameter #2 [ $luminosity ] + - Parameters [0] { } } - Method [ public method getcolorvaluequantum ] { + Method [ public method destroy ] { - - Parameters [1] { - Parameter #0 [ $color ] + - Parameters [0] { } } - Method [ public method setcolorvaluequantum ] { + Method [ public method getColor ] { - Parameters [1] { - Parameter #0 [ $color_value ] + Parameter #0 [ $normalized ] } } - Method [ public method getindex ] { + Method [ public method getColorAsString ] { - Parameters [0] { } } - Method [ public method setindex ] { + Method [ public method getColorCount ] { - - Parameters [1] { - Parameter #0 [ $index ] + - Parameters [0] { } } - Method [ public method __construct ] { + Method [ public method getColorQuantum ] { - - Parameters [1] { - Parameter #0 [ $color ] + - Parameters [0] { } } - Method [ public method setcolor ] { + Method [ public method getColorValue ] { - Parameters [1] { - Parameter #0 [ $color ] - } - } - - Method [ public method setcolorvalue ] { - - - Parameters [2] { - Parameter #0 [ $color ] - Parameter #1 [ $value ] + Parameter #0 [ $color ] } } - Method [ public method getcolorvalue ] { + Method [ public method getColorValueQuantum ] { - Parameters [1] { - Parameter #0 [ $color ] + Parameter #0 [ $color ] } } - Method [ public method clear ] { + Method [ public method getHSL ] { - Parameters [0] { } } - Method [ public method destroy ] { + Method [ public method getIndex ] { - Parameters [0] { } } - Method [ public method issimilar ] { + Method [ public method isPixelSimilar ] { - Parameters [2] { Parameter #0 [ $color ] - Parameter #1 [ $fuzz ] + Parameter #1 [ $fuzz ] } } - Method [ public method ispixelsimilarquantum ] { + Method [ public method isPixelSimilarQuantum ] { - Parameters [2] { Parameter #0 [ $color ] - Parameter #1 [ $fuzz ] + Parameter #1 [ $fuzz_quantum_range_scaled_by_square_root_of_three ] } } - Method [ public method ispixelsimilar ] { + Method [ public method isSimilar ] { - Parameters [2] { Parameter #0 [ $color ] - Parameter #1 [ $fuzz ] + Parameter #1 [ $fuzz_quantum_range_scaled_by_square_root_of_three ] } } - Method [ public method getcolor ] { + Method [ public method setColor ] { - Parameters [1] { - Parameter #0 [ $normalized ] + Parameter #0 [ $color ] } } - Method [ public method getcolorquantum ] { + Method [ public method setColorCount ] { - - Parameters [0] { + - Parameters [1] { + Parameter #0 [ $color_count ] } } - Method [ public method getcolorasstring ] { + Method [ public method setColorValue ] { - - Parameters [0] { + - Parameters [2] { + Parameter #0 [ $color ] + Parameter #1 [ $value ] } } - Method [ public method getcolorcount ] { + Method [ public method setColorValueQuantum ] { - - Parameters [0] { + - Parameters [2] { + Parameter #0 [ $color ] + Parameter #1 [ $value ] } } - Method [ public method setcolorcount ] { + Method [ public method setHSL ] { - - Parameters [1] { - Parameter #0 [ $colorCount ] + - Parameters [3] { + Parameter #0 [ $hue ] + Parameter #1 [ $saturation ] + Parameter #2 [ $luminosity ] } } - Method [ public method clone ] { + Method [ public method setIndex ] { - - Parameters [0] { + - Parameters [1] { + Parameter #0 [ $index ] } } - Method [ public method setcolorfrompixel ] { + Method [ public method setColorFromPixel ] { - Parameters [1] { - Parameter #0 [ ImagickPixel $srcPixel ] + Parameter #0 [ ImagickPixel $pixel ] } } } @@ -4991,19 +5013,19 @@ Extension [ extension #77 imagick version 3.4.4 ] { } - Static methods [2] { - Method [ static public method frommatrix ] { + Method [ static public method fromBuiltin ] { - Parameters [2] { - Parameter #0 [ $array ] - Parameter #1 [ $array ] + Parameter #0 [ $kernel ] + Parameter #1 [ $shape ] } } - Method [ static public method frombuiltin ] { + Method [ static public method fromMatrix ] { - Parameters [2] { - Parameter #0 [ $kerneltype ] - Parameter #1 [ $paramstring ] + Parameter #0 [ $matrix ] + Parameter #1 [ $origin ] } } } @@ -5011,27 +5033,22 @@ Extension [ extension #77 imagick version 3.4.4 ] { - Properties [0] { } - - Methods [6] { - Method [ private method __construct ] { - - - Parameters [0] { - } - } - - Method [ public method addkernel ] { + - Methods [5] { + Method [ public method addKernel ] { - Parameters [1] { - Parameter #0 [ ImagickKernel $ImagickKernel ] + Parameter #0 [ ImagickKernel $kernel ] } } - Method [ public method getmatrix ] { + Method [ public method addUnityKernel ] { - - Parameters [0] { + - Parameters [1] { + Parameter #0 [ $scale ] } } - Method [ public method separate ] { + Method [ public method getMatrix ] { - Parameters [0] { } @@ -5041,14 +5058,13 @@ Extension [ extension #77 imagick version 3.4.4 ] { - Parameters [2] { Parameter #0 [ $scale ] - Parameter #1 [ $normalize_flag ] + Parameter #1 [ $normalize_kernel ] } } - Method [ public method addunitykernel ] { + Method [ public method separate ] { - - Parameters [1] { - Parameter #0 [ $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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 -@@ -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-- - 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-- - - --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-- - - --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-- - 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-- - 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-- - 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-- - 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-- - 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-- - 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-- - 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-- - 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-- - 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-- - 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-- - 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-- - 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-- - - --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-- - 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-- - 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-- - 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-- -+ -+--FILE-- -+ -+--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-- -+ -+--FILE-- -+ -+--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-- -+ -+--FILE-- -+ -+--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-- -+ -+--FILE-- -+ -+--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-- -+ -+--FILE-- -+ -+--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 -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 -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 -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 -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 -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 -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 -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 -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 - 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 - 3.4.4-18 - add patches for PHP 8.1 from upstream and from https://github.com/Imagick/imagick/pull/413 -- cgit