derick Sat Mar 8 13:28:08 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/gd gdttf.c
/php4 NEWS
Log:
- MFH: Fixed a bug in GD's truecolor TTF handling.
Index: php4/ext/gd/gdttf.c
diff -u php4/ext/gd/gdttf.c:1.16.10.1 php4/ext/gd/gdttf.c:1.16.10.2
--- php4/ext/gd/gdttf.c:1.16.10.1 Wed Mar 5 11:04:20 2003
+++ php4/ext/gd/gdttf.c Sat Mar 8 13:28:07 2003
@@ -2,7 +2,7 @@
/* */
/* John Ellson [EMAIL PROTECTED] */
-/* $Id: gdttf.c,v 1.16.10.1 2003/03/05 16:04:20 iliaa Exp $ */
+/* $Id: gdttf.c,v 1.16.10.2 2003/03/08 18:28:07 derick Exp $ */
#include "php.h"
@@ -744,11 +744,15 @@
if (tweencolorkey.pixel > 0) {
x3 = x2 + col;
if (x3 >= im->sx || x3 < 0) continue;
+ if (im->trueColor) {
+ pixel = &im->tpixels[y3][x3];
+ } else {
#if HAVE_LIBGD13
- pixel = &im->pixels[y3][x3];
+ pixel = &im->pixels[y3][x3];
#else
- pixel = &im->pixels[x3][y3];
+ pixel = &im->pixels[x3][y3];
#endif
+ }
tweencolorkey.bgcolor = *pixel;
tweencolor = (tweencolor_t *)gdCacheGet(
tweenColorCache, &tweencolorkey);
Index: php4/NEWS
diff -u php4/NEWS:1.1247.2.128 php4/NEWS:1.1247.2.129
--- php4/NEWS:1.1247.2.128 Fri Mar 7 13:58:34 2003
+++ php4/NEWS Sat Mar 8 13:28:08 2003
@@ -24,6 +24,7 @@
--enable-memory-limit. (Andrey)
- Added improved JPEG 2000 support for getimagesize(). (Marcus, Adam Wright)
- Added XBM and WBMP support for getimagesize(). (Marcus)
+- Fixed a bug in GD's truecolor TTF handling. (Derick)
- Fixed several 64-bit problems. (Dave)
- Fixed several errors in hwapi extension. Objects weren't handled properly. (Uwe)
- Fixed bug #22585 (Do not terminate the script on minor errors). (Ilia)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
