Merge branch 'PHP-7.4'

* PHP-7.4:
  Implemented the gdScatter filter I wrote almost 10 years ago

diff --cc ext/gd/gd.c
index 2d187ddd58af2a7a55ee5a58350b5df98e8ddbef,786589d263b941156bab09922acadbab42659a27..69d7e426ecaa40fb61211b5fb958ded389834185
--- 1/ext/gd/gd.c
--- 2/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]);