pajoye Sun Oct 2 14:01:52 2005 EDT
Modified files:
/php-src/ext/gd config.m4 gd.c gdcache.c php_gd.h
/php-src/ext/gd/libgd gdcache.c
Log:
- drop freetype1 support
http://cvs.php.net/diff.php/php-src/ext/gd/config.m4?r1=1.154&r2=1.155&ty=u
Index: php-src/ext/gd/config.m4
diff -u php-src/ext/gd/config.m4:1.154 php-src/ext/gd/config.m4:1.155
--- php-src/ext/gd/config.m4:1.154 Sun May 29 19:16:41 2005
+++ php-src/ext/gd/config.m4 Sun Oct 2 14:01:49 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.154 2005/05/29 23:16:41 sniper Exp $
+dnl $Id: config.m4,v 1.155 2005/10/02 18:01:49 pajoye Exp $
dnl
dnl
@@ -27,9 +27,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)
@@ -141,41 +138,6 @@
fi
])
-AC_DEFUN([PHP_GD_FREETYPE1],[
- if test "$PHP_TTF" != "no"; then
- if test "$PHP_FREETYPE_DIR" = "no" -o "$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
@@ -289,7 +251,6 @@
PHP_GD_PNG
PHP_GD_XPM
PHP_GD_FREETYPE2
- PHP_GD_FREETYPE1
PHP_GD_T1LIB
dnl These are always available with bundled library
@@ -336,10 +297,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"
@@ -357,7 +314,6 @@
PHP_GD_PNG
PHP_GD_XPM
PHP_GD_FREETYPE2
- PHP_GD_FREETYPE1
PHP_GD_T1LIB
dnl Header path
@@ -406,7 +362,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/diff.php/php-src/ext/gd/gd.c?r1=1.312&r2=1.313&ty=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.312 php-src/ext/gd/gd.c:1.313
--- php-src/ext/gd/gd.c:1.312 Wed Aug 3 10:07:12 2005
+++ php-src/ext/gd/gd.c Sun Oct 2 14:01:49 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.312 2005/08/03 14:07:12 sniper Exp $ */
+/* $Id: gd.c,v 1.313 2005/10/02 18:01:49 pajoye Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -72,9 +72,6 @@
# include <ft2build.h>
# include FT_FREETYPE_H
# else
-# ifdef HAVE_LIBTTF
-# include <freetype.h>
-# endif
# endif
# include "gdttf.h"
#endif
@@ -506,14 +503,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
#endif
@@ -569,8 +558,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
http://cvs.php.net/diff.php/php-src/ext/gd/gdcache.c?r1=1.10&r2=1.11&ty=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.11
--- php-src/ext/gd/gdcache.c:1.10 Sun Jan 9 16:05:05 2005
+++ php-src/ext/gd/gdcache.c Sun Oct 2 14:01:50 2005
@@ -1,5 +1,5 @@
/*
- * $Id: gdcache.c,v 1.10 2005/01/09 21:05:05 sniper Exp $
+ * $Id: gdcache.c,v 1.11 2005/10/02 18:01:50 pajoye 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/diff.php/php-src/ext/gd/php_gd.h?r1=1.59&r2=1.60&ty=u
Index: php-src/ext/gd/php_gd.h
diff -u php-src/ext/gd/php_gd.h:1.59 php-src/ext/gd/php_gd.h:1.60
--- php-src/ext/gd/php_gd.h:1.59 Wed Aug 3 10:07:13 2005
+++ php-src/ext/gd/php_gd.h Sun Oct 2 14:01:50 2005
@@ -17,14 +17,14 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_gd.h,v 1.59 2005/08/03 14:07:13 sniper Exp $ */
+/* $Id: php_gd.h,v 1.60 2005/10/02 18:01:50 pajoye 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/diff.php/php-src/ext/gd/libgd/gdcache.c?r1=1.5&r2=1.6&ty=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.6
--- php-src/ext/gd/libgd/gdcache.c:1.5 Sun Dec 28 15:11:08 2003
+++ php-src/ext/gd/libgd/gdcache.c Sun Oct 2 14:01:51 2005
@@ -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_NEEDCACHE */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
