scottmac Fri Jul 18 01:16:25 2008 UTC Removed files: (Branch: PHP_5_3) /php-src/ext/gd gdttf.c gdttf.h
Modified files: /php-src/ext/gd config.m4 config.w32 gd.c gdcache.c php_gd.h /php-src/ext/gd/libgd gdcache.c Log: Remove freetype1 support
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.m4?r1=1.154.2.1.2.6&r2=1.154.2.1.2.6.2.1&diff_format=u Index: php-src/ext/gd/config.m4 diff -u php-src/ext/gd/config.m4:1.154.2.1.2.6 php-src/ext/gd/config.m4:1.154.2.1.2.6.2.1 --- php-src/ext/gd/config.m4:1.154.2.1.2.6 Tue Jul 3 17:25:33 2007 +++ php-src/ext/gd/config.m4 Fri Jul 18 01:16:25 2008 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.154.2.1.2.6 2007/07/03 17:25:33 sniper Exp $ +dnl $Id: config.m4,v 1.154.2.1.2.6.2.1 2008/07/18 01:16:25 scottmac Exp $ dnl dnl @@ -28,9 +28,6 @@ PHP_ARG_WITH(xpm-dir, for the location of libXpm, [ --with-xpm-dir[=DIR] GD: Set the path to libXpm install prefix], no, no) -PHP_ARG_WITH(ttf, for FreeType 1.x support, -[ --with-ttf[=DIR] GD: Include FreeType 1.x support], no, no) - PHP_ARG_WITH(freetype-dir, for FreeType 2, [ --with-freetype-dir[=DIR] GD: Set the path to FreeType 2 install prefix], no, no) @@ -165,41 +162,6 @@ fi ]) -AC_DEFUN([PHP_GD_FREETYPE1],[ - if test "$PHP_TTF" != "no"; then - if test "$PHP_FREETYPE_DIR" = "no" || test "$PHP_FREETYPE_DIR" = ""; then - if test -n "$PHP_TTF"; then - for i in $PHP_TTF /usr/local /usr; do - if test -f "$i/include/freetype.h"; then - TTF_DIR=$i - unset TTF_INC_DIR - fi - if test -f "$i/include/freetype/freetype.h"; then - TTF_DIR=$i - TTF_INC_DIR=$i/include/freetype - fi - if test -f "$i/include/freetype1/freetype/freetype.h"; then - TTF_DIR=$i - TTF_INC_DIR=$i/include/freetype1/freetype - fi - test -n "$TTF_DIR" && break - done - fi - if test -n "$TTF_DIR" ; then - AC_DEFINE(HAVE_LIBTTF,1,[ ]) - PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD) - fi - if test -z "$TTF_INC_DIR"; then - TTF_INC_DIR=$TTF_DIR/include - fi - PHP_ADD_INCLUDE($TTF_INC_DIR) - else - AC_MSG_CHECKING(for FreeType 1 support) - AC_MSG_RESULT([no - FreeType 2.x is to be used instead]) - fi - fi -]) - AC_DEFUN([PHP_GD_FREETYPE2],[ if test "$PHP_FREETYPE_DIR" != "no"; then @@ -322,7 +284,6 @@ PHP_GD_PNG PHP_GD_XPM PHP_GD_FREETYPE2 - PHP_GD_FREETYPE1 PHP_GD_T1LIB dnl These are always available with bundled library @@ -370,10 +331,6 @@ GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_LIBFREETYPE" fi - if test -n "$TTF_DIR"; then - GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_LIBTTF" - fi - if test -n "$USE_GD_JIS_CONV"; then AC_DEFINE(USE_GD_JISX0208, 1, [ ]) GDLIB_CFLAGS="$GDLIB_CFLAGS -DJISX0208" @@ -392,7 +349,6 @@ PHP_GD_PNG PHP_GD_XPM PHP_GD_FREETYPE2 - PHP_GD_FREETYPE1 PHP_GD_T1LIB dnl Header path @@ -441,7 +397,7 @@ dnl Common for both builtin and external GD dnl if test "$PHP_GD" != "no"; then - PHP_NEW_EXTENSION(gd, gd.c gdttf.c $extra_sources, $ext_shared,, \\$(GDLIB_CFLAGS)) + PHP_NEW_EXTENSION(gd, gd.c $extra_sources, $ext_shared,, \\$(GDLIB_CFLAGS)) if test "$GD_MODULE_TYPE" = "builtin"; then GDLIB_CFLAGS="-I$ext_srcdir/libgd $GDLIB_CFLAGS" http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.10.4.4.2.6&r2=1.10.4.4.2.7&diff_format=u Index: php-src/ext/gd/config.w32 diff -u php-src/ext/gd/config.w32:1.10.4.4.2.6 php-src/ext/gd/config.w32:1.10.4.4.2.7 --- php-src/ext/gd/config.w32:1.10.4.4.2.6 Fri Jul 11 15:05:05 2008 +++ php-src/ext/gd/config.w32 Fri Jul 18 01:16:25 2008 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.10.4.4.2.6 2008/07/11 15:05:05 rrichards Exp $ +// $Id: config.w32,v 1.10.4.4.2.7 2008/07/18 01:16:25 scottmac Exp $ // vim:ft=javascript ARG_WITH("gd", "Bundled GD support", "yes,shared"); @@ -28,7 +28,7 @@ CHECK_LIB("User32.lib", "gd", PHP_GD); CHECK_LIB("Gdi32.lib", "gd", PHP_GD); - EXTENSION("gd", "gd.c gdttf.c", null, "-Iext/gd/libgd", "php_gd2.dll"); + EXTENSION("gd", "gd.c", null, "-Iext/gd/libgd", "php_gd2.dll"); ADD_SOURCES("ext/gd/libgd", "gd2copypal.c gd_arc_f_buggy.c gd.c \ gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c \ gdft.c gd_gd2.c gd_gd.c gd_gif_in.c gd_gif_out.c gdhelpers.c gd_io.c gd_io_dp.c \ http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.11&r2=1.312.2.20.2.32.2.12&diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.11 php-src/ext/gd/gd.c:1.312.2.20.2.32.2.12 --- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.11 Thu Jul 17 23:13:09 2008 +++ php-src/ext/gd/gd.c Fri Jul 18 01:16:25 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.312.2.20.2.32.2.11 2008/07/17 23:13:09 pajoye Exp $ */ +/* $Id: gd.c,v 1.312.2.20.2.32.2.12 2008/07/18 01:16:25 scottmac Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -80,12 +80,7 @@ # ifdef HAVE_LIBFREETYPE # include <ft2build.h> # include FT_FREETYPE_H -# else -# ifdef HAVE_LIBTTF -# include <freetype.h> -# endif # endif -# include "gdttf.h" #endif #ifndef M_PI @@ -1390,13 +1385,6 @@ #endif php_info_print_table_row(2, "FreeType Version", tmp); } -#elif HAVE_LIBTTF - php_info_print_table_row(2, "FreeType Linkage", "with TTF library"); - { - char tmp[256]; - snprintf(tmp, sizeof(tmp), "%d.%d", TT_FREETYPE_MAJOR, TT_FREETYPE_MINOR); - php_info_print_table_row(2, "FreeType Version", tmp); - } #else php_info_print_table_row(2, "FreeType Linkage", "with unknown library"); #endif @@ -1452,8 +1440,6 @@ add_assoc_bool(return_value, "FreeType Support", 1); #if HAVE_LIBFREETYPE add_assoc_string(return_value, "FreeType Linkage", "with freetype", 1); -#elif HAVE_LIBTTF - add_assoc_string(return_value, "FreeType Linkage", "with TTF library", 1); #else add_assoc_string(return_value, "FreeType Linkage", "with unknown library", 1); #endif @@ -4143,8 +4129,6 @@ error = gdImageStringTTF(im, brect, col, fontname, ptsize, angle, x, y, str); # endif -#else /* !USE_GD_IMGSTRTTF */ - error = gdttf(im, brect, col, fontname, ptsize, angle, x, y, str); #endif if (error) { http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gdcache.c?r1=1.10&r2=1.10.6.1&diff_format=u Index: php-src/ext/gd/gdcache.c diff -u php-src/ext/gd/gdcache.c:1.10 php-src/ext/gd/gdcache.c:1.10.6.1 --- php-src/ext/gd/gdcache.c:1.10 Sun Jan 9 21:05:05 2005 +++ php-src/ext/gd/gdcache.c Fri Jul 18 01:16:25 2008 @@ -1,5 +1,5 @@ /* - * $Id: gdcache.c,v 1.10 2005/01/09 21:05:05 sniper Exp $ + * $Id: gdcache.c,v 1.10.6.1 2008/07/18 01:16:25 scottmac Exp $ * * Caches of pointers to user structs in which the least-recently-used * element is replaced in the event of a cache miss after the cache has @@ -44,7 +44,7 @@ #else #include <php_config.h> #endif -#if (HAVE_LIBTTF | HAVE_LIBFREETYPE) && !defined(HAVE_GD_CACHE_CREATE) +#if HAVE_LIBFREETYPE && !defined(HAVE_GD_CACHE_CREATE) #include "gdcache.h" http://cvs.php.net/viewvc.cgi/php-src/ext/gd/php_gd.h?r1=1.59.2.3.2.5.2.2&r2=1.59.2.3.2.5.2.3&diff_format=u Index: php-src/ext/gd/php_gd.h diff -u php-src/ext/gd/php_gd.h:1.59.2.3.2.5.2.2 php-src/ext/gd/php_gd.h:1.59.2.3.2.5.2.3 --- php-src/ext/gd/php_gd.h:1.59.2.3.2.5.2.2 Wed Jan 30 09:41:12 2008 +++ php-src/ext/gd/php_gd.h Fri Jul 18 01:16:25 2008 @@ -17,14 +17,14 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_gd.h,v 1.59.2.3.2.5.2.2 2008/01/30 09:41:12 dmitry Exp $ */ +/* $Id: php_gd.h,v 1.59.2.3.2.5.2.3 2008/07/18 01:16:25 scottmac Exp $ */ #ifndef PHP_GD_H #define PHP_GD_H #define HAVE_GDIMAGECREATEFROMPNG 1 -#if HAVE_LIBTTF|HAVE_LIBFREETYPE +#if HAVE_LIBFREETYPE #define ENABLE_GD_TTF #endif http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gdcache.c?r1=1.5&r2=1.5.8.1&diff_format=u Index: php-src/ext/gd/libgd/gdcache.c diff -u php-src/ext/gd/libgd/gdcache.c:1.5 php-src/ext/gd/libgd/gdcache.c:1.5.8.1 --- php-src/ext/gd/libgd/gdcache.c:1.5 Sun Dec 28 20:11:08 2003 +++ php-src/ext/gd/libgd/gdcache.c Fri Jul 18 01:16:25 2008 @@ -1,13 +1,9 @@ #include "gd.h" #include "gdhelpers.h" -#ifdef HAVE_LIBTTF -#define NEED_CACHE 1 -#else #ifdef HAVE_LIBFREETYPE #define NEED_CACHE 1 #endif -#endif #ifdef NEED_CACHE @@ -211,4 +207,4 @@ } #endif /* TEST */ -#endif /* HAVE_LIBTTF */ +#endif /* HAVE_NEECACHE */
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php