iliaa Tue Feb 17 16:30:59 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/ext/gd gd.c
Log:
MFH: Fixed bug #27293 (two crashes inside image2wbmp()).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.569&r2=1.1247.2.570&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.569 php-src/NEWS:1.1247.2.570
--- php-src/NEWS:1.1247.2.569 Tue Feb 17 05:39:17 2004
+++ php-src/NEWS Tue Feb 17 16:30:55 2004
@@ -1,6 +1,7 @@
PHP 4 NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? Feb 2004, Version 4.3.5
+- Fixed bug #27293 (two crashes inside image2wbmp()). (Ilia)
- Fixed bug #27278 (*printf() functions treat arguments as if passed by
reference). (Ilia)
- Fixed bug #26753 (zend_fetch_list_dtor_id() doesn't check NULL strings).
http://cvs.php.net/diff.php/php-src/ext/gd/gd.c?r1=1.221.2.34&r2=1.221.2.35&ty=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.221.2.34 php-src/ext/gd/gd.c:1.221.2.35
--- php-src/ext/gd/gd.c:1.221.2.34 Tue Jan 27 20:38:15 2004
+++ php-src/ext/gd/gd.c Tue Feb 17 16:30:57 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.221.2.34 2004/01/28 01:38:15 iliaa Exp $ */
+/* $Id: gd.c,v 1.221.2.35 2004/02/17 21:30:57 iliaa Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -1620,6 +1620,8 @@
if(q<0||q>255) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Invalid threshold value '%d'. It must be between 0 and 255", q);
}
+ gdImageWBMP(im, q, fp);
+ break;
case PHP_GDIMG_TYPE_JPG:
(*func_p)(im, fp, q);
break;
@@ -1662,6 +1664,8 @@
if(q<0||q>255) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Invalid threshold value '%d'. It must be between 0 and 255", q);
}
+ gdImageWBMP(im, q, tmp);
+ break;
case PHP_GDIMG_TYPE_JPG:
(*func_p)(im, tmp, q);
break;
@@ -3625,6 +3629,10 @@
return;
}
+ if (im_org->trueColor) {
+ gdImageTrueColorToPalette(im_org, 1, 256);
+ }
+
for (y = 0; y < dest_height; y++) {
for (x = 0; x < dest_width; x++) {
color_org = gdImageGetPixel (im_org, x, y);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
