Skip to content

Commit 13d8f50

Browse files
committed
Maybe fix GD now
1 parent 181ff5f commit 13d8f50

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

ext/gd/gd.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,9 @@ static void php_image_filter_pixelate(INTERNAL_FUNCTION_PARAMETERS);
132132
static void php_image_filter_scatter(INTERNAL_FUNCTION_PARAMETERS);
133133

134134
/* End Section filters declarations */
135-
static gdImagePtr _php_image_create_from_string(zend_string *Data, char *tn, gdImagePtr (*ioctx_func_p)(gdIOCtx * infile));
136-
static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type, char *tn, gdImagePtr (*func_p)(), gdImagePtr (*ioctx_func_p)(gdIOCtx * infile));
135+
static gdImagePtr _php_image_create_from_string(zend_string *Data, char *tn, gdImagePtr (*ioctx_func_p)(gdIOCtx *));
136+
static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type, char *tn,
137+
gdImagePtr (*func_p)(FILE *), gdImagePtr (*ioctx_func_p)(struct gdIOCtx *, int, int, int, int));
137138
static void _php_image_output(INTERNAL_FUNCTION_PARAMETERS, int image_type, char *tn, void (*func_p)());
138139
static gdIOCtx *create_stream_context_from_zval(zval *to_zval);
139140
static gdIOCtx *create_stream_context(php_stream *stream, int close_stream);
@@ -1551,7 +1552,8 @@ PHP_FUNCTION(imagecreatefromstring)
15511552
/* }}} */
15521553

15531554
/* {{{ _php_image_create_from */
1554-
static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type, char *tn, gdImagePtr (*func_p)(), gdImagePtr (*ioctx_func_p)(gdIOCtx * infile))
1555+
static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type, char *tn,
1556+
gdImagePtr (*func_p)(FILE *), gdImagePtr (*ioctx_func_p)(gdIOCtx *))
15551557
{
15561558
char *file;
15571559
size_t file_len;
@@ -4154,7 +4156,8 @@ static gdIOCtx *create_output_context() {
41544156
return ctx;
41554157
}
41564158

4157-
static void _php_image_output_ctx(INTERNAL_FUNCTION_PARAMETERS, int image_type, char *tn, void (*func_p)())
4159+
static void _php_image_output_ctx(INTERNAL_FUNCTION_PARAMETERS, int image_type, char *tn,
4160+
void (*func_p)(gdImagePtr , gdIOCtx* , int))
41584161
{
41594162
zval *imgind;
41604163
zend_long quality = -1, basefilter = -1;

0 commit comments

Comments
 (0)