archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'PHP-5.5' into PHP-5.6

Browse source
This commit is contained in:
Xinchen Hui 2014-02-20 11:19:52 +08:00
commit c0d26bb138
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/gd/gd.c
View file

@ -4887,7 +4887,7 @@ PHP_FUNCTION(imageconvolution)
if (zend_hash_index_find(Z_ARRVAL_PP(var), (j), (void **) &var2) == SUCCESS) { if (zend_hash_index_find(Z_ARRVAL_PP(var), (j), (void **) &var2) == SUCCESS) {
if (Z_TYPE_PP(var2) != IS_DOUBLE) { if (Z_TYPE_PP(var2) != IS_DOUBLE) {
zval dval; zval dval;
dval = **var; dval = **var2;
zval_copy_ctor(&dval); zval_copy_ctor(&dval);
convert_to_double(&dval); convert_to_double(&dval);
matrix[i][j] = (float)Z_DVAL(dval); matrix[i][j] = (float)Z_DVAL(dval);