register IMAGETYPE_<xxx> constants in image.c as they are needed

there.

diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index 2bf99847cfeed223fe7f788e23b8a2321224e5c5..0f116afd86f52bcf6f10bdfabbe99b78fb1d9275 100644 (file)
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -193,20 +193,6 @@ PHP_MINIT_FUNCTION(exif)
 {
        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;
 }
 /* }}} */

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 1008825db85ca040aef2391f215c76c2ceb119a2..59c9a9f730e9c3d2a4311f05d4b8de56dd0a1629 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -993,6 +993,7 @@ PHP_MINIT_FUNCTION(basic)
        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);

diff --git a/ext/standard/image.c b/ext/standard/image.c
index 484e05008743303cc4fac6a707b6264cd000a760..eb9367766c0ec8030a6bf25a5c687e0f0c789a2d 100644 (file)
--- a/ext/standard/image.c
+++ b/ext/standard/image.c
@@ -79,6 +79,27 @@ struct gfxinfo {
        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... ;} */
 static struct gfxinfo *php_handle_gif (php_stream * stream TSRMLS_DC)

diff --git a/ext/standard/php_image.h b/ext/standard/php_image.h
index 4135db37140496b0bcdaf7fbcf17d5a021acfac1..882739902e9761d882e9e1211804e6a4cff61bda 100644 (file)
--- a/ext/standard/php_image.h
+++ b/ext/standard/php_image.h
@@ -46,10 +46,12 @@ typedef enum
   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);
 
 PHPAPI const char * php_image_type_to_mime_type(int image_type);