derick Sun Apr 17 06:17:05 2005 EDT
Modified files:
/php-src NEWS
/php-src/ext/gd gd.c
Log:
- Fixed bug #32735 (Compile error in GD extension).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1873&r2=1.1874&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1873 php-src/NEWS:1.1874
--- php-src/NEWS:1.1873 Sat Apr 16 08:29:00 2005
+++ php-src/NEWS Sun Apr 17 06:16:57 2005
@@ -104,6 +104,7 @@
- Fixed bug with raw_post_data not getting set. (Brian)
- Fixed bug in mysql::client_version(). (Georg)
- Fixed ZTS destruction. (Marcus)
+- Fixed bug #32735 (Compile error in GD extension). (Derick)
- Fixed bug #32491 (File upload error - unable to create a temporary file).
(Uwe Schindler)
- Fixed bug #32109 ($_POST is not populated in multithreaded environment).
http://cvs.php.net/diff.php/php-src/ext/gd/gd.c?r1=1.309&r2=1.310&ty=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.309 php-src/ext/gd/gd.c:1.310
--- php-src/ext/gd/gd.c:1.309 Sat Apr 16 08:12:24 2005
+++ php-src/ext/gd/gd.c Sun Apr 17 06:17:03 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.309 2005/04/16 12:12:24 pajoye Exp $ */
+/* $Id: gd.c,v 1.310 2005/04/17 10:17:03 derick Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -4199,6 +4199,7 @@
gdImagePtr im_src = NULL;
float div, offset;
int nelem, i, j, res;
+ float matrix[3][3] = {{0,0,0}, {0,0,0}, {0,0,0}};
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "radd", &SIM,
&hash_matrix, &div, &offset) == FAILURE) {
RETURN_FALSE;
@@ -4212,8 +4213,6 @@
RETURN_FALSE;
}
- float matrix[3][3] = {{0,0,0}, {0,0,0}, {0,0,0}};
-
for (i=0; i<3; i++) {
if (zend_hash_index_find(Z_ARRVAL_P(hash_matrix), (i), (void
**) &var) == SUCCESS) {
if (Z_TYPE_PP(var) != IS_ARRAY ||
zend_hash_num_elements(Z_ARRVAL_PP(var)) != 3 ) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
