diff options
| author | Xinchen Hui <laruence@php.net> | 2014-02-20 11:19:52 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-02-20 11:19:52 +0800 |
| commit | c0d26bb138e27fff5bba971edbecb592bd967c33 (patch) | |
| tree | ce9537d73519b971b3ef33a87d4f79fb1ec8d8fe | |
| parent | 3fa164c24b98090800c290b98f662923c3bfbdcc (diff) | |
| parent | 143bb29c1ac3f959f44b8fe59adef4d1840bc393 (diff) | |
| download | php-git-c0d26bb138e27fff5bba971edbecb592bd967c33.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
| -rw-r--r-- | ext/gd/gd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 2a704d7a85..14d9f90af7 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -4887,7 +4887,7 @@ PHP_FUNCTION(imageconvolution) if (zend_hash_index_find(Z_ARRVAL_PP(var), (j), (void **) &var2) == SUCCESS) { if (Z_TYPE_PP(var2) != IS_DOUBLE) { zval dval; - dval = **var; + dval = **var2; zval_copy_ctor(&dval); convert_to_double(&dval); matrix[i][j] = (float)Z_DVAL(dval); |