iliaa Sun May 9 13:33:50 2004 EDT
Modified files:
/php-src/ext/gd gd.c
/php-src/ext/gd/libgd gdft.c
Log:
Upgrade bundled GD library to 2.0.23.
Fixed bug #28175 (build problem for people using FreeType 2.1.0-2.1.2).
http://cvs.php.net/diff.php/php-src/ext/gd/gd.c?r1=1.291&r2=1.292&ty=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.291 php-src/ext/gd/gd.c:1.292
--- php-src/ext/gd/gd.c:1.291 Wed Apr 7 18:27:32 2004
+++ php-src/ext/gd/gd.c Sun May 9 13:33:50 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.291 2004/04/07 22:27:32 edink Exp $ */
+/* $Id: gd.c,v 1.292 2004/05/09 17:33:50 iliaa Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -453,7 +453,7 @@
/* }}} */
#if HAVE_GD_BUNDLED
-#define PHP_GD_VERSION_STRING "bundled (2.0.22 compatible)"
+#define PHP_GD_VERSION_STRING "bundled (2.0.23 compatible)"
#elif HAVE_LIBGD20
#define PHP_GD_VERSION_STRING "2.0 or higher"
#elif HAVE_GDIMAGECOLORRESOLVE
http://cvs.php.net/diff.php/php-src/ext/gd/libgd/gdft.c?r1=1.33&r2=1.34&ty=u
Index: php-src/ext/gd/libgd/gdft.c
diff -u php-src/ext/gd/libgd/gdft.c:1.33 php-src/ext/gd/libgd/gdft.c:1.34
--- php-src/ext/gd/libgd/gdft.c:1.33 Mon Mar 29 13:20:33 2004
+++ php-src/ext/gd/libgd/gdft.c Sun May 9 13:33:50 2004
@@ -434,7 +434,7 @@
encoding = charmap->encoding_id;
/* EAM DEBUG - Newer versions of libfree2 make it easier by defining encodings */
-#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 (charmap->encoding == FT_ENCODING_MS_SYMBOL
|| charmap->encoding == FT_ENCODING_ADOBE_CUSTOM
|| charmap->encoding == FT_ENCODING_ADOBE_STANDARD) {
@@ -443,7 +443,7 @@
a->face->charmap = charmap;
return (void *)a;
}
-#endif /* Freetype 2.1 or better */
+#endif /* Freetype 2.1.3 or better */
/* EAM DEBUG */
if ((platform == 3 && encoding == 1) /* Windows Unicode */
@@ -773,6 +773,8 @@
* colorindexes. -- 27.06.2001 <[EMAIL PROTECTED]>
*/
gdCache_head_t *tc_cache;
+ /* Tuneable horizontal and vertical resolution in dots per inch */
+ int hdpi, vdpi;
if (strex && ((strex->flags & gdFTEX_LINESPACE) == gdFTEX_LINESPACE)) {
linespace = strex->linespacing;
@@ -802,7 +804,19 @@
face = font->face; /* shortcut */
slot = face->glyph; /* shortcut */
- if (FT_Set_Char_Size (face, 0, (FT_F26Dot6) (ptsize * 64), GD_RESOLUTION,
GD_RESOLUTION)) {
+ /*
+ * Added hdpi and vdpi to support images at non-screen resolutions, i.e. 300
dpi TIFF,
+ * or 100h x 50v dpi FAX format. 2.0.23.
+ * 2004/02/27 Mark Shackelford, [EMAIL PROTECTED]
+ */
+ hdpi = GD_RESOLUTION;
+ vdpi = GD_RESOLUTION;
+ if (strex && (strex->flags & gdFTEX_RESOLUTION)) {
+ hdpi = strex->hdpi;
+ vdpi = strex->vdpi;
+ }
+
+ if (FT_Set_Char_Size(face, 0, (FT_F26Dot6) (ptsize * 64), hdpi, vdpi)) {
gdCacheDelete(tc_cache);
gdMutexUnlock(gdFontCacheMutex);
return "Could not set character size";
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
