cvs: php-src /ext/gd/libgd gdft.c
| From: | Ilia Alshanetsky | Date: | Wed, 09 Jun 2004 14:50:05 +0000 |
| Subject: | cvs: php-src /ext/gd/libgd gdft.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-27597@lists.php.net to get a copy of this message | ||
iliaa Wed Jun 9 10:50:05 2004 EDT
Modified files:
/php-src/ext/gd/libgd gdft.c
Log:
Fixed bug #28175 (Allow bundled GD to compile against freetype 2.1.2).
http://cvs.php.net/diff.php/php-src/ext/gd/libgd/gdft.c?r1=1.34&r2=1.35&ty=u
Index: php-src/ext/gd/libgd/gdft.c
diff -u php-src/ext/gd/libgd/gdft.c:1.34 php-src/ext/gd/libgd/gdft.c:1.35
--- php-src/ext/gd/libgd/gdft.c:1.34 Sun May 9 13:33:50 2004
+++ php-src/ext/gd/libgd/gdft.c Wed Jun 9 10:50:05 2004
@@ -914,7 +914,7 @@
}
/* EAM DEBUG */
-#if (defined(FREETYPE_MAJOR) && (FREETYPE_MAJOR >=2 ) && (FREETYPE_MINOR >=
1))
+#if (defined(FREETYPE_MAJOR) && ((FREETYPE_MAJOR == 2 && ((FREETYPE_MINOR == 1
&& FREETYPE_PATCH >= 3) || FREETYPE_MINOR > 1) || FREETYPE_MAJOR > 2)))
if (font->face->charmap->encoding == FT_ENCODING_MS_SYMBOL) {
/* I do not know the significance of the constant 0xf000.
* It was determined by inspection of the character codes