cvs: /php3 acconfig.h config.h.in configure.in /php3/functions gd.c gdttf.c php3_gd.h

rasmus Sat Nov 20 21:52:17 1999 EDT Modified files: /php3 acconfig.h config.h.in configure.in /php3/functions gd.c gdttf.c php3_gd.h Log: Fix ColorResolve bogosity Index: php3/acconfig.h diff -u php3/acconfig.h:1.115 php3/acconfig.h:1.116 --- php3/acconfig.h:1.115 Wed Nov 10 14:54:11 1999 +++ php3/acconfig.h Sat Nov 20 21:52:15 1999 @@ -3,7 +3,7 @@ #undef HAVE_LIBGD14 #undef HAVE_LIBGD15 #undef HAVE_LIBGD16 -#undef HAVE_LIBGD162 +#undef HAVE_GDIMAGECOLORRESOLVE #undef HAVE_LIBGD_LZW #undef ushort Index: php3/config.h.in diff -u php3/config.h.in:1.198 php3/config.h.in:1.199 --- php3/config.h.in:1.198 Wed Nov 10 14:54:11 1999 +++ php3/config.h.in Sat Nov 20 21:52:15 1999 @@ -73,7 +73,7 @@ #undef HAVE_LIBGD14 #undef HAVE_LIBGD15 #undef HAVE_LIBGD16 -#undef HAVE_LIBGD162 +#undef HAVE_GDIMAGECOLORRESOLVE #undef HAVE_LIBGD_LZW #undef ushort @@ -469,9 +469,6 @@ /* Define if you have the mkfifo function. */ #undef HAVE_MKFIFO - -/* Define if you have the mkstemp function. */ -#undef HAVE_MKSTEMP /* Define if you have the putenv function. */ #undef HAVE_PUTENV Index: php3/configure.in diff -u php3/configure.in:1.473 php3/configure.in:1.474 --- php3/configure.in:1.473 Mon Nov 15 06:45:37 1999 +++ php3/configure.in Sat Nov 20 21:52:15 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.473 1999/11/15 11:45:37 ssb Exp $ +dnl $Id: configure.in,v 1.474 1999/11/21 02:52:15 rasmus Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -770,7 +770,7 @@ old_LIBS=$LIBS LIBS="$LIBS -lpng -lz" AC_CHECK_LIB(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG)]) - AC_CHECK_LIB(gd, gdImageColorResolve, [ AC_DEFINE(HAVE_LIBGD162) ]) + AC_CHECK_LIB(gd, gdImageColorResolve, [ AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE) ]) LIBS=$old_LIBS if test "$ac_cv_lib_gd_gdImageCreateFromPng" = "yes"; then AC_ADD_LIBRARY(png) @@ -824,7 +824,7 @@ old_LIBS=$LIBS LIBS="$LIBS -lpng -lz" AC_CHECK_LIB(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG)]) - AC_CHECK_LIB(gd, gdImageColorResolve, [ AC_DEFINE(HAVE_LIBGD162) ]) + AC_CHECK_LIB(gd, gdImageColorResolve, [ AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE) ]) LIBS=$old_LIBS if test "$ac_cv_lib_gd_gdImageCreateFromPng" = "yes"; then AC_ADD_LIBRARY(png) @@ -849,7 +849,7 @@ old_LIBS=$LIBS LIBS="$LIBS -lpng -lz" AC_CHECK_LIB(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG)]) - AC_CHECK_LIB(gd, gdImageColorResolve, [ AC_DEFINE(HAVE_LIBGD162) ]) + AC_CHECK_LIB(gd, gdImageColorResolve, [ AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE) ]) LIBS=$old_LIBS if test "$ac_cv_lib_gd_gdImageCreateFromPng" = "yes"; then AC_ADD_LIBRARY(png) Index: php3/functions/gd.c diff -u php3/functions/gd.c:1.134 php3/functions/gd.c:1.135 --- php3/functions/gd.c:1.134 Wed Nov 10 14:54:12 1999 +++ php3/functions/gd.c Sat Nov 20 21:52:16 1999 @@ -29,7 +29,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.134 1999/11/10 19:54:12 rasmus Exp $ */ +/* $Id: gd.c,v 1.135 1999/11/21 02:52:16 rasmus Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -292,7 +292,7 @@ /* */ /* in a single function */ -#ifndef HAVE_LIBGD162 +#ifndef HAVE_GDIMAGECOLORRESOLVE int gdImageColorResolve(gdImagePtr im, int r, int g, int b) { Index: php3/functions/gdttf.c diff -u php3/functions/gdttf.c:1.22 php3/functions/gdttf.c:1.23 --- php3/functions/gdttf.c:1.22 Tue Sep 28 13:04:53 1999 +++ php3/functions/gdttf.c Sat Nov 20 21:52:16 1999 @@ -2,7 +2,7 @@ /* */ /* John Ellson ellson@lucent.com */ -/* $Id: gdttf.c,v 1.22 1999/09/28 17:04:53 markonen Exp $ */ +/* $Id: gdttf.c,v 1.23 1999/11/21 02:52:16 rasmus Exp $ */ #if WIN32|WINNT #include "config.w32.h" @@ -149,10 +149,8 @@ /* 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: */ @@ -162,7 +160,6 @@ /* color=gdImageColorClosest(im,R,G,B); */ /* */ /* in a single function */ - static int gdImageColorResolve(gdImagePtr im, int r, int g, int b) { @@ -203,6 +200,7 @@ im->open [op] = 0; return op; /* Return newly allocated color */ } +#endif /******************************************************************** * gdTcl_UtfToUniChar is borrowed from ... Index: php3/functions/php3_gd.h diff -u php3/functions/php3_gd.h:1.37 php3/functions/php3_gd.h:1.38 --- php3/functions/php3_gd.h:1.37 Tue Sep 28 13:51:56 1999 +++ php3/functions/php3_gd.h Sat Nov 20 21:52:16 1999 @@ -29,7 +29,7 @@ */ -/* $Id: php3_gd.h,v 1.37 1999/09/28 17:51:56 markonen Exp $ */ +/* $Id: php3_gd.h,v 1.38 1999/11/21 02:52:16 rasmus Exp $ */ #ifndef _PHP3_GD_H #define _PHP3_GD_H @@ -54,7 +54,7 @@ extern void php3_info_gd(void); extern int php3_minit_gd(INIT_FUNC_ARGS); extern int php3_mend_gd(void); -#ifndef HAVE_LIBGD162 +#ifndef HAVE_GDIMAGECOLORRESOLVE extern int gdImageColorResolve(gdImagePtr, int, int, int); #endif extern void php3_imagearc(INTERNAL_FUNCTION_PARAMETERS);