From: Remi Collet Date: Sat, 10 Oct 2020 12:47:15 +0200 Subject: add patches for PHP 8 from upstream --- imagick-3.4.4+php8.0/imagick.c | 161 +++++++++++++++++++-- imagick-3.4.4+php8.0/imagick_class.c | 31 ++++ imagick-3.4.4+php8.0/imagick_helpers.c | 11 +- imagick-3.4.4+php8.0/imagickkernel_class.c | 8 + imagick-3.4.4+php8.0/php_imagick_defs.h | 25 ++++ .../tests/034_Imagick_annotateImage_basic.phpt | 4 + .../tests/047_Imagick_convolveImage_6.phpt | 2 +- .../tests/097_Imagick_newPseudoImage_basic.phpt | 4 +- .../098_Imagick_orderedPosterizeImage_basic.phpt | 2 +- .../tests/102_Imagick_radialBlurImage_basic.phpt | 6 +- .../tests/112_Imagick_roundCorners_basic.phpt | 2 +- .../tests/121_Imagick_setImageBias_basic.phpt | 2 +- .../tests/123_Imagick_setImageClipMask_basic.phpt | 2 +- .../tests/151_Imagick_subImageMatch_basic.phpt | 2 +- .../tests/159_Imagick_transformImage_basic.phpt | 2 +- .../tests/177_ImagickDraw_composite_basic.phpt | 4 + .../tests/180_ImagickDraw_matte_basic.phpt | 2 +- .../tests/206_ImagickDraw_setFontSize_basic.phpt | 4 + .../tests/207_ImagickDraw_setFontFamily_basic.phpt | 3 + .../208_ImagickDraw_setFontStretch_basic.phpt | 3 + .../tests/209_ImagickDraw_setFontWeight_basic.phpt | 3 + .../tests/210_ImagickDraw_setFontStyle_basic.phpt | 4 + .../tests/212_ImagickDraw_setGravity_basic.phpt | 3 + .../222_ImagickDraw_setTextAlignment_basic.phpt | 3 + .../223_ImagickDraw_setTextAntialias_basic.phpt | 3 + .../224_ImagickDraw_setTextUnderColor_basic.phpt | 3 + .../225_ImagickDraw_setTextDecoration_basic.phpt | 3 + .../tests/241_Tutorial_psychedelicFont_basic.phpt | 2 + .../244_Tutorial_psychedelicFontGif_basic.phpt | 2 + .../tests/256_Imagick_exportImagePixels_basic.phpt | 2 +- .../264_ImagickDraw_getTextDirection_basic.phpt | 3 + .../266_ImagickDraw_getFontResolution_basic.phpt | 4 +- .../tests/274_imagick_setImageAlpha.phpt | 44 +++++- .../279_ImagickDraw_setTextInterlineSpacing.phpt | 2 + .../tests/281_ini_settings_default.phpt | 29 ++++ .../tests/282_ini_settings_set_falsy_string.phpt | 41 ++++++ .../tests/283_ini_settings_set_falsy_zero.phpt | 33 +++++ .../tests/284_ini_settings_set_truthy_number.phpt | 33 +++++ .../tests/285_ini_settings_set_truthy_string.phpt | 33 +++++ imagick-3.4.4+php8.0/tests/bug20636.phpt | 2 +- imagick-3.4.4+php8.0/tests/functions.inc | 47 ++++++ 41 files changed, 543 insertions(+), 36 deletions(-) create mode 100644 imagick-3.4.4+php8.0/tests/281_ini_settings_default.phpt create mode 100644 imagick-3.4.4+php8.0/tests/282_ini_settings_set_falsy_string.phpt create mode 100644 imagick-3.4.4+php8.0/tests/283_ini_settings_set_falsy_zero.phpt create mode 100644 imagick-3.4.4+php8.0/tests/284_ini_settings_set_truthy_number.phpt create mode 100644 imagick-3.4.4+php8.0/tests/285_ini_settings_set_truthy_string.phpt diff --git a/imagick-3.4.4+php8.0/imagick.c b/imagick-3.4.4+php8.0/imagick.c index d9dec77..0c03cda 100644 --- a/imagick-3.4.4+php8.0/imagick.c +++ b/imagick-3.4.4+php8.0/imagick.c @@ -38,7 +38,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; @@ -427,6 +431,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) @@ -2410,6 +2422,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 @@ -2439,7 +2454,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 @@ -2655,7 +2670,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 @@ -3260,6 +3275,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", "1", 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) @@ -3267,12 +3286,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 = 1; + 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); @@ -3281,6 +3309,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) { @@ -3432,7 +3525,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) @@ -3440,7 +3537,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); @@ -3464,7 +3565,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) @@ -3472,7 +3575,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); @@ -3492,7 +3599,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) @@ -3500,7 +3610,13 @@ 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); @@ -3522,7 +3638,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) @@ -3531,7 +3650,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); @@ -3742,6 +3866,10 @@ PHP_MINIT_FUNCTION(imagick) checkImagickVersion(); } + if (IMAGICK_G(set_single_thread)) { + MagickSetResourceLimit(ThreadResource, 1); + } + return SUCCESS; } @@ -3818,12 +3946,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-3.4.4+php8.0/imagick_class.c b/imagick-3.4.4+php8.0/imagick_class.c index 164406a..3b041c5 100644 --- a/imagick-3.4.4+php8.0/imagick_class.c +++ b/imagick-3.4.4+php8.0/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-3.4.4+php8.0/imagick_helpers.c b/imagick-3.4.4+php8.0/imagick_helpers.c index 3d90aac..a85f72e 100644 --- a/imagick-3.4.4+php8.0/imagick_helpers.c +++ b/imagick-3.4.4+php8.0/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/imagick-3.4.4+php8.0/imagickkernel_class.c b/imagick-3.4.4+php8.0/imagickkernel_class.c index 7504d29..9cfc581 100644 --- a/imagick-3.4.4+php8.0/imagickkernel_class.c +++ b/imagick-3.4.4+php8.0/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/imagick-3.4.4+php8.0/php_imagick_defs.h b/imagick-3.4.4+php8.0/php_imagick_defs.h index 5eb57e5..dd16896 100644 --- a/imagick-3.4.4+php8.0/php_imagick_defs.h +++ b/imagick-3.4.4+php8.0/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/imagick-3.4.4+php8.0/tests/034_Imagick_annotateImage_basic.phpt b/imagick-3.4.4+php8.0/tests/034_Imagick_annotateImage_basic.phpt index a03878c..b7b0be9 100644 --- a/imagick-3.4.4+php8.0/tests/034_Imagick_annotateImage_basic.phpt +++ b/imagick-3.4.4+php8.0/tests/034_Imagick_annotateImage_basic.phpt @@ -9,6 +9,8 @@ require_once(dirname(__FILE__) . '/skipif.inc'); --FILE-- annotateimage($draw, 40, 40, 0, $text); $bytes = $imagick->getImageBlob(); diff --git a/imagick-3.4.4+php8.0/tests/047_Imagick_convolveImage_6.phpt b/imagick-3.4.4+php8.0/tests/047_Imagick_convolveImage_6.phpt index 0bca35f..1a4cb41 100644 --- a/imagick-3.4.4+php8.0/tests/047_Imagick_convolveImage_6.phpt +++ b/imagick-3.4.4+php8.0/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/imagick-3.4.4+php8.0/tests/097_Imagick_newPseudoImage_basic.phpt b/imagick-3.4.4+php8.0/tests/097_Imagick_newPseudoImage_basic.phpt index 5b22164..fbb87ef 100644 --- a/imagick-3.4.4+php8.0/tests/097_Imagick_newPseudoImage_basic.phpt +++ b/imagick-3.4.4+php8.0/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/imagick-3.4.4+php8.0/tests/098_Imagick_orderedPosterizeImage_basic.phpt b/imagick-3.4.4+php8.0/tests/098_Imagick_orderedPosterizeImage_basic.phpt index e53ecb5..87192c5 100644 --- a/imagick-3.4.4+php8.0/tests/098_Imagick_orderedPosterizeImage_basic.phpt +++ b/imagick-3.4.4+php8.0/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/imagick-3.4.4+php8.0/tests/102_Imagick_radialBlurImage_basic.phpt b/imagick-3.4.4+php8.0/tests/102_Imagick_radialBlurImage_basic.phpt index bfcce5e..9820957 100644 --- a/imagick-3.4.4+php8.0/tests/102_Imagick_radialBlurImage_basic.phpt +++ b/imagick-3.4.4+php8.0/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/imagick-3.4.4+php8.0/tests/112_Imagick_roundCorners_basic.phpt b/imagick-3.4.4+php8.0/tests/112_Imagick_roundCorners_basic.phpt index cdf026f..98c798f 100644 --- a/imagick-3.4.4+php8.0/tests/112_Imagick_roundCorners_basic.phpt +++ b/imagick-3.4.4+php8.0/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/imagick-3.4.4+php8.0/tests/121_Imagick_setImageBias_basic.phpt b/imagick-3.4.4+php8.0/tests/121_Imagick_setImageBias_basic.phpt index 2ceab20..662a439 100644 --- a/imagick-3.4.4+php8.0/tests/121_Imagick_setImageBias_basic.phpt +++ b/imagick-3.4.4+php8.0/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/imagick-3.4.4+php8.0/tests/123_Imagick_setImageClipMask_basic.phpt b/imagick-3.4.4+php8.0/tests/123_Imagick_setImageClipMask_basic.phpt index 7844fa7..a1620ba 100644 --- a/imagick-3.4.4+php8.0/tests/123_Imagick_setImageClipMask_basic.phpt +++ b/imagick-3.4.4+php8.0/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/imagick-3.4.4+php8.0/tests/151_Imagick_subImageMatch_basic.phpt b/imagick-3.4.4+php8.0/tests/151_Imagick_subImageMatch_basic.phpt index 491bb79..f11884f 100644 --- a/imagick-3.4.4+php8.0/tests/151_Imagick_subImageMatch_basic.phpt +++ b/imagick-3.4.4+php8.0/tests/151_Imagick_subImageMatch_basic.phpt @@ -2,7 +2,7 @@ Test Imagick, subImageMatch --SKIPIF-- --FILE-- diff --git a/imagick-3.4.4+php8.0/tests/159_Imagick_transformImage_basic.phpt b/imagick-3.4.4+php8.0/tests/159_Imagick_transformImage_basic.phpt index d3764c9..cf90987 100644 --- a/imagick-3.4.4+php8.0/tests/159_Imagick_transformImage_basic.phpt +++ b/imagick-3.4.4+php8.0/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/imagick-3.4.4+php8.0/tests/177_ImagickDraw_composite_basic.phpt b/imagick-3.4.4+php8.0/tests/177_ImagickDraw_composite_basic.phpt index 3c87524..00bd1a3 100644 --- a/imagick-3.4.4+php8.0/tests/177_ImagickDraw_composite_basic.phpt +++ b/imagick-3.4.4+php8.0/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/imagick-3.4.4+php8.0/tests/180_ImagickDraw_matte_basic.phpt b/imagick-3.4.4+php8.0/tests/180_ImagickDraw_matte_basic.phpt index 88befea..b2ea71a 100644 --- a/imagick-3.4.4+php8.0/tests/180_ImagickDraw_matte_basic.phpt +++ b/imagick-3.4.4+php8.0/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/imagick-3.4.4+php8.0/tests/206_ImagickDraw_setFontSize_basic.phpt b/imagick-3.4.4+php8.0/tests/206_ImagickDraw_setFontSize_basic.phpt index b964b30..390f8b3 100644 --- a/imagick-3.4.4+php8.0/tests/206_ImagickDraw_setFontSize_basic.phpt +++ b/imagick-3.4.4+php8.0/tests/206_ImagickDraw_setFontSize_basic.phpt @@ -9,6 +9,8 @@ require_once(dirname(__FILE__) . '/skipif.inc'); --FILE-- setStrokeOpacity(1); $draw->setStrokeColor($strokeColor); $draw->setFillColor($fillColor); diff --git a/imagick-3.4.4+php8.0/tests/207_ImagickDraw_setFontFamily_basic.phpt b/imagick-3.4.4+php8.0/tests/207_ImagickDraw_setFontFamily_basic.phpt index 0e2c147..ca4d59c 100644 --- a/imagick-3.4.4+php8.0/tests/207_ImagickDraw_setFontFamily_basic.phpt +++ b/imagick-3.4.4+php8.0/tests/207_ImagickDraw_setFontFamily_basic.phpt @@ -9,6 +9,8 @@ require_once(dirname(__FILE__) . '/skipif.inc'); --FILE-- setStrokeColor($strokeColor); $draw->setFillColor($fillColor); diff --git a/imagick-3.4.4+php8.0/tests/209_ImagickDraw_setFontWeight_basic.phpt b/imagick-3.4.4+php8.0/tests/209_ImagickDraw_setFontWeight_basic.phpt index cd63dbe..ff7ecda 100644 --- a/imagick-3.4.4+php8.0/tests/209_ImagickDraw_setFontWeight_basic.phpt +++ b/imagick-3.4.4+php8.0/tests/209_ImagickDraw_setFontWeight_basic.phpt @@ -9,6 +9,8 @@ require_once(dirname(__FILE__) . '/skipif.inc'); --FILE-- setStrokeColor($strokeColor); $draw->setFillColor($fillColor); diff --git a/imagick-3.4.4+php8.0/tests/210_ImagickDraw_setFontStyle_basic.phpt b/imagick-3.4.4+php8.0/tests/210_ImagickDraw_setFontStyle_basic.phpt index f5f5373..b8ecd2e 100644 --- a/imagick-3.4.4+php8.0/tests/210_ImagickDraw_setFontStyle_basic.phpt +++ b/imagick-3.4.4+php8.0/tests/210_ImagickDraw_setFontStyle_basic.phpt @@ -9,12 +9,16 @@ require_once(dirname(__FILE__) . '/skipif.inc'); --FILE-- setStrokeColor($strokeColor); $draw->setFillColor($fillColor); $draw->setStrokeWidth(1); diff --git a/imagick-3.4.4+php8.0/tests/212_ImagickDraw_setGravity_basic.phpt b/imagick-3.4.4+php8.0/tests/212_ImagickDraw_setGravity_basic.phpt index ea2cc0c..48ae14b 100644 --- a/imagick-3.4.4+php8.0/tests/212_ImagickDraw_setGravity_basic.phpt +++ b/imagick-3.4.4+php8.0/tests/212_ImagickDraw_setGravity_basic.phpt @@ -9,6 +9,8 @@ require_once(dirname(__FILE__) . '/skipif.inc'); --FILE-- setStrokeColor($strokeColor); $draw->setFillColor($fillColor); $draw->setStrokeWidth(1); diff --git a/imagick-3.4.4+php8.0/tests/222_ImagickDraw_setTextAlignment_basic.phpt b/imagick-3.4.4+php8.0/tests/222_ImagickDraw_setTextAlignment_basic.phpt index 1f6978f..2a9a3f3 100644 --- a/imagick-3.4.4+php8.0/tests/222_ImagickDraw_setTextAlignment_basic.phpt +++ b/imagick-3.4.4+php8.0/tests/222_ImagickDraw_setTextAlignment_basic.phpt @@ -9,12 +9,15 @@ require_once(dirname(__FILE__) . '/skipif.inc'); --FILE-- setStrokeColor($strokeColor); $draw->setFillColor($fillColor); $draw->setStrokeWidth(1); diff --git a/imagick-3.4.4+php8.0/tests/223_ImagickDraw_setTextAntialias_basic.phpt b/imagick-3.4.4+php8.0/tests/223_ImagickDraw_setTextAntialias_basic.phpt index 0273cb0..714c8d9 100644 --- a/imagick-3.4.4+php8.0/tests/223_ImagickDraw_setTextAntialias_basic.phpt +++ b/imagick-3.4.4+php8.0/tests/223_ImagickDraw_setTextAntialias_basic.phpt @@ -9,6 +9,8 @@ require_once(dirname(__FILE__) . '/skipif.inc'); --FILE-- setStrokeColor('none'); $draw->setFillColor($fillColor); $draw->setStrokeWidth(1); diff --git a/imagick-3.4.4+php8.0/tests/224_ImagickDraw_setTextUnderColor_basic.phpt b/imagick-3.4.4+php8.0/tests/224_ImagickDraw_setTextUnderColor_basic.phpt index 11ddbe6..d43870d 100644 --- a/imagick-3.4.4+php8.0/tests/224_ImagickDraw_setTextUnderColor_basic.phpt +++ b/imagick-3.4.4+php8.0/tests/224_ImagickDraw_setTextUnderColor_basic.phpt @@ -9,6 +9,8 @@ require_once(dirname(__FILE__) . '/skipif.inc'); --FILE-- setStrokeColor($strokeColor); $draw->setFillColor($fillColor); diff --git a/imagick-3.4.4+php8.0/tests/225_ImagickDraw_setTextDecoration_basic.phpt b/imagick-3.4.4+php8.0/tests/225_ImagickDraw_setTextDecoration_basic.phpt index 9cf35c2..f1cd442 100644 --- a/imagick-3.4.4+php8.0/tests/225_ImagickDraw_setTextDecoration_basic.phpt +++ b/imagick-3.4.4+php8.0/tests/225_ImagickDraw_setTextDecoration_basic.phpt @@ -9,6 +9,8 @@ require_once(dirname(__FILE__) . '/skipif.inc'); --FILE-- setStrokeColor($strokeColor); $draw->setFillColor($fillColor); diff --git a/imagick-3.4.4+php8.0/tests/241_Tutorial_psychedelicFont_basic.phpt b/imagick-3.4.4+php8.0/tests/241_Tutorial_psychedelicFont_basic.phpt index 1365c38..8eeb891 100644 --- a/imagick-3.4.4+php8.0/tests/241_Tutorial_psychedelicFont_basic.phpt +++ b/imagick-3.4.4+php8.0/tests/241_Tutorial_psychedelicFont_basic.phpt @@ -9,9 +9,11 @@ require_once(dirname(__FILE__) . '/skipif.inc'); --FILE-- setStrokeOpacity(1); diff --git a/imagick-3.4.4+php8.0/tests/244_Tutorial_psychedelicFontGif_basic.phpt b/imagick-3.4.4+php8.0/tests/244_Tutorial_psychedelicFontGif_basic.phpt index 26adf1d..894d031 100644 --- a/imagick-3.4.4+php8.0/tests/244_Tutorial_psychedelicFontGif_basic.phpt +++ b/imagick-3.4.4+php8.0/tests/244_Tutorial_psychedelicFontGif_basic.phpt @@ -9,6 +9,7 @@ require_once(dirname(__FILE__) . '/skipif.inc'); --FILE-- setStrokeOpacity(1); $draw->setfontsize(150 * $scale); diff --git a/imagick-3.4.4+php8.0/tests/256_Imagick_exportImagePixels_basic.phpt b/imagick-3.4.4+php8.0/tests/256_Imagick_exportImagePixels_basic.phpt index d3eceb5..96a57b9 100644 --- a/imagick-3.4.4+php8.0/tests/256_Imagick_exportImagePixels_basic.phpt +++ b/imagick-3.4.4+php8.0/tests/256_Imagick_exportImagePixels_basic.phpt @@ -2,7 +2,7 @@ Test Imagick, Imagick::exportImagePixels --SKIPIF-- --FILE-- diff --git a/imagick-3.4.4+php8.0/tests/264_ImagickDraw_getTextDirection_basic.phpt b/imagick-3.4.4+php8.0/tests/264_ImagickDraw_getTextDirection_basic.phpt index 9bedacb..330bbc7 100644 --- a/imagick-3.4.4+php8.0/tests/264_ImagickDraw_getTextDirection_basic.phpt +++ b/imagick-3.4.4+php8.0/tests/264_ImagickDraw_getTextDirection_basic.phpt @@ -9,6 +9,8 @@ checkClassMethods('ImagickDraw', array('getTextDirection', 'setTextDirection')); --FILE-- setStrokeColor($strokeColor); $draw->setFillColor($fillColor); diff --git a/imagick-3.4.4+php8.0/tests/266_ImagickDraw_getFontResolution_basic.phpt b/imagick-3.4.4+php8.0/tests/266_ImagickDraw_getFontResolution_basic.phpt index 8efe48b..65e6fc2 100644 --- a/imagick-3.4.4+php8.0/tests/266_ImagickDraw_getFontResolution_basic.phpt +++ b/imagick-3.4.4+php8.0/tests/266_ImagickDraw_getFontResolution_basic.phpt @@ -9,13 +9,15 @@ checkClassMethods('ImagickDraw', array('getFontResolution', 'setFontResolution') --FILE-- setStrokeColor($strokeColor); $draw->setFillColor($fillColor); diff --git a/imagick-3.4.4+php8.0/tests/274_imagick_setImageAlpha.phpt b/imagick-3.4.4+php8.0/tests/274_imagick_setImageAlpha.phpt index 28f1ef1..760f088 100644 --- a/imagick-3.4.4+php8.0/tests/274_imagick_setImageAlpha.phpt +++ b/imagick-3.4.4+php8.0/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/imagick-3.4.4+php8.0/tests/279_ImagickDraw_setTextInterlineSpacing.phpt b/imagick-3.4.4+php8.0/tests/279_ImagickDraw_setTextInterlineSpacing.phpt index 3015eb6..bac275c 100644 --- a/imagick-3.4.4+php8.0/tests/279_ImagickDraw_setTextInterlineSpacing.phpt +++ b/imagick-3.4.4+php8.0/tests/279_ImagickDraw_setTextInterlineSpacing.phpt @@ -24,6 +24,8 @@ foreach ($interlineSpacings as $interlineSpacing) { $draw = new \ImagickDraw(); + setFontForImagickDraw($draw); + $draw->setStrokeColor($strokeColor); $draw->setFillColor($fillColor); diff --git a/imagick-3.4.4+php8.0/tests/281_ini_settings_default.phpt b/imagick-3.4.4+php8.0/tests/281_ini_settings_default.phpt new file mode 100644 index 0000000..e397e98 --- /dev/null +++ b/imagick-3.4.4+php8.0/tests/281_ini_settings_default.phpt @@ -0,0 +1,29 @@ +--TEST-- +OpenMP segfault hacks +--SKIPIF-- + +--FILE-- + +--EXPECTF-- +Complete diff --git a/imagick-3.4.4+php8.0/tests/282_ini_settings_set_falsy_string.phpt b/imagick-3.4.4+php8.0/tests/282_ini_settings_set_falsy_string.phpt new file mode 100644 index 0000000..4ed4f1d --- /dev/null +++ b/imagick-3.4.4+php8.0/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/imagick-3.4.4+php8.0/tests/283_ini_settings_set_falsy_zero.phpt b/imagick-3.4.4+php8.0/tests/283_ini_settings_set_falsy_zero.phpt new file mode 100644 index 0000000..8e41a35 --- /dev/null +++ b/imagick-3.4.4+php8.0/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/imagick-3.4.4+php8.0/tests/284_ini_settings_set_truthy_number.phpt b/imagick-3.4.4+php8.0/tests/284_ini_settings_set_truthy_number.phpt new file mode 100644 index 0000000..fc0a0bb --- /dev/null +++ b/imagick-3.4.4+php8.0/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/imagick-3.4.4+php8.0/tests/285_ini_settings_set_truthy_string.phpt b/imagick-3.4.4+php8.0/tests/285_ini_settings_set_truthy_string.phpt new file mode 100644 index 0000000..c35a213 --- /dev/null +++ b/imagick-3.4.4+php8.0/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/imagick-3.4.4+php8.0/tests/bug20636.phpt b/imagick-3.4.4+php8.0/tests/bug20636.phpt index adba98a..eb64b39 100644 --- a/imagick-3.4.4+php8.0/tests/bug20636.phpt +++ b/imagick-3.4.4+php8.0/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/imagick-3.4.4+php8.0/tests/functions.inc b/imagick-3.4.4+php8.0/tests/functions.inc index f5c1ef1..5fa3d2f 100644 --- a/imagick-3.4.4+php8.0/tests/functions.inc +++ b/imagick-3.4.4+php8.0/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); +}