com php-src: Fix wrong merge: ext/dom/document.c ext/gd/gd.c
| From: | JulienPauli | Date: | Wed, 10 Jun 2015 12:26:49 +0000 |
| Subject: | com php-src: Fix wrong merge: ext/dom/document.c ext/gd/gd.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87190@lists.php.net to get a copy of this message | ||
Commit: fa6f9e100476fbdd65495524616a0373edb24f87
Author: Julien Pauli <jpauli@php.net> Wed, 10 Jun 2015 14:15:14 +0200
Parents: bf72e139010bc308fceb6efbc0ee3b104f1312db
Branches: PHP-5.5.26
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fa6f9e100476fbdd65495524616a0373edb24f87
Log:
Fix wrong merge
Changed paths:
M ext/dom/document.c
M ext/gd/gd.c
Diff:
diff --git a/ext/dom/document.c b/ext/dom/document.c
index a66450d..d82ca92 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 dd4a9ef..76e2c5b 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;
}