Browse Source

- Made gd extension build when using gd version < 1.5

PHP-4.0.5
Mathieu Kooiman 26 years ago
parent
commit
5e7041615a
  1. 6
      ext/gd/gd.c

6
ext/gd/gd.c

@ -480,6 +480,7 @@ PHP_FUNCTION(imagetypes)
static int _php_image_type (char data[8]) static int _php_image_type (char data[8])
{ {
#ifdef HAVE_LIBGD15
/* Based on ext/standard/images.c */ /* Based on ext/standard/images.c */
if (data == NULL) if (data == NULL)
@ -507,10 +508,12 @@ static int _php_image_type (char data[8])
} }
#endif #endif
return -1; return -1;
#endif
} }
gdImagePtr _php_image_create_from_string (zval **data, char *tn, gdImagePtr (*ioctx_func_p)()) gdImagePtr _php_image_create_from_string (zval **data, char *tn, gdImagePtr (*ioctx_func_p)())
{ {
#ifdef HAVE_LIBGD15
gdImagePtr im; gdImagePtr im;
gdIOCtx *io_ctx; gdIOCtx *io_ctx;
@ -528,12 +531,14 @@ gdImagePtr _php_image_create_from_string (zval **data, char *tn, gdImagePtr (*io
} }
return im; return im;
#endif
} }
/* {{{ proto int imagecreatefromstring(string image) /* {{{ proto int imagecreatefromstring(string image)
Create a new image from the image stream in the string */ Create a new image from the image stream in the string */
PHP_FUNCTION (imagecreatefromstring) PHP_FUNCTION (imagecreatefromstring)
{ {
#ifdef HAVE_LIBGD15
zval **data; zval **data;
gdImagePtr im; gdImagePtr im;
int imtype; int imtype;
@ -596,6 +601,7 @@ PHP_FUNCTION (imagecreatefromstring)
} }
ZEND_REGISTER_RESOURCE(return_value, im, GDG (le_gd)); ZEND_REGISTER_RESOURCE(return_value, im, GDG (le_gd));
#endif
} }
/* }}} */ /* }}} */

Loading…
Cancel
Save