del php-src: ext/gd/gd.c
| From: | JulienPauli | Date: | Wed, 10 Jun 2015 12:23:46 +0000 |
| Subject: | del php-src: ext/gd/gd.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87187@lists.php.net to get a copy of this message | ||
Branch: PHP-5.5.26
Deleted commits count: 1
User: JulienPauli <jpauli@php.net> Wed, 10 Jun 2015 12:23:46 +0000
Changed paths:
M ext/gd/gd.c
Diff:
diff --git b/ext/gd/gd.c a/ext/gd/gd.c
index dd4a9ef..f7c45ec 100644
--- b/ext/gd/gd.c
+++ a/ext/gd/gd.c
@@ -4444,13 +4444,8 @@ static void _php_image_convert(INTERNAL_FUNCTION_PARAMETERS, int image_type )
int int_threshold;
int x, y;
float x_ratio, y_ratio;
- long ignore_warning;
-<<<<<<< HEAD
-
-=======
-#endif
+ long ignore_warning;
->>>>>>> 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;
}