cvs: php4 /ext/gd gd.c
| From: | Jani Taskinen | Date: | Wed, 24 Oct 2001 10:42:32 +0000 |
| Subject: | cvs: php4 /ext/gd gd.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-7972@lists.php.net to get a copy of this message | ||
sniper Wed Oct 24 06:42:32 2001 EDT
Modified files:
/php4/ext/gd gd.c
Log:
Fixed logic bug introduced by me. Bug: #13796
Index: php4/ext/gd/gd.c
diff -u php4/ext/gd/gd.c:1.167 php4/ext/gd/gd.c:1.168
--- php4/ext/gd/gd.c:1.167 Sat Oct 13 09:12:30 2001
+++ php4/ext/gd/gd.c Wed Oct 24 06:42:31 2001
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.167 2001/10/13 13:12:30 sniper Exp $ */
+/* $Id: gd.c,v 1.168 2001/10/24 10:42:31 sniper Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -2761,11 +2761,10 @@
}
else
# endif
+
# if HAVE_GD_STRINGFT
error = gdImageStringFT(im, brect, col, fontname, ptsize, angle, x, y, str);
-# endif
-
-# if HAVE_GD_STRINGTTF
+# elif HAVE_GD_STRINGTTF
error = gdImageStringTTF(im, brect, col, fontname, ptsize, angle, x, y, str);
# endif