diff options
| author | Jouni Ahto <jah@php.net> | 2000-06-07 23:04:39 +0000 |
|---|---|---|
| committer | Jouni Ahto <jah@php.net> | 2000-06-07 23:04:39 +0000 |
| commit | 66eedaa03d13b50e756e4b5a8ed9af4db37ee8b7 (patch) | |
| tree | 506d19f2ff9d82b89e073461c168399548b3ecaf /ext/gd/php_gd.h | |
| parent | 467b5e489264f2432edd332022d64915e8c3cf49 (diff) | |
| download | php-git-66eedaa03d13b50e756e4b5a8ed9af4db37ee8b7.tar.gz | |
- Fixed typo in _php_image_output (s/fp/tmp/) causing segfault.
- Fixed bug when calling imagejpeg() with 3 arguments, the second one empty,
introduced yesterday.
- Nuked even more code.
Diffstat (limited to 'ext/gd/php_gd.h')
| -rw-r--r-- | ext/gd/php_gd.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/gd/php_gd.h b/ext/gd/php_gd.h index 3076913799..c8c49e9ee6 100644 --- a/ext/gd/php_gd.h +++ b/ext/gd/php_gd.h @@ -55,10 +55,10 @@ #define PHP_GDIMG_TYPE_GIF 1 #define PHP_GDIMG_TYPE_PNG 2 -#define PHP_GDIMG_TYPE_JPG 4 -#define PHP_GDIMG_TYPE_WBM 8 -#define PHP_GDIMG_TYPE_XBM 16 -#define PHP_GDIMG_TYPE_XPM 32 +#define PHP_GDIMG_TYPE_JPG 3 +#define PHP_GDIMG_TYPE_WBM 4 +#define PHP_GDIMG_TYPE_XBM 5 +#define PHP_GDIMG_TYPE_XPM 6 extern zend_module_entry gd_module_entry; @@ -140,8 +140,8 @@ PHP_FUNCTION(imagepstext); PHP_FUNCTION(imagepsbbox); PHPAPI int phpi_get_le_gd(void); -static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type); -static void _php_image_output(INTERNAL_FUNCTION_PARAMETERS, int image_type); +static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type, char *tn, gdImagePtr (*func_p)()); +static void _php_image_output(INTERNAL_FUNCTION_PARAMETERS, int image_type, char *tn, void (*func_p)()); static void _php_image_output_wbmp(gdImagePtr im, FILE *fp); #ifdef ZTS |