From a758078ce534b8682cdc6cc5e77a0e2f0856cf60 Mon Sep 17 00:00:00 2001 From: Derick Rethans Date: Sat, 8 Mar 2003 18:28:08 +0000 Subject: [PATCH] - MFH: Fixed a bug in GD's truecolor TTF handling. --- NEWS | 1 + ext/gd/gdttf.c | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 4523862136..fb83d78515 100644 --- a/NEWS +++ b/NEWS @@ -24,6 +24,7 @@ PHP 4 NEWS --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) diff --git a/ext/gd/gdttf.c b/ext/gd/gdttf.c index 84c73c0efa..c7aa98f9ca 100644 --- a/ext/gd/gdttf.c +++ b/ext/gd/gdttf.c @@ -744,11 +744,15 @@ gdttfchar(gdImage *im, int fg, font_t *font, 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); -- 2.40.0