cvs: php4 /ext/exif exif.c /ext/standard basic_functions.c image.c php_image.h

helly Mon Jun 24 15:36:27 2002 EDT Modified files: /php4/ext/standard basic_functions.c image.c php_image.h /php4/ext/exif exif.c Log: register IMAGETYPE_<xxx> constants in image.c as they are needed there. Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.481 php4/ext/standard/basic_functions.c:1.482 --- php4/ext/standard/basic_functions.c:1.481 Sat Jun 22 20:43:11 2002 +++ php4/ext/standard/basic_functions.c Mon Jun 24 15:36:25 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.481 2002/06/23 00:43:11 helly Exp $ */ +/* $Id: basic_functions.c,v 1.482 2002/06/24 19:36:25 helly Exp $ */ #include "php.h" #include "php_streams.h" @@ -993,6 +993,7 @@ PHP_MINIT(proc_open) (INIT_FUNC_ARGS_PASSTHRU); PHP_MINIT(user_streams) (INIT_FUNC_ARGS_PASSTHRU); + PHP_MINIT(imagetypes) (INIT_FUNC_ARGS_PASSTHRU); php_register_url_stream_wrapper("http", &php_stream_http_wrapper TSRMLS_CC); php_register_url_stream_wrapper("php", &php_stream_php_wrapper TSRMLS_CC); Index: php4/ext/standard/image.c diff -u php4/ext/standard/image.c:1.60 php4/ext/standard/image.c:1.61 --- php4/ext/standard/image.c:1.60 Mon Jun 24 15:19:08 2002 +++ php4/ext/standard/image.c Mon Jun 24 15:36:26 2002 @@ -16,7 +16,7 @@ | Marcus Boerger <helly@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: image.c,v 1.60 2002/06/24 19:19:08 helly Exp $ */ +/* $Id: image.c,v 1.61 2002/06/24 19:36:26 helly Exp $ */ /* * Based on Daniel Schmitt's imageinfo.c which carried the following * Copyright notice. @@ -78,6 +78,27 @@ unsigned int bits; unsigned int channels; }; + +/* {{{ PHP_MINIT_FUNCTION(imagetypes) + * Register IMAGETYPE_<xxx> constants used by GetImageSize(), image_type_to_mime_type, ext/exif */ +PHP_MINIT_FUNCTION(imagetypes) +{ + REGISTER_LONG_CONSTANT("IMAGETYPE_GIF", IMAGE_FILETYPE_GIF, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("IMAGETYPE_JPEG", IMAGE_FILETYPE_JPEG, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("IMAGETYPE_PNG", IMAGE_FILETYPE_PNG, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("IMAGETYPE_SWF", IMAGE_FILETYPE_SWF, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("IMAGETYPE_PSD", IMAGE_FILETYPE_PSD, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("IMAGETYPE_BMP", IMAGE_FILETYPE_BMP, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("IMAGETYPE_TIFF_II", IMAGE_FILETYPE_TIFF_II, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("IMAGETYPE_TIFF_MM", IMAGE_FILETYPE_TIFF_MM, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("IMAGETYPE_JPC", IMAGE_FILETYPE_JPC, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("IMAGETYPE_JP2", IMAGE_FILETYPE_JP2, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("IMAGETYPE_JPX", IMAGE_FILETYPE_JPX, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("IMAGETYPE_JB2", IMAGE_FILETYPE_JB2, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("IMAGETYPE_SWC", IMAGE_FILETYPE_SWC, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("IMAGETYPE_IFF", IMAGE_FILETYPE_IFF, CONST_CS | CONST_PERSISTENT); +} +/* }}} */ /* {{{ php_handle_gif * routine to handle GIF files. If only everything were that easy... ;} */ Index: php4/ext/standard/php_image.h diff -u php4/ext/standard/php_image.h:1.18 php4/ext/standard/php_image.h:1.19 --- php4/ext/standard/php_image.h:1.18 Mon Jun 24 15:19:08 2002 +++ php4/ext/standard/php_image.h Mon Jun 24 15:36:26 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_image.h,v 1.18 2002/06/24 19:19:08 helly Exp $ */ +/* $Id: php_image.h,v 1.19 2002/06/24 19:36:26 helly Exp $ */ #ifndef PHP_IMAGE_H #define PHP_IMAGE_H @@ -46,9 +46,11 @@ IMAGE_FILETYPE_JB2, IMAGE_FILETYPE_SWC, IMAGE_FILETYPE_IFF, -/* WHEN EXTENDING: PLEASE ALSO REGISTER IN ext/exif/exif.c:PHP_MINIT_FUNCTION(exif) */ +/* WHEN EXTENDING: PLEASE ALSO REGISTER IN image.c:PHP_MINIT_FUNCTION(imagetypes) */ } image_filetype; /* }}} */ + +PHP_MINIT_FUNCTION(imagetypes); PHPAPI int php_getimagetype(php_stream *stream, char *filetype TSRMLS_DC); Index: php4/ext/exif/exif.c diff -u php4/ext/exif/exif.c:1.96 php4/ext/exif/exif.c:1.97 --- php4/ext/exif/exif.c:1.96 Mon Jun 24 15:19:08 2002 +++ php4/ext/exif/exif.c Mon Jun 24 15:36:26 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: exif.c,v 1.96 2002/06/24 19:19:08 helly Exp $ */ +/* $Id: exif.c,v 1.97 2002/06/24 19:36:26 helly Exp $ */ /* ToDos * @@ -107,7 +107,7 @@ }; /* }}} */ -#define EXIF_VERSION "1.4 $Id: exif.c,v 1.96 2002/06/24 19:19:08 helly Exp $" +#define EXIF_VERSION "1.4 $Id: exif.c,v 1.97 2002/06/24 19:36:26 helly Exp $" /* {{{ PHP_MINFO_FUNCTION */ @@ -193,20 +193,6 @@ { ZEND_INIT_MODULE_GLOBALS(exif, php_exif_init_globals, NULL); REGISTER_INI_ENTRIES(); - REGISTER_LONG_CONSTANT("IMAGETYPE_GIF", IMAGE_FILETYPE_GIF, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("IMAGETYPE_JPEG", IMAGE_FILETYPE_JPEG, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("IMAGETYPE_PNG", IMAGE_FILETYPE_PNG, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("IMAGETYPE_SWF", IMAGE_FILETYPE_SWF, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("IMAGETYPE_PSD", IMAGE_FILETYPE_PSD, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("IMAGETYPE_BMP", IMAGE_FILETYPE_BMP, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("IMAGETYPE_TIFF_II", IMAGE_FILETYPE_TIFF_II, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("IMAGETYPE_TIFF_MM", IMAGE_FILETYPE_TIFF_MM, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("IMAGETYPE_JPC", IMAGE_FILETYPE_JPC, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("IMAGETYPE_JP2", IMAGE_FILETYPE_JP2, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("IMAGETYPE_JPX", IMAGE_FILETYPE_JPX, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("IMAGETYPE_JB2", IMAGE_FILETYPE_JB2, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("IMAGETYPE_SWC", IMAGE_FILETYPE_SWC, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("IMAGETYPE_IFF", IMAGE_FILETYPE_IFF, CONST_CS | CONST_PERSISTENT); return SUCCESS; } /* }}} */