MFH: ws fix

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index a96a453b7f203d23482230c09c7f1ae00d71b8c5..101ba800a5eafdc2e6f87423d3e52d7fae5a3139 100644 (file)
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -3070,7 +3070,7 @@ PHP_FUNCTION(imagesy)
 #ifdef ENABLE_GD_TTF
 
 #if HAVE_LIBGD20 && HAVE_LIBFREETYPE && HAVE_GD_STRINGFTEX
-/* {{{ proto array imageftbbox(int size, int angle, string font_file, string text[, array extrainfo])
+/* {{{ proto array imageftbbox(float size, float angle, string font_file, string text [, array extrainfo])
    Give the bounding box of a text using fonts via freetype2 */
 PHP_FUNCTION(imageftbbox)
 {
@@ -3078,7 +3078,7 @@ PHP_FUNCTION(imageftbbox)
 }
 /* }}} */
 
-/* {{{ proto array imagefttext(resource im, int size, int angle, int x, int y, int col, string font_file, string text, [array extrainfo])
+/* {{{ proto array imagefttext(resource im, float size, float angle, int x, int y, int col, string font_file, string text [, array extrainfo])
    Write text to the image using fonts via freetype2 */
 PHP_FUNCTION(imagefttext)
 {
@@ -3087,7 +3087,7 @@ PHP_FUNCTION(imagefttext)
 /* }}} */
 #endif
 
-/* {{{ proto array imagettfbbox(int size, int angle, string font_file, string text)
+/* {{{ proto array imagettfbbox(float size, float angle, string font_file, string text)
    Give the bounding box of a text using TrueType fonts */
 PHP_FUNCTION(imagettfbbox)
 {
@@ -3095,7 +3095,7 @@ PHP_FUNCTION(imagettfbbox)
 }
 /* }}} */
 
-/* {{{ proto array imagettftext(resource im, int size, int angle, int x, int y, int col, string font_file, string text)
+/* {{{ proto array imagettftext(resource im, float size, float angle, int x, int y, int col, string font_file, string text)
    Write text to the image using a TrueType font */
 PHP_FUNCTION(imagettftext)
 {
@@ -3153,36 +3153,36 @@ static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode, int
        }
 
 #if HAVE_GD_STRINGFTEX
-               if (extended && EXT) {
-                       /* parse extended info */
+       if (extended && EXT) {
+               /* parse extended info */
 
-                       HashPosition pos;
+               HashPosition pos;
 
-                       convert_to_array_ex(EXT);
+               convert_to_array_ex(EXT);
 
-                       /* walk the assoc array */
-                       zend_hash_internal_pointer_reset_ex(HASH_OF(*EXT), &pos);
-                       do {
-                               zval ** item;
-                               char * key;
-                               ulong num_key;
+               /* walk the assoc array */
+               zend_hash_internal_pointer_reset_ex(HASH_OF(*EXT), &pos);
+               do {
+                       zval ** item;
+                       char * key;
+                       ulong num_key;
 
-                               if (zend_hash_get_current_key_ex(HASH_OF(*EXT), &key, NULL, &num_key, 0, &pos) != HASH_KEY_IS_STRING) {
-                                       continue;
-                               }
+                       if (zend_hash_get_current_key_ex(HASH_OF(*EXT), &key, NULL, &num_key, 0, &pos) != HASH_KEY_IS_STRING) {
+                               continue;
+                       }
 
-                               if (zend_hash_get_current_data_ex(HASH_OF(*EXT), (void **) &item, &pos) == FAILURE) {
-                                       continue;
-                               }
+                       if (zend_hash_get_current_data_ex(HASH_OF(*EXT), (void **) &item, &pos) == FAILURE) {
+                               continue;
+                       }
 
-                               if (strcmp("linespacing", key) == 0)    {
-                                       convert_to_double_ex(item);
-                                       strex.flags |= gdFTEX_LINESPACE;
-                                       strex.linespacing = Z_DVAL_PP(item);
-                               }
+                       if (strcmp("linespacing", key) == 0)    {
+                               convert_to_double_ex(item);
+                               strex.flags |= gdFTEX_LINESPACE;
+                               strex.linespacing = Z_DVAL_PP(item);
+                       }
 
-                       } while (zend_hash_move_forward_ex(HASH_OF(*EXT), &pos) == SUCCESS);
-               }
+               } while (zend_hash_move_forward_ex(HASH_OF(*EXT), &pos) == SUCCESS);
+       }
 #endif
 
        ptsize = Z_DVAL_PP(PTSIZE);