diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2013-12-14 12:45:40 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2013-12-14 12:45:40 +0000 |
| commit | ce9ba7129c50bca221608eece0b0ecc51ec91914 (patch) | |
| tree | a801a1883a7a12dd7c9691e8ae7dccb56307460d /lang/php5/files/patch-ext_standard_image.c | |
| parent | devel/boost-libs: Backport fix building test framework on non-x86 platforms (diff) | |
Update to 5.4.23 release and refresh patches.
Notes
Notes:
svn path=/head/; revision=336439
Diffstat (limited to 'lang/php5/files/patch-ext_standard_image.c')
| -rw-r--r-- | lang/php5/files/patch-ext_standard_image.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lang/php5/files/patch-ext_standard_image.c b/lang/php5/files/patch-ext_standard_image.c index be29b54b2650..e91ac7158831 100644 --- a/lang/php5/files/patch-ext_standard_image.c +++ b/lang/php5/files/patch-ext_standard_image.c @@ -1,5 +1,5 @@ ---- ext/standard/image.c.orig 2007-10-04 15:31:11.000000000 +0200 -+++ ext/standard/image.c 2007-11-13 22:47:04.000000000 +0100 +--- ext/standard/image.c.orig 2013-12-10 19:32:43.000000000 +0000 ++++ ext/standard/image.c 2013-12-13 21:55:54.112235824 +0000 @@ -31,9 +31,7 @@ #endif #include "php_image.h" @@ -10,7 +10,7 @@ /* file type markers */ PHPAPI const char php_sig_gif[3] = {'G', 'I', 'F'}; -@@ -80,9 +78,7 @@ +@@ -81,9 +79,7 @@ PHP_MINIT_FUNCTION(imagetypes) 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); @@ -20,7 +20,7 @@ REGISTER_LONG_CONSTANT("IMAGETYPE_IFF", IMAGE_FILETYPE_IFF, CONST_CS | CONST_PERSISTENT); 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 */ -@@ -184,7 +180,6 @@ +@@ -188,7 +184,6 @@ static unsigned long int php_swf_get_bit } /* }}} */ @@ -28,7 +28,7 @@ /* {{{ php_handle_swc */ static struct gfxinfo *php_handle_swc(php_stream * stream TSRMLS_DC) -@@ -255,7 +250,6 @@ +@@ -259,7 +254,6 @@ static struct gfxinfo *php_handle_swc(ph return result; } /* }}} */ @@ -36,7 +36,7 @@ /* {{{ php_handle_swf */ -@@ -1314,11 +1308,7 @@ +@@ -1318,11 +1312,7 @@ static void php_getimagesize_from_stream result = php_handle_swf(stream TSRMLS_CC); break; case IMAGE_FILETYPE_SWC: |