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

jim Fri Jul 16 16:29:00 1999 EDT Modified files: /php3 ChangeLog acconfig.h config.h.in configure.in /php3/functions gd.c Log: Initial crack at gd1.6 support. Haven't tried to compile it yet. Index: php3/ChangeLog diff -u php3/ChangeLog:1.727 php3/ChangeLog:1.728 --- php3/ChangeLog:1.727 Fri Jul 16 14:04:58 1999 +++ php3/ChangeLog Fri Jul 16 16:28:57 1999 @@ -2,6 +2,8 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ??, Version 3.0.12 +- Add support for gd1.6 (disables the ImageCreateFromGif and ImageGif + functions because gd1.6 no longer supports GIF format files) (Jim) - Fixed popen and pclose functions on Windows. (Jim) - Fixed subprocess creation on Windows when used with IIS (Jim, Dave Cramer) - Support for Swatch(r) Beat(tm), also known as Internet Time. Index: php3/acconfig.h diff -u php3/acconfig.h:1.106 php3/acconfig.h:1.107 --- php3/acconfig.h:1.106 Thu Jul 15 11:55:40 1999 +++ php3/acconfig.h Fri Jul 16 16:28:57 1999 @@ -1,5 +1,6 @@ #undef HAVE_LIBGD14 #undef HAVE_LIBGD15 +#undef HAVE_LIBGD16 #undef HAVE_LIBGD_LZW #undef ushort Index: php3/config.h.in diff -u php3/config.h.in:1.183 php3/config.h.in:1.184 --- php3/config.h.in:1.183 Thu Jul 15 11:55:40 1999 +++ php3/config.h.in Fri Jul 16 16:28:57 1999 @@ -70,6 +70,7 @@ #undef HAVE_LIBGD14 #undef HAVE_LIBGD15 +#undef HAVE_LIBGD16 #undef HAVE_LIBGD_LZW #undef ushort Index: php3/configure.in diff -u php3/configure.in:1.441 php3/configure.in:1.442 --- php3/configure.in:1.441 Fri Jul 16 06:31:55 1999 +++ php3/configure.in Fri Jul 16 16:28:57 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.441 1999/07/16 10:31:55 sas Exp $ +dnl $Id: configure.in,v 1.442 1999/07/16 20:28:57 jim Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -702,7 +702,8 @@ AC_ADD_LIBRARY(gd) AC_DEFINE(HAVE_LIBGD) AC_MSG_RESULT(yes) - AC_CHECK_LIB(gd, gdImageLzw, [ AC_DEFINE(HAVE_LIBGD_LZW) ]) + AC_CHECK_LIB(gd, gdImageLzw, [ AC_DEFINE(HAVE_LIBGD_LZW) ]) + AC_CHECK_LIB(gd, gdImagePng, [ AC_DEFINE(HAVE_LIBGD16) ]) AC_CHECK_LIB(gd, gdImageCopyMerge, [ AC_DEFINE(HAVE_LIBGD15) ]) AC_CHECK_LIB(gd, gdImageGifToSink, [ AC_DEFINE(HAVE_LIBGD14) ]) AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13) ]) @@ -715,6 +716,7 @@ test -f $withval/include/gd1.3/gd.h && GD_INCLUDE="$withval/include/gd1.3" test -f $withval/include/gd/gd.h && GD_INCLUDE="$withval/include/gd" test -f $withval/include/gd.h && GD_INCLUDE="$withval/include" + test -f $withval/gd1.5/gd.h && GD_INCLUDE="$withval/gd1.6" test -f $withval/gd1.5/gd.h && GD_INCLUDE="$withval/gd1.5" test -f $withval/gd1.4/gd.h && GD_INCLUDE="$withval/gd1.4" test -f $withval/gd1.3/gd.h && GD_INCLUDE="$withval/gd1.3" @@ -723,11 +725,13 @@ test -f $withval/lib/libgd.a && GD_LIB="$withval/lib" test -f $withval/lib/gd/libgd.a && GD_LIB="$withval/lib/gd" + test -f $withval/lib/gd1.5/libgd.a && GD_LIB="$withval/lib/gd1.6" test -f $withval/lib/gd1.5/libgd.a && GD_LIB="$withval/lib/gd1.5" test -f $withval/lib/gd1.4/libgd.a && GD_LIB="$withval/lib/gd1.4" test -f $withval/lib/gd1.3/libgd.a && GD_LIB="$withval/lib/gd1.3" test -f $withval/libgd.a && GD_LIB="$withval" test -f $withval/gd/libgd.a && GD_LIB="$withval/gd" + test -f $withval/gd1.5/libgd.a && GD_LIB="$withval/gd1.6" test -f $withval/gd1.5/libgd.a && GD_LIB="$withval/gd1.5" test -f $withval/gd1.4/libgd.a && GD_LIB="$withval/gd1.4" test -f $withval/gd1.3/libgd.a && GD_LIB="$withval/gd1.3" @@ -740,6 +744,7 @@ old_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -L$GD_LIB" AC_CHECK_LIB(gd, gdImageLzw, [ AC_DEFINE(HAVE_LIBGD_LZW) ]) + AC_CHECK_LIB(gd, gdImagePng, [ AC_DEFINE(HAVE_LIBGD16) ]) AC_CHECK_LIB(gd, gdImageCopyMerge, [ AC_DEFINE(HAVE_LIBGD15) ]) AC_CHECK_LIB(gd, gdImageGifToSink, [ AC_DEFINE(HAVE_LIBGD14) ]) AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13) ]) @@ -754,7 +759,8 @@ AC_DEFINE(HAVE_LIBGD) AC_ADD_LIBRARY(gd) ]) - AC_CHECK_LIB(gd, gdImageLzw, [ AC_DEFINE(HAVE_LIBGD_LZW) ]) + AC_CHECK_LIB(gd, gdImageLzw, [ AC_DEFINE(HAVE_LIBGD_LZW) ]) + AC_CHECK_LIB(gd, gdImagePng, [ AC_DEFINE(HAVE_LIBGD16) ]) AC_CHECK_LIB(gd, gdImageCopyMerge, [ AC_DEFINE(HAVE_LIBGD15) ]) AC_CHECK_LIB(gd, gdImageGifToSink, [ AC_DEFINE(HAVE_LIBGD14) ]) AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13) ]) Index: php3/functions/gd.c diff -u php3/functions/gd.c:1.126 php3/functions/gd.c:1.127 --- php3/functions/gd.c:1.126 Mon Jul 12 14:34:15 1999 +++ php3/functions/gd.c Fri Jul 16 16:28:59 1999 @@ -29,7 +29,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.126 1999/07/12 18:34:15 markonen Exp $ */ +/* $Id: gd.c,v 1.127 1999/07/16 20:28:59 jim Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -128,7 +128,11 @@ {"imagecopy", php3_imagecopy, NULL}, {"imagecopyresized", php3_imagecopyresized, NULL}, {"imagecreate", php3_imagecreate, NULL}, +#if !HAVE_LIBGD16 + /* GIF support is gone from gd-1.6 */ {"imagecreatefromgif", php3_imagecreatefromgif, NULL}, + {"imagegif", php3_imagegif, NULL}, +#endif {"imagedestroy", php3_imagedestroy, NULL}, {"imagefill", php3_imagefill, NULL}, {"imagefilledpolygon", php3_imagefilledpolygon, NULL}, @@ -136,7 +140,6 @@ {"imagefilltoborder", php3_imagefilltoborder, NULL}, {"imagefontwidth", php3_imagefontwidth, NULL}, {"imagefontheight", php3_imagefontheight, NULL}, - {"imagegif", php3_imagegif, NULL}, {"imageinterlace", php3_imageinterlace, NULL}, {"imageline", php3_imageline, NULL}, {"imageloadfont", php3_imageloadfont, NULL}, @@ -225,8 +228,14 @@ } void php3_info_gd(void) { - /* need to use a PHPAPI function here because it is external module in windows */ -#if HAVE_LIBGD13 + /* need to use a PHPAPI function here because it is external module in Windows */ +#if HAVE_LIBGD16 + php3_printf("Version 1.6"); +#elsif HAVE_LIBGD15 + php3_printf("Version 1.5"); +#elsif HAVE_LIBGD14 + php3_printf("Version 1.5"); +#elsif HAVE_LIBGD13 php3_printf("Version 1.3"); #else php3_printf("Version 1.2"); @@ -238,7 +247,7 @@ php3_printf(" with FreeType 2 support"); #endif #if HAVE_LIBT1 - php3_printf(" with Type1 support"); + php3_printf(" with Type1 font support"); #endif } @@ -430,6 +439,7 @@ } /* }}} */ +#if !HAVE_LIBGD16 /* {{{ proto int imagecreatefromgif(string filename) Create a new image from file or URL */ void php3_imagecreatefromgif (INTERNAL_FUNCTION_PARAMETERS) { @@ -471,6 +481,7 @@ RETURN_LONG(ind); } /* }}} */ +#endif /* {{{ proto int imagedestroy(int im) Destroy an image */ @@ -780,6 +791,7 @@ } /* }}} */ +#if !HAVE_LIBGD16 /* {{{ proto int imagegif(int im, string filename) Output image to browser or file */ void php3_imagegif (INTERNAL_FUNCTION_PARAMETERS) { @@ -856,6 +868,7 @@ RETURN_TRUE; } /* }}} */ +#endif /* {{{ proto int imagesetpixel(int im, int x, int y, int col) Set a single pixel */