diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2000-07-14 21:51:31 +0000 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2000-07-14 21:51:31 +0000 |
| commit | 2f960d70b92e49daf5111ab0d8abacab41d592be (patch) | |
| tree | c819515e723f935bf6c4ec5f1cdb72298c4a79af /ext | |
| parent | 55d313db99b36b2e727433145f0a569ae8bcd064 (diff) | |
| download | php-git-2f960d70b92e49daf5111ab0d8abacab41d592be.tar.gz | |
Add ImageTypes() function which returns a bitfield with the supported
image formats. 1=gif, 2=jpeg, 4=png and 8=wbmp
@ Add ImageTypes() function which returns a bitfield with the supported
@ image formats. 1=gif, 2=jpeg, 4=png and 8=wbmp (Rasmus)
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/gd/gd.c | 23 | ||||
| -rw-r--r-- | ext/gd/php_gd.h | 1 |
2 files changed, 24 insertions, 0 deletions
diff --git a/ext/gd/gd.c b/ext/gd/gd.c index e16b0caf22..d0bc3408aa 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -155,6 +155,7 @@ function_entry gd_functions[] = { PHP_FE(imagepsslantfont, NULL) PHP_FE(imagepstext, NULL) PHP_FE(imagepsbbox, NULL) + PHP_FE(imagetypes, NULL) {NULL, NULL, NULL} }; @@ -258,6 +259,9 @@ PHP_MINFO_FUNCTION(gd) #ifdef HAVE_GD_JPG php_info_print_table_row(2, "JPG Support", "enabled"); #endif +#ifdef HAVE_GD_WBMP + php_info_print_table_row(2, "WBMP Support", "enabled"); +#endif php_info_print_table_end(); } @@ -426,6 +430,25 @@ PHP_FUNCTION(imagecreate) } /* }}} */ +/* {{{ proto int imagetypes(void) + Return the types of images supported in a bitfield - 1=gif, 2=jpeg, 4=png, 8=wbmp */ +PHP_FUNCTION(imagetypes) +{ + int ret=0; +#ifdef HAVE_GD_GIF + ret = 1; +#endif +#ifdef HAVE_GD_JPG + ret |= 2; +#endif +#ifdef HAVE_GD_PNG + ret |= 4; +#endif +#ifdef HAVE_GD_WBMP + ret |= 8; +#endif + RETURN_LONG(ret); +} static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type, char *tn, gdImagePtr (*func_p)()) { zval **file; diff --git a/ext/gd/php_gd.h b/ext/gd/php_gd.h index 19d1b8de76..8dda74591d 100644 --- a/ext/gd/php_gd.h +++ b/ext/gd/php_gd.h @@ -94,6 +94,7 @@ PHP_FUNCTION(imagecolortransparent); PHP_FUNCTION(imagecopy); PHP_FUNCTION(imagecopymerge); PHP_FUNCTION(imagecopyresized); +PHP_FUNCTION(imagetypes); PHP_FUNCTION(imagecreate); PHP_FUNCTION(imagecreatefromgif); PHP_FUNCTION(imagecreatefromjpeg); |
