cvs: php-src /ext/standard image.c php_image.h

From: Date: Sat, 13 Oct 2007 18:05:23 +0000
Subject: cvs: php-src /ext/standard image.c php_image.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-46664@lists.php.net to get a copy of this message
scottmac Sat Oct 13 18:05:23 2007 UTC Modified files: /php-src/ext/standard image.c php_image.h Log: MFB: Added icon file format support to getimagesize http://cvs.php.net/viewvc.cgi/php-src/ext/standard/image.c?r1=1.130&r2=1.131&diff_format=u Index: php-src/ext/standard/image.c diff -u php-src/ext/standard/image.c:1.130 php-src/ext/standard/image.c:1.131 --- php-src/ext/standard/image.c:1.130 Sun Jun 17 10:39:18 2007 +++ php-src/ext/standard/image.c Sat Oct 13 18:05:20 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: image.c,v 1.130 2007/06/17 10:39:18 pajoye Exp $ */ +/* $Id: image.c,v 1.131 2007/10/13 18:05:20 scottmac Exp $ */ #include "php.h" #include <stdio.h> @@ -51,6 +51,7 @@ (char)0x6a, (char)0x50, (char)0x20, (char)0x20, (char)0x0d, (char)0x0a, (char)0x87, (char)0x0a}; PHPAPI const char php_sig_iff[4] = {'F','O','R','M'}; +PHPAPI const char php_sig_ico[3] = {(char)0x00, (char)0x00, (char)0x01}; /* REMEMBER TO ADD MIME-TYPE TO FUNCTION php_image_type_to_mime_type */ /* PCX must check first 64bytes and byte 0=0x0a and byte2 < 0x06 */ @@ -87,6 +88,7 @@ REGISTER_LONG_CONSTANT("IMAGETYPE_WBMP", IMAGE_FILETYPE_WBMP, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("IMAGETYPE_JPEG2000",IMAGE_FILETYPE_JPC, CONST_CS | CONST_PERSISTENT); /* keep alias */ REGISTER_LONG_CONSTANT("IMAGETYPE_XBM", IMAGE_FILETYPE_XBM, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("IMAGETYPE_ICO", IMAGE_FILETYPE_ICO, CONST_CS | CONST_PERSISTENT); return SUCCESS; } /* }}} */ @@ -1077,6 +1079,42 @@ } /* }}} */ +/* {{{ php_handle_ico + */ +static struct gfxinfo *php_handle_ico(php_stream * stream TSRMLS_DC) +{ + struct gfxinfo *result = NULL; + unsigned char dim[16]; + int num_icons = 0; + + if (php_stream_read(stream, dim, 2) != 2) + return NULL; + + num_icons = (((unsigned int)dim[1]) << 8) + ((unsigned int) dim[0]); + + if (num_icons < 1 || num_icons > 255) + return NULL; + + result = (struct gfxinfo *) ecalloc(1, sizeof(struct gfxinfo)); + + while (num_icons > 0) + { + if (php_stream_read(stream, dim, sizeof(dim)) != sizeof(dim)) + break; + + if ((((unsigned int)dim[7]) << 8) + ((unsigned int)dim[6]) >= result->bits) + { + result->width = (unsigned int)dim[0]; + result->height = (unsigned int)dim[1]; + result->bits = (((unsigned int)dim[7]) << 8) + ((unsigned int)dim[6]); + } + num_icons--; + } + + return result; +} +/* }}} */ + /* {{{ php_image_type_to_mime_type * Convert internal image_type to mime type */ PHPAPI char * php_image_type_to_mime_type(int image_type) @@ -1108,6 +1146,8 @@ return "image/jp2"; case IMAGE_FILETYPE_XBM: return "image/xbm"; + case IMAGE_FILETYPE_ICO: + return "image/vnd.microsoft.icon"; default: case IMAGE_FILETYPE_UNKNOWN: return "application/octet-stream"; /* suppose binary format */ @@ -1198,6 +1238,10 @@ case IMAGE_FILETYPE_XBM: temp = ".xbm"; break; + + case IMAGE_FILETYPE_ICO: + temp = ".ico"; + break; } if (temp) { RETURN_ASCII_STRING(temp + !inc_dot, 1); @@ -1254,12 +1298,12 @@ /* BYTES READ: 4 */ if (!memcmp(filetype, php_sig_tif_ii, 4)) { return IMAGE_FILETYPE_TIFF_II; - } else - if (!memcmp(filetype, php_sig_tif_mm, 4)) { + } else if (!memcmp(filetype, php_sig_tif_mm, 4)) { return IMAGE_FILETYPE_TIFF_MM; - } - if (!memcmp(filetype, php_sig_iff, 4)) { + } else if (!memcmp(filetype, php_sig_iff, 4)) { return IMAGE_FILETYPE_IFF; + } else if (!memcmp(filetype, php_sig_ico, 3)) { + return IMAGE_FILETYPE_ICO; } if (php_stream_read(stream, filetype+4, 8) != 8) { http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_image.h?r1=1.31&r2=1.32&diff_format=u Index: php-src/ext/standard/php_image.h diff -u php-src/ext/standard/php_image.h:1.31 php-src/ext/standard/php_image.h:1.32 --- php-src/ext/standard/php_image.h:1.31 Mon Jan 1 09:29:32 2007 +++ php-src/ext/standard/php_image.h Sat Oct 13 18:05:20 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_image.h,v 1.31 2007/01/01 09:29:32 sebastian Exp $ */ +/* $Id: php_image.h,v 1.32 2007/10/13 18:05:20 scottmac Exp $ */ #ifndef PHP_IMAGE_H #define PHP_IMAGE_H @@ -49,7 +49,8 @@ IMAGE_FILETYPE_IFF, IMAGE_FILETYPE_WBMP, /* IMAGE_FILETYPE_JPEG2000 is a userland alias for IMAGE_FILETYPE_JPC */ - IMAGE_FILETYPE_XBM + IMAGE_FILETYPE_XBM, + IMAGE_FILETYPE_ICO /* WHEN EXTENDING: PLEASE ALSO REGISTER IN image.c:PHP_MINIT_FUNCTION(imagetypes) */ } image_filetype; /* }}} */

« previous php.cvs (#46664) next »