com php-src: Merge branch 'PHP-7.4': ext/gd/gd.c
| From: | Kalle Sommer Nielsen | Date: | Thu, 09 May 2019 23:24:01 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.4': ext/gd/gd.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-106115@lists.php.net to get a copy of this message | ||
Commit: 569e3381048f3e4201900bb8e92f6f3766861cdb
Author: Kalle Sommer Nielsen <kalle@php.net> Fri, 10 May 2019 02:24:01 +0300
Parents: 34bc920382d849231fd29e8abcfe256ec92f153b bcd11a1dfbb520c6663d7737cf7e0fec93eb2d8a
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=569e3381048f3e4201900bb8e92f6f3766861cdb
Log:
Merge branch 'PHP-7.4'
* PHP-7.4:
Implemented the gdScatter filter I wrote almost 10 years ago
Changed paths:
MM ext/gd/gd.c
Diff:
diff --cc ext/gd/gd.c
index 2d187dd,786589d..69d7e42
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@@ -126,9 -127,10 +127,10 @@@ static void php_image_filter_selective_
static void php_image_filter_mean_removal(INTERNAL_FUNCTION_PARAMETERS);
static void php_image_filter_smooth(INTERNAL_FUNCTION_PARAMETERS);
static void php_image_filter_pixelate(INTERNAL_FUNCTION_PARAMETERS);
+ static void php_image_filter_scatter(INTERNAL_FUNCTION_PARAMETERS);
/* End Section filters declarations */
-static gdImagePtr _php_image_create_from_string (zval *Data, char *tn, gdImagePtr
(*ioctx_func_p)());
+static gdImagePtr _php_image_create_from_string(zend_string *Data, char *tn, gdImagePtr
(*ioctx_func_p)());
static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type, char *tn,
gdImagePtr (*func_p)(), gdImagePtr (*ioctx_func_p)());
static void _php_image_output(INTERNAL_FUNCTION_PARAMETERS, int image_type, char *tn, void
(*func_p)());
static int _php_image_type(char data[12]);