diff options
| author | Julien Pauli <jpauli@php.net> | 2015-06-10 14:15:14 +0200 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2015-06-10 14:26:49 +0200 |
| commit | fa6f9e100476fbdd65495524616a0373edb24f87 (patch) | |
| tree | 41a26fb1003f9e64f13182cc4061f91b7b05c426 | |
| parent | bf72e139010bc308fceb6efbc0ee3b104f1312db (diff) | |
| download | php-git-PHP-5.5.26.tar.gz | |
Fix wrong mergephp-5.5.26PHP-5.5.26
| -rw-r--r-- | ext/dom/document.c | 2 | ||||
| -rw-r--r-- | ext/gd/gd.c | 10 |
2 files changed, 3 insertions, 9 deletions
diff --git a/ext/dom/document.c b/ext/dom/document.c index a66450df0a..d82ca92096 100644 --- a/ext/dom/document.c +++ b/ext/dom/document.c @@ -1991,7 +1991,7 @@ static void _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type int is_valid; char resolved_path[MAXPATHLEN + 1]; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Op|l", &id, dom_document_class_entry, &source, &source_len, &flags) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os|l", &id, dom_document_class_entry, &source, &source_len, &flags) == FAILURE) { return; } diff --git a/ext/gd/gd.c b/ext/gd/gd.c index dd4a9efdc0..76e2c5bf55 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -3866,9 +3866,8 @@ static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode, int #endif /* VIRTUAL_DIR */ PHP_GD_CHECK_OPEN_BASEDIR(fontname, "Invalid font filename"); - -#ifdef USE_GD_IMGSTRTTF -# if HAVE_GD_STRINGFTEX + +#ifdef HAVE_GD_FREETYPE if (extended) { error = gdImageStringFTEx(im, brect, col, fontname, ptsize, angle, x, y, str, &strex); } @@ -4445,12 +4444,7 @@ static void _php_image_convert(INTERNAL_FUNCTION_PARAMETERS, int image_type ) int x, y; float x_ratio, y_ratio; long ignore_warning; -<<<<<<< HEAD -======= -#endif - ->>>>>>> f7d7bef... Fix #69719 - more checks for nulls in paths if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "pplll", &f_org, &f_org_len, &f_dest, &f_dest_len, &height, &width, &threshold) == FAILURE) { return; } |