cvs: /php4 ChangeLog /php4/ext/gd config.m4 gd.c gdcache.c gdttf.c php3_gd.h

zeev Fri Jul 23 11:18:37 1999 EDT Modified files: /php4 ChangeLog /php4/ext/gd config.m4 gd.c gdcache.c gdttf.c php3_gd.h Log: Added check for freetype.h Index: php4/ChangeLog diff -u php4/ChangeLog:1.12 php4/ChangeLog:1.13 --- php4/ChangeLog:1.12 Fri Jul 23 09:47:56 1999 +++ php4/ChangeLog Fri Jul 23 11:18:36 1999 @@ -2,6 +2,7 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ??? ?? 1999, Version 4.0 Beta 2 +- Added a check for freetype.h - fixed build on RedHat 6.0 (Zeev) - Fixed array_walk() to work in PHP4 (Andrey) - Ported all remaining date() format options from PHP3 (Andrey) - $php_errormsg now works (Andrey) Index: php4/ext/gd/config.m4 diff -u php4/ext/gd/config.m4:1.3 php4/ext/gd/config.m4:1.4 --- php4/ext/gd/config.m4:1.3 Sun Apr 25 19:29:52 1999 +++ php4/ext/gd/config.m4 Fri Jul 23 11:18:37 1999 @@ -48,6 +48,7 @@ GD_INCLUDE="-I/usr/pkg/include/gd" fi AC_CHECK_LIB(ttf, TT_Open_Face) + AC_CHECK_HEADERS(freetype.h) PHP_EXTENSION(gd) EXTRA_LIBS="$EXTRA_LIBS $GD_LIBS" INCLUDES="$INCLUDES $GD_INCLUDE" Index: php4/ext/gd/gd.c diff -u php4/ext/gd/gd.c:1.10 php4/ext/gd/gd.c:1.11 --- php4/ext/gd/gd.c:1.10 Fri Jul 16 09:12:47 1999 +++ php4/ext/gd/gd.c Fri Jul 23 11:18:37 1999 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.10 1999/07/16 13:12:47 zeev Exp $ */ +/* $Id: gd.c,v 1.11 1999/07/23 15:18:37 zeev Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -49,7 +49,7 @@ #include <gdfontmb.h> /* 3 Medium bold font */ #include <gdfontl.h> /* 4 Large font */ #include <gdfontg.h> /* 5 Giant font */ -#if HAVE_LIBTTF +#ifdef ENABLE_GD_TTF # include "gdttf.h" #endif @@ -57,7 +57,7 @@ #define M_PI 3.14159265358979323846 #endif -#if HAVE_LIBTTF +#ifdef ENABLE_GD_TTF static void php3_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int); #endif @@ -118,7 +118,7 @@ {"imagesx", php3_imagesxfn, NULL}, {"imagesy", php3_imagesyfn, NULL}, {"imagedashedline", php3_imagedashedline, NULL}, -#if HAVE_LIBTTF +#ifdef ENABLE_GD_TTF {"imagettfbbox", php3_imagettfbbox, NULL}, {"imagettftext", php3_imagettftext, NULL}, #endif @@ -175,7 +175,7 @@ #else php3_printf("Version 1.2"); #endif -#if HAVE_LIBTTF +#ifdef ENABLE_GD_TTF php3_printf(" with FreeType support"); #endif } @@ -1671,7 +1671,7 @@ } /* }}} */ -#if HAVE_LIBTTF +#ifdef ENABLE_GD_TTF #define TTFTEXT_DRAW 0 #define TTFTEXT_BBOX 1 Index: php4/ext/gd/gdcache.c diff -u php4/ext/gd/gdcache.c:1.2 php4/ext/gd/gdcache.c:1.3 --- php4/ext/gd/gdcache.c:1.2 Mon May 10 20:01:42 1999 +++ php4/ext/gd/gdcache.c Fri Jul 23 11:18:37 1999 @@ -1,5 +1,5 @@ /* - * $Id: gdcache.c,v 1.2 1999/05/11 00:01:42 zeev Exp $ + * $Id: gdcache.c,v 1.3 1999/07/23 15:18:37 zeev 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 @@ -38,11 +38,11 @@ /* This just seems unessacary */ #if (WIN32|WINNT) -#define HAVE_LIBTTF 1 +#define ENABLE_GD_TTF #else #include "php_config.h" #endif -#if HAVE_LIBTTF +#ifdef ENABLE_GD_TTF #include "gdcache.h" @@ -198,4 +198,4 @@ #endif -#endif /* HAVE_LIBTTF */ +#endif /* ENABLE_GD_TTF */ Index: php4/ext/gd/gdttf.c diff -u php4/ext/gd/gdttf.c:1.2 php4/ext/gd/gdttf.c:1.3 --- php4/ext/gd/gdttf.c:1.2 Mon May 10 20:01:42 1999 +++ php4/ext/gd/gdttf.c Fri Jul 23 11:18:37 1999 @@ -2,14 +2,14 @@ /* */ /* John Ellson ellson@lucent.com */ -/* $Id: gdttf.c,v 1.2 1999/05/11 00:01:42 zeev Exp $ */ +/* $Id: gdttf.c,v 1.3 1999/07/23 15:18:37 zeev Exp $ */ #if WIN32|WINNT #include "config.w32.h" #else #include "php_config.h" #endif -#if HAVE_LIBTTF +#ifdef ENABLE_GD_TTF #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -852,7 +852,7 @@ return (char *)NULL; } -#endif /* HAVE_LIBTTF */ +#endif /* ENABLE_GD_TTF */ /* * Local variables: Index: php4/ext/gd/php3_gd.h diff -u php4/ext/gd/php3_gd.h:1.5 php4/ext/gd/php3_gd.h:1.6 --- php4/ext/gd/php3_gd.h:1.5 Fri May 21 06:05:51 1999 +++ php4/ext/gd/php3_gd.h Fri Jul 23 11:18:37 1999 @@ -29,11 +29,16 @@ */ -/* $Id: php3_gd.h,v 1.5 1999/05/21 10:05:51 sas Exp $ */ +/* $Id: php3_gd.h,v 1.6 1999/07/23 15:18:37 zeev Exp $ */ #ifndef _PHP3_GD_H #define _PHP3_GD_H + +#if defined(HAVE_LIBTTF) && defined(HAVE_FREETYPE_H) +#define ENABLE_GD_TTF +#endif + #if COMPILE_DL #undef HAVE_LIBGD #define HAVE_LIBGD 1 @@ -89,7 +94,7 @@ void php3_free_gd_font(gdFontPtr); void _php3_gdimagecharup(gdImagePtr, gdFontPtr, int, int, int, int); PHP_FUNCTION(imagedashedline); -#ifdef HAVE_LIBTTF +#ifdef ENABLE_GD_TTF PHP_FUNCTION(imagettfbbox); PHP_FUNCTION(imagettftext); #endif