Commit: 3659dcd98c5a4dcfcad2129e59e0794f4dcac1ca Author: Anatol Belski <a...@php.net> Fri, 29 Nov 2013 09:18:13 +0100 Parents: 51d78c253318158371ce9d547d0637392b5428a5 Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3659dcd98c5a4dcfcad2129e59e0794f4dcac1ca Log: further fixes for ext/gd Changed paths: M ext/gd/gd.c Diff: diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 800a94e..fa944c6 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -1422,7 +1422,8 @@ PHP_FUNCTION(imageloadfont) char *file; zend_str_size_int file_name; int hdr_size = sizeof(gdFont) - sizeof(char *); - int ind, body_size, n = 0, b, i, body_size_check; + int ind, body_size, n = 0, b; + zend_off_t body_size_check, i; gdFontPtr font; php_stream *stream; @@ -3396,7 +3397,7 @@ PHP_FUNCTION(imagefilledpolygon) /* {{{ php_find_gd_font */ -static gdFontPtr php_find_gd_font(int size TSRMLS_DC) +static gdFontPtr php_find_gd_font(php_int_t size TSRMLS_DC) { gdFontPtr font; int ind_type; @@ -3830,7 +3831,7 @@ static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode, int do { zval ** item; char * key; - ulong num_key; + php_uint_t num_key; if (zend_hash_get_current_key_ex(HASH_OF(EXT), &key, NULL, &num_key, 0, &pos) != HASH_KEY_IS_STRING) { continue; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
