cvs: php4(PHP_4_0_7) /ext/gd gd.c
| From: | Jani Taskinen | Date: | Wed, 24 Oct 2001 10:43:26 +0000 |
| Subject: | cvs: php4(PHP_4_0_7) /ext/gd gd.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-7973@lists.php.net to get a copy of this message | ||
sniper Wed Oct 24 06:43:26 2001 EDT
Modified files: (Branch: PHP_4_0_7)
/php4/ext/gd gd.c
Log:
MFH
Index: php4/ext/gd/gd.c
diff -u php4/ext/gd/gd.c:1.154.2.6 php4/ext/gd/gd.c:1.154.2.7
--- php4/ext/gd/gd.c:1.154.2.6 Thu Oct 11 19:51:25 2001
+++ php4/ext/gd/gd.c Wed Oct 24 06:43:26 2001
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.154.2.6 2001/10/11 23:51:25 ssb Exp $ */
+/* $Id: gd.c,v 1.154.2.7 2001/10/24 10:43:26 sniper Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -2760,11 +2760,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