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

markonen Thu Jul 29 14:40:19 1999 EDT Modified files: /php3 acconfig.h config.h.in configure.in /php3/functions gd.c php3_gd.h Log: ifdef gdImageColorResolve out if using GD 1.6.2 Index: php3/acconfig.h diff -u php3/acconfig.h:1.107 php3/acconfig.h:1.108 --- php3/acconfig.h:1.107 Fri Jul 16 16:28:57 1999 +++ php3/acconfig.h Thu Jul 29 14:40:17 1999 @@ -1,6 +1,7 @@ #undef HAVE_LIBGD14 #undef HAVE_LIBGD15 #undef HAVE_LIBGD16 +#undef HAVE_LIBGD162 #undef HAVE_LIBGD_LZW #undef ushort Index: php3/config.h.in diff -u php3/config.h.in:1.185 php3/config.h.in:1.186 --- php3/config.h.in:1.185 Fri Jul 23 11:18:01 1999 +++ php3/config.h.in Thu Jul 29 14:40:17 1999 @@ -71,6 +71,7 @@ #undef HAVE_LIBGD14 #undef HAVE_LIBGD15 #undef HAVE_LIBGD16 +#undef HAVE_LIBGD162 #undef HAVE_LIBGD_LZW #undef ushort Index: php3/configure.in diff -u php3/configure.in:1.449 php3/configure.in:1.450 --- php3/configure.in:1.449 Thu Jul 29 10:50:57 1999 +++ php3/configure.in Thu Jul 29 14:40:17 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.449 1999/07/29 14:50:57 rasmus Exp $ +dnl $Id: configure.in,v 1.450 1999/07/29 18:40:17 markonen Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -704,6 +704,7 @@ AC_DEFINE(HAVE_LIBGD) AC_MSG_RESULT(yes) AC_CHECK_LIB(gd, gdImageLzw, [ AC_DEFINE(HAVE_LIBGD_LZW) ]) + AC_CHECK_LIB(gd, gdImageColorResolve, [ AC_DEFINE(HAVE_LIBGD162) ]) AC_CHECK_LIB(gd, gdImageGif, [], [ AC_DEFINE(HAVE_LIBGD16) ]) AC_CHECK_LIB(gd, gdImageCopyMerge, [ AC_DEFINE(HAVE_LIBGD15) ]) AC_CHECK_LIB(gd, gdImageGifToSink, [ AC_DEFINE(HAVE_LIBGD14) ]) @@ -712,6 +713,7 @@ ;; *) dnl A whole whack of possible places where this might be + test -f $withval/include/gd1.6/gd.h && GD_INCLUDE="$withval/include/gd1.6" test -f $withval/include/gd1.5/gd.h && GD_INCLUDE="$withval/include/gd1.5" test -f $withval/include/gd1.4/gd.h && GD_INCLUDE="$withval/include/gd1.4" test -f $withval/include/gd1.3/gd.h && GD_INCLUDE="$withval/include/gd1.3" @@ -745,6 +747,7 @@ old_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -L$GD_LIB" AC_CHECK_LIB(gd, gdImageLzw, [ AC_DEFINE(HAVE_LIBGD_LZW) ]) + AC_CHECK_LIB(gd, gdImageColorResolve, [ AC_DEFINE(HAVE_LIBGD162) ]) AC_CHECK_LIB(gd, gdImageGif, [], [ AC_DEFINE(HAVE_LIBGD16) ]) AC_CHECK_LIB(gd, gdImageCopyMerge, [ AC_DEFINE(HAVE_LIBGD15) ]) AC_CHECK_LIB(gd, gdImageGifToSink, [ AC_DEFINE(HAVE_LIBGD14) ]) @@ -761,6 +764,7 @@ AC_ADD_LIBRARY(gd) ]) AC_CHECK_LIB(gd, gdImageLzw, [ AC_DEFINE(HAVE_LIBGD_LZW) ]) + AC_CHECK_LIB(gd, gdImageColorResolve, [ AC_DEFINE(HAVE_LIBGD162) ]) AC_CHECK_LIB(gd, gdImageGif, [], [ AC_DEFINE(HAVE_LIBGD16) ]) AC_CHECK_LIB(gd, gdImageCopyMerge, [ AC_DEFINE(HAVE_LIBGD15) ]) AC_CHECK_LIB(gd, gdImageGifToSink, [ AC_DEFINE(HAVE_LIBGD14) ]) Index: php3/functions/gd.c diff -u php3/functions/gd.c:1.129 php3/functions/gd.c:1.130 --- php3/functions/gd.c:1.129 Sat Jul 17 04:11:15 1999 +++ php3/functions/gd.c Thu Jul 29 14:40:17 1999 @@ -29,7 +29,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.129 1999/07/17 08:11:15 jim Exp $ */ +/* $Id: gd.c,v 1.130 1999/07/29 18:40:17 markonen Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -286,6 +286,7 @@ /* */ /* in a single function */ +#ifndef HAVE_LIBGD162 int gdImageColorResolve(gdImagePtr im, int r, int g, int b) { @@ -326,6 +327,7 @@ im->open [op] = 0; return op; /* Return newly allocated color */ } +#endif void php3_free_gd_font(gdFontPtr fp) { Index: php3/functions/php3_gd.h diff -u php3/functions/php3_gd.h:1.34 php3/functions/php3_gd.h:1.35 --- php3/functions/php3_gd.h:1.34 Mon Jul 12 14:34:15 1999 +++ php3/functions/php3_gd.h Thu Jul 29 14:40:17 1999 @@ -29,7 +29,7 @@ */ -/* $Id: php3_gd.h,v 1.34 1999/07/12 18:34:15 markonen Exp $ */ +/* $Id: php3_gd.h,v 1.35 1999/07/29 18:40:17 markonen Exp $ */ #ifndef _PHP3_GD_H #define _PHP3_GD_H @@ -54,7 +54,9 @@ extern void php3_info_gd(void); extern int php3_minit_gd(INIT_FUNC_ARGS); extern int php3_mend_gd(void); +#ifndef HAVE_LIBGD162 extern int gdImageColorResolve(gdImagePtr, int, int, int); +#endif extern void php3_imagearc(INTERNAL_FUNCTION_PARAMETERS); extern void php3_imagechar(INTERNAL_FUNCTION_PARAMETERS); extern void php3_imagecharup(INTERNAL_FUNCTION_PARAMETERS);