iliaa Wed Jun 9 10:50:33 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/ext/gd/libgd gdft.c
Log:
MFH: Fixed bug #28175 (Allow bundled GD to compile against freetype 2.1.2).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.680&r2=1.1247.2.681&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.680 php-src/NEWS:1.1247.2.681
--- php-src/NEWS:1.1247.2.680 Wed Jun 9 10:39:36 2004
+++ php-src/NEWS Wed Jun 9 10:50:32 2004
@@ -14,6 +14,8 @@
(gavin at ipalsoftware dot com, Ilia)
- Fixed bug #28525 (gmp_powm() does not work with hexadecimal string modulo
represented as a string). (pickett at sumu dot org, Ilia)
+- Fixed bug #28175 (Allow bundled GD to compile against freetype 2.1.2).
+ (Elf, Ilia)
03 Jun 2004, Version 4.3.7
- Upgraded bundled GD library to 2.0.23. (Ilia)
http://cvs.php.net/diff.php/php-src/ext/gd/libgd/gdft.c?r1=1.11.2.17&r2=1.11.2.18&ty=u
Index: php-src/ext/gd/libgd/gdft.c
diff -u php-src/ext/gd/libgd/gdft.c:1.11.2.17 php-src/ext/gd/libgd/gdft.c:1.11.2.18
--- php-src/ext/gd/libgd/gdft.c:1.11.2.17 Sun May 9 13:34:02 2004
+++ php-src/ext/gd/libgd/gdft.c Wed Jun 9 10:50:33 2004
@@ -984,7 +984,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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
