cvs: php4 /ext/gd config.m4 gd.c

jah Mon Jun 26 05:23:02 2000 EDT Modified files: /php4/ext/gd config.m4 gd.c Log: - Test gdImagePaletteCopy and define HAVE_LIBGD15 if found. - s/HAVE_LIBGD13/HAVE_LIBGD15/ in ImagePaletteCopy, ImageCopyMerge. # This really should go into 4.0.1 or we'll get a lot of complaints from # people using older versions of gd (because it still supports gif). Index: php4/ext/gd/config.m4 diff -u php4/ext/gd/config.m4:1.33 php4/ext/gd/config.m4:1.34 --- php4/ext/gd/config.m4:1.33 Tue Jun 6 12:06:46 2000 +++ php4/ext/gd/config.m4 Mon Jun 26 05:23:02 2000 @@ -68,6 +68,7 @@ old_LDFLAGS=$LDFLAGS old_LIBS=$LIBS AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13,1,[ ]) ]) + AC_CHECK_LIB(gd, gdImagePaletteCopy, [ AC_DEFINE(HAVE_LIBGD15,1,[ ]) ]) AC_CHECK_LIB(z,compress, LIBS="$LIBS -lz",,) AC_CHECK_LIB(png,png_info_init, LIBS="$LIBS -lpng",,) AC_CHECK_LIB(gd, gdImageColorResolve, [AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE,1,[ ])]) Index: php4/ext/gd/gd.c diff -u php4/ext/gd/gd.c:1.79 php4/ext/gd/gd.c:1.80 --- php4/ext/gd/gd.c:1.79 Sun Jun 25 10:55:13 2000 +++ php4/ext/gd/gd.c Mon Jun 26 05:23:02 2000 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.79 2000/06/25 17:55:13 eschmid Exp $ */ +/* $Id: gd.c,v 1.80 2000/06/26 12:23:02 jah Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -766,7 +766,7 @@ Copy the palette from the src image onto the dst image */ PHP_FUNCTION(imagepalettecopy) { -#if HAVE_LIBGD13 +#if HAVE_LIBGD15 zval **dstim, **srcim; gdImagePtr dst, src; @@ -1767,7 +1767,7 @@ Merge one part of an image with another */ PHP_FUNCTION(imagecopymerge) { -#if HAVE_LIBGD13 +#if HAVE_LIBGD15 zval **SIM, **DIM, **SX, **SY, **SW, **SH, **DX, **DY, **PCT; gdImagePtr im_dst; gdImagePtr im_src;