cvs: /php4 stamp-h.in /php4/ext/gd config.m4 gdttf.c

rasmus Sat Nov 20 23:08:27 1999 EDT Modified files: /php4 stamp-h.in /php4/ext/gd config.m4 gdttf.c Log: # Fix ColorResolve bogosity Fix gd problems Index: php4/stamp-h.in diff -u php4/stamp-h.in:1.1 php4/stamp-h.in:1.2 --- php4/stamp-h.in:1.1 Wed Apr 7 17:02:47 1999 +++ php4/stamp-h.in Sat Nov 20 23:07:55 1999 @@ -0,0 +1 @@ +timestamp Index: php4/ext/gd/config.m4 diff -u php4/ext/gd/config.m4:1.15 php4/ext/gd/config.m4:1.16 --- php4/ext/gd/config.m4:1.15 Wed Nov 10 14:22:35 1999 +++ php4/ext/gd/config.m4 Sat Nov 20 23:07:56 1999 @@ -90,6 +90,21 @@ ],[ AC_CHECK_LIB(gd, gdImageLine) AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13) ]) + if test "$ac_cv_lib_gd_gdImageLine" = "yes"; then + old_LIBS=$LIBS + AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13) ]) + LIBS="$LIBS -lpng -lz" + AC_CHECK_LIB(gd, gdImageColorResolve, [AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE,1)]) + AC_CHECK_LIB(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG, 1)]) + + LIBS=$old_LIBS + LDFLAGS=$old_LDFLAGS + if test "$ac_cv_lib_gd_gdImageCreateFromPng" = "yes"; then + AC_ADD_LIBRARY(png) + AC_ADD_LIBRARY(z) + fi + ac_cv_lib_gd_gdImageLine=yes + fi ]) if test "$ac_cv_lib_gd_gdImageLine" = "yes"; then CHECK_TTF="yes" Index: php4/ext/gd/gdttf.c diff -u php4/ext/gd/gdttf.c:1.4 php4/ext/gd/gdttf.c:1.5 --- php4/ext/gd/gdttf.c:1.4 Fri Jul 23 11:56:47 1999 +++ php4/ext/gd/gdttf.c Sat Nov 20 23:07:56 1999 @@ -2,7 +2,7 @@ /* */ /* John Ellson ellson@lucent.com */ -/* $Id: gdttf.c,v 1.4 1999/07/23 15:56:47 sas Exp $ */ +/* $Id: gdttf.c,v 1.5 1999/11/21 04:07:56 rasmus Exp $ */ #if WIN32|WINNT #include "config.w32.h" @@ -149,10 +149,9 @@ /* local prototype */ char *gdttfchar(gdImage *im, int fg, font_t *font, int x, int y, TT_F26Dot6 x1, TT_F26Dot6 y1, TT_F26Dot6 *advance, TT_BBox **bbox, char **next); -/* This prototype is missing from gd.h */ -/* FIXME Since when does GD have this function??? My copy of 1.3 doesnt +#ifndef HAVE_GDIMAGECOLORRESOLVE + int gdImageColorResolve(gdImagePtr im, int r, int g, int b); -*/ /********************************************************************/ /* gdImageColorResolve is a replacement for the old fragment: */ @@ -203,6 +202,7 @@ im->open [op] = 0; return op; /* Return newly allocated color */ } +#endif /******************************************************************** * gdTcl_UtfToUniChar is borrowed from ...