cvs: php4 /ext/gd gd.c

mathieu Wed Nov 8 06:56:09 2000 EDT Modified files: /php4/ext/gd gd.c Log: - Made gd extension build when using gd version < 1.5 Index: php4/ext/gd/gd.c diff -u php4/ext/gd/gd.c:1.99 php4/ext/gd/gd.c:1.100 --- php4/ext/gd/gd.c:1.99 Mon Nov 6 14:00:07 2000 +++ php4/ext/gd/gd.c Wed Nov 8 06:56:09 2000 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.99 2000/11/06 22:00:07 neotron Exp $ */ +/* $Id: gd.c,v 1.100 2000/11/08 14:56:09 mathieu Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -480,6 +480,7 @@ static int _php_image_type (char data[8]) { +#ifdef HAVE_LIBGD15 /* Based on ext/standard/images.c */ if (data == NULL) @@ -507,10 +508,12 @@ } #endif return -1; +#endif } gdImagePtr _php_image_create_from_string (zval **data, char *tn, gdImagePtr (*ioctx_func_p)()) { +#ifdef HAVE_LIBGD15 gdImagePtr im; gdIOCtx *io_ctx; @@ -528,12 +531,14 @@ } return im; +#endif } /* {{{ proto int imagecreatefromstring(string image) Create a new image from the image stream in the string */ PHP_FUNCTION (imagecreatefromstring) { +#ifdef HAVE_LIBGD15 zval **data; gdImagePtr im; int imtype; @@ -596,6 +601,7 @@ } ZEND_REGISTER_RESOURCE(return_value, im, GDG (le_gd)); +#endif } /* }}} */