From 9602d4c228eaed59d20de94e809ff3827f1e6602 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 25 Jan 2021 08:08:55 +0100 Subject: [PATCH 1/6] fix [-Wmisleading-indentation] --- gmagick_methods.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gmagick_methods.c b/gmagick_methods.c index 39c48a4..d2b95a5 100644 --- a/gmagick_methods.c +++ b/gmagick_methods.c @@ -4546,7 +4546,7 @@ PHP_METHOD(gmagick, unsharpmaskimage) if (php_gmagick_ensure_not_empty (intern->magick_wand) == 0) return; - status = MagickUnsharpMaskImage(intern->magick_wand, radius, sigma, amount, threshold); + status = MagickUnsharpMaskImage(intern->magick_wand, radius, sigma, amount, threshold); if (status == MagickFalse) { GMAGICK_THROW_GMAGICK_EXCEPTION(intern->magick_wand, "Unable to unsharp mask image"); From feb41650a583f3fa625e4e69493209b10d69f45b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 25 Jan 2021 08:11:45 +0100 Subject: [PATCH 2/6] fix [-Wformat=] --- gmagickpixel_methods.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gmagickpixel_methods.c b/gmagickpixel_methods.c index 88d8fb2..121a8fb 100644 --- a/gmagickpixel_methods.c +++ b/gmagickpixel_methods.c @@ -330,7 +330,7 @@ PHP_METHOD(gmagickpixel, getcolorvaluequantum) break; default: - zend_throw_exception_ex(php_gmagickpixel_exception_class_entry, 2 TSRMLS_CC, "Unknown color type: %d", color_quantum); + zend_throw_exception_ex(php_gmagickpixel_exception_class_entry, 2 TSRMLS_CC, "Unknown color type: " ZEND_LONG_FMT, color_quantum); RETURN_NULL(); } RETVAL_LONG(color_value_quantum); @@ -391,10 +391,10 @@ PHP_METHOD(gmagickpixel, setcolorvaluequantum) break; default: - zend_throw_exception_ex(php_gmagickpixel_exception_class_entry, 2 TSRMLS_CC, "Unknown color type: %d", color_quantum); + zend_throw_exception_ex(php_gmagickpixel_exception_class_entry, 2 TSRMLS_CC, "Unknown color type: " ZEND_LONG_FMT, color_quantum); RETURN_NULL(); } GMAGICK_CHAIN_METHOD; } -/* }}} */ \ No newline at end of file +/* }}} */ From 59f93c789f2a96c433e4ee5f47c7375451e66c4d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 25 Jan 2021 08:14:49 +0100 Subject: [PATCH 3/6] fix [-Wunused-const-variable=] --- gmagick.c | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/gmagick.c b/gmagick.c index 67256ec..158117c 100644 --- a/gmagick.c +++ b/gmagick.c @@ -576,12 +576,6 @@ ZEND_BEGIN_ARG_INFO_EX(gmagick_newimage_args, 0, 0, 3) ZEND_ARG_INFO(0, format) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(gmagick_newpseudoimage_args, 0, 0, 3) - ZEND_ARG_INFO(0, columns) - ZEND_ARG_INFO(0, rows) - ZEND_ARG_INFO(0, pseudoString) -ZEND_END_ARG_INFO() - ZEND_BEGIN_ARG_INFO_EX(gmagick_getresourcelimit_args, 0, 0, 1) ZEND_ARG_INFO(0, resource_type) ZEND_END_ARG_INFO() @@ -595,14 +589,6 @@ ZEND_BEGIN_ARG_INFO_EX(gmagick_normalizeimage_args, 0, 0, 0) ZEND_ARG_INFO(0, CHANNEL) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(gmagick_oilpaintimage_args, 0, 0, 1) - ZEND_ARG_INFO(0, radius) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(gmagick_previewimages_args, 0, 0, 1) - ZEND_ARG_INFO(0, PREVIEW) -ZEND_END_ARG_INFO() - ZEND_BEGIN_ARG_INFO_EX(gmagick_profileimage_args, 0, 0, 2) ZEND_ARG_INFO(0, name) ZEND_ARG_INFO(0, profile) @@ -624,10 +610,6 @@ ZEND_BEGIN_ARG_INFO_EX(gmagick_quantizeimages_args, 0, 0, 5) ZEND_ARG_INFO(0, measureError) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(gmagick_queryfonts_args, 0, 0, 1) - ZEND_ARG_INFO(0, pattern) -ZEND_END_ARG_INFO() - ZEND_BEGIN_ARG_INFO_EX(gmagick_queryfontmetrics_args, 0, 0, 2) ZEND_ARG_OBJ_INFO(0, GmagickDraw, GmagickDraw, 0) ZEND_ARG_INFO(0, text) @@ -725,11 +707,6 @@ ZEND_BEGIN_ARG_INFO_EX(gmagick_whitethresholdimage_args, 0, 0, 1) ZEND_ARG_INFO(0, color) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(gmagick_writeimages_args, 0, 0, 2) - ZEND_ARG_INFO(0, filename) - ZEND_ARG_INFO(0, adjoin) -ZEND_END_ARG_INFO() - ZEND_BEGIN_ARG_INFO_EX(gmagick_sampleimage_args, 0, 0, 2) ZEND_ARG_INFO(0, columns) ZEND_ARG_INFO(0, rows) From fa7ae4843818fd752466c60a8574bbe7e3a4292b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 25 Jan 2021 12:52:58 +0100 Subject: [PATCH 5/6] Fix error: 'i' undeclared --- gmagick.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gmagick.c b/gmagick.c index 158117c..60bbc07 100644 --- a/gmagick.c +++ b/gmagick.c @@ -1753,6 +1753,10 @@ PHP_MINIT_FUNCTION(gmagick) */ PHP_MSHUTDOWN_FUNCTION(gmagick) { +#ifndef HAVE_OMP_PAUSE_RESOURCE_ALL + int i; +#endif + DestroyMagick(); #if HAVE_OMP_PAUSE_RESOURCE_ALL // Note there is a patch to add omp_pause_resource_all to DestroyMagick() From 759eb6277f49c122178cea9f78cd41b349c78fff Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 25 Jan 2021 13:57:28 +0100 Subject: [PATCH 6/6] AC_COMPILE_IFELSE instead of AC_CHECH_FUNC --- config.m4 | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/config.m4 b/config.m4 index 8bd545a..6f76fd6 100644 --- a/config.m4 +++ b/config.m4 @@ -30,7 +30,19 @@ if test $PHP_GMAGICK != "no"; then AC_MSG_CHECKING(GraphicsMagick version mask) AC_MSG_RESULT(found version $GRAPHICSMAGICK_VERSION_MASK) - 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) + ]) LIB_DIR=$WAND_DIR/lib # If "$LIB_DIR" == "/usr/lib" or possible /usr/$PHP_LIBDIR" then you're probably