cvs: php4(PHP_4_3) /ext/gd gdttf.c
| From: | Jani Taskinen | Date: | Thu, 01 May 2003 23:50:26 +0000 |
| Subject: | cvs: php4(PHP_4_3) /ext/gd gdttf.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-20637@lists.php.net to get a copy of this message | ||
sniper Thu May 1 19:50:26 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/gd gdttf.c
Log:
MFH: - Fixed bug #23427 (compile failure with GD 1.8.3)
Index: php4/ext/gd/gdttf.c
diff -u php4/ext/gd/gdttf.c:1.16.10.2 php4/ext/gd/gdttf.c:1.16.10.3
--- php4/ext/gd/gdttf.c:1.16.10.2 Sat Mar 8 13:28:07 2003
+++ php4/ext/gd/gdttf.c Thu May 1 19:50:25 2003
@@ -2,7 +2,7 @@
/* */
/* John Ellson ellson@lucent.com */
-/* $Id: gdttf.c,v 1.16.10.2 2003/03/08 18:28:07 derick Exp $ */
+/* $Id: gdttf.c,v 1.16.10.3 2003/05/01 23:50:25 sniper Exp $ */
#include "php.h"
@@ -744,9 +744,12 @@
if (tweencolorkey.pixel > 0) {
x3 = x2 + col;
if (x3 >= im->sx || x3 < 0) continue;
+#if HAVE_LIBGD20
if (im->trueColor) {
pixel = &im->tpixels[y3][x3];
- } else {
+ } else
+#endif
+ {
#if HAVE_LIBGD13
pixel = &im->pixels[y3][x3];
#else