 |
 |
 |
 |
|
|
Date: 01/13/00
- Next message: Rasmus Lerdorf: "[PHP-DEV] cvs: /php3 ChangeLog acconfig.h configure.in /php3/functions gd.c gdttf.c php3_gd.h"
- Previous message: Frank M. Kromann: "Re: [PHP-DEV] 3.0.14 Win32 binary"
- Next in thread: Rasmus Lerdorf: "[PHP-DEV] cvs: /php3 ChangeLog acconfig.h configure.in /php3/functions gd.c gdttf.c php3_gd.h"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
rasmus Thu Jan 13 05:16:05 2000 EDT
Modified files:
/php3 ChangeLog acconfig.h configure.in
/php3/functions gd.c gdttf.c php3_gd.h
Log:
The php_3_0_14 cvs tag ended up in the wrong cvs tree - reverting this
patch temporarily to put the tag in the right place.
Index: php3/ChangeLog
diff -u php3/ChangeLog:1.812 php3/ChangeLog:1.813
--- php3/ChangeLog:1.812 Wed Jan 12 16:43:04 2000
+++ php3/ChangeLog Thu Jan 13 05:16:04 2000
@@ -1,9 +1,6 @@
PHP 3.0 CHANGE LOG ChangeLog
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-???, Version 3.0.15
-- Support for LZW-compressed GIFs with gd 1.5, gd/freetype cleanups (markonen)
-
January 11, 2000, Version 3.0.14
- Fixed broken GD autoconf check - GIF support was not detected unless libpng
and libz were both installed on the system (Rasmus)
Index: php3/acconfig.h
diff -u php3/acconfig.h:1.119 php3/acconfig.h:1.120
--- php3/acconfig.h:1.119 Wed Jan 12 16:43:04 2000
+++ php3/acconfig.h Thu Jan 13 05:16:04 2000
@@ -1,7 +1,12 @@
+#undef HAVE_GD_GIF
#undef HAVE_RECODE
#undef USE_BCOPY
#undef HAVE_FTP
-
+#undef HAVE_LIBGD14
+#undef HAVE_LIBGD15
+#undef HAVE_LIBGD16
+#undef HAVE_GDIMAGECOLORRESOLVE
+#undef HAVE_LIBGD_LZW
#undef ushort
#undef UCD_SNMP_HACK
@@ -89,10 +94,6 @@
#define HAVE_LIBGD 0
#undef HAVE_GD_PNG
-#undef HAVE_GD_GIF
-#undef HAVE_GD_LZW
-#undef HAVE_GD_COLORRESOLVE
-#undef HAVE_GD_ANCIENT
/* Define if you have the GNU gettext library (-lintl). */
#define HAVE_LIBINTL 0
@@ -100,6 +101,9 @@
/* Define if you have the zlib library */
#define HAVE_ZLIB 0
+/* Define if you have the gd version 1.3 library (-lgd). */
+#define HAVE_LIBGD13 0
+
/* Define if you want safe mode enabled by default. */
#define PHP_SAFE_MODE 0
@@ -366,5 +370,6 @@
#define HAVE_LIBTTF 0
#define HAVE_LIBFREETYPE 0
+#define FREETYPE_4BIT_ANTIALIAS_HACK 0
#define HAVE_POSIX 0
Index: php3/configure.in
diff -u php3/configure.in:1.488 php3/configure.in:1.489
--- php3/configure.in:1.488 Wed Jan 12 16:43:04 2000
+++ php3/configure.in Thu Jan 13 05:16:04 2000
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.488 2000/01/13 00:43:04 markonen Exp $
+dnl $Id: configure.in,v 1.489 2000/01/13 13:16:04 rasmus Exp $
dnl Process this file with autoconf to produce a configure script.
AC_INIT(main.c)
@@ -765,48 +765,38 @@
AC_MSG_RESULT(no)
])
+AC_MSG_CHECKING(whether to include GD support)
AC_ARG_WITH(gd,
[ --without-gd Disable GD support.
--with-gd[=DIR] Include GD support (DIR is GD's install dir).],
[
case "$withval" in
no)
- AC_MSG_CHECKING(whether to include GD support)
- AC_MSG_RESULT(no)
- ;;
+ AC_MSG_RESULT(no) ;;
yes)
- dnl Check for PNG-based GD version
- old_LIBS=$LIBS
- AC_CHECK_LIB(z,compress, LIBS="$LIBS -lz",,)
- AC_CHECK_LIB(png,png_info_init, LIBS="$LIBS -lpng",,)
- AC_CHECK_LIB(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG)])
- LIBS=$old_LIBS
- if test "$ac_cv_lib_gd_gdImageCreateFromPng" = "yes"; then
- AC_ADD_LIBRARY(png)
- AC_ADD_LIBRARY(z)
- fi
-
- AC_CHECK_LIB(gd,gdImageCreateFromGif,[AC_DEFINE(HAVE_GD_GIF)])
- AC_CHECK_LIB(gd,gdImageLzw, [AC_DEFINE(HAVE_GD_LZW)])
- AC_CHECK_LIB(gd,gdImageColorResolve, [AC_DEFINE(HAVE_GD_COLORRESOLVE)])
- AC_CHECK_LIB(gd,gdImageString16,[ ], [AC_DEFINE(HAVE_GD_ANCIENT)])
-
- dnl Say hi to the NetBSD package system!
- if test -f /usr/pkg/include/gd/gd.h -a -z "$GD_INCLUDE" ; then
- AC_ADD_INCLUDE(/usr/pkg/include/gd)
- fi
-
- AC_MSG_CHECKING(whether to include GD support)
- if test "$ac_cv_lib_gd_gdImageCreateFromPng" = "no" &&
- test "$ac_cv_lib_gd_gdImageCreateFromGif" = "no"; then
- AC_MSG_RESULT(no)
- else
- AC_ADD_LIBRARY(gd)
- AC_DEFINE(HAVE_LIBGD)
- AC_MSG_RESULT(yes)
- fi
+ AC_ADD_LIBRARY(gd)
+ AC_DEFINE(HAVE_LIBGD)
+ AC_MSG_RESULT(yes)
+ AC_CHECK_LIB(gd, gdImageLzw, [ AC_DEFINE(HAVE_LIBGD_LZW) ])
+ old_LIBS=$LIBS
+ AC_CHECK_LIB(z,compress, LIBS="$LIBS -lz",,)
+ AC_CHECK_LIB(png,png_info_init, LIBS="$LIBS -lpng",,)
+ AC_CHECK_LIB(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG)])
+ AC_CHECK_LIB(gd, gdImageCreateFromGif, [AC_DEFINE(HAVE_GD_GIF)])
+ 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)
+ AC_ADD_LIBRARY(z)
+ fi
+ 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) ])
+ AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13) ])
+ ac_cv_lib_gd_gdImageLine=yes
;;
*)
+dnl A whole whack of possible places where this might be
test -f $withval/include/gd1.7/gd.h && GD_INCLUDE="$withval/include/gd1.7"
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"
@@ -839,192 +829,130 @@
if test -n "$GD_INCLUDE" && test -n "$GD_LIB" ; then
AC_ADD_INCLUDE($GD_INCLUDE)
AC_ADD_LIBRARY_WITH_PATH(gd, $GD_LIB)
-
- old_LDFLAGS=$LDFLAGS
- LDFLAGS="$LDFLAGS -L$GD_LIB"
-
- dnl Check for PNG-based GD version
- old_LIBS=$LIBS
- AC_CHECK_LIB(z,compress, LIBS="$LIBS -lz",,)
- AC_CHECK_LIB(png,png_info_init, LIBS="$LIBS -lpng",,)
- AC_CHECK_LIB(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG)])
- LIBS=$old_LIBS
- if test "$ac_cv_lib_gd_gdImageCreateFromPng" = "yes"; then
- AC_ADD_LIBRARY(png)
- AC_ADD_LIBRARY(z)
- fi
-
- AC_CHECK_LIB(gd,gdImageCreateFromGif,[AC_DEFINE(HAVE_GD_GIF)])
- AC_CHECK_LIB(gd,gdImageLzw, [AC_DEFINE(HAVE_GD_LZW)])
- AC_CHECK_LIB(gd,gdImageColorResolve, [AC_DEFINE(HAVE_GD_COLORRESOLVE)])
- AC_CHECK_LIB(gd,gdImageString16,[ ], [AC_DEFINE(HAVE_GD_ANCIENT)])
-
- LDFLAGS=$old_LDFLAGS;
-
- AC_MSG_CHECKING(whether to include GD support)
- if test "$ac_cv_lib_gd_gdImageCreateFromPng" = "no" &&
- test "$ac_cv_lib_gd_gdImageCreateFromGif" = "no"; then
- AC_MSG_RESULT(no)
- else
- AC_DEFINE(HAVE_LIBGD)
- AC_MSG_RESULT(yes)
- fi
+ AC_DEFINE(HAVE_LIBGD)
+ AC_MSG_RESULT(yes)
+ old_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS -L$GD_LIB"
+ AC_CHECK_LIB(gd, gdImageLzw, [ AC_DEFINE(HAVE_LIBGD_LZW) ])
+ old_LIBS=$LIBS
+ AC_CHECK_LIB(z,compress, LIBS="$LIBS -lz",,)
+ AC_CHECK_LIB(png,png_info_init, LIBS="$LIBS -lpng",,)
+ AC_CHECK_LIB(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG)])
+ AC_CHECK_LIB(gd, gdImageCreateFromGif, [AC_DEFINE(HAVE_GD_GIF)])
+ 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)
+ AC_ADD_LIBRARY(z)
+ fi
+ 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) ])
+ AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13) ])
+ LDFLAGS=$old_LDFLAGS;
+ ac_cv_lib_gd_gdImageLine=yes
else
- AC_MSG_CHECKING(whether to include GD support)
AC_MSG_RESULT(no)
- fi
- ;;
+ fi ;;
esac
],[
AC_CHECK_LIB(gd, gdImageLine, [
AC_DEFINE(HAVE_LIBGD)
AC_ADD_LIBRARY(gd)
])
-
- if test "$ac_cv_lib_gd_gdImageLine" = "yes"; then
- dnl Check for PNG-based GD version
- old_LIBS=$LIBS
- AC_CHECK_LIB(z,compress, LIBS="$LIBS -lz",,)
- AC_CHECK_LIB(png,png_info_init, LIBS="$LIBS -lpng",,)
- AC_CHECK_LIB(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG)])
- LIBS=$old_LIBS
- if test "$ac_cv_lib_gd_gdImageCreateFromPng" = "yes"; then
- AC_ADD_LIBRARY(png)
- AC_ADD_LIBRARY(z)
- fi
-
- AC_CHECK_LIB(gd,gdImageCreateFromGif,[AC_DEFINE(HAVE_GD_GIF)])
- AC_CHECK_LIB(gd,gdImageLzw, [AC_DEFINE(HAVE_GD_LZW)])
- AC_CHECK_LIB(gd,gdImageColorResolve, [AC_DEFINE(HAVE_GD_COLORRESOLVE)])
- AC_CHECK_LIB(gd,gdImageString16,[ ], [AC_DEFINE(HAVE_GD_ANCIENT)])
-
- dnl Say hi to the NetBSD package system!
- if test -f /usr/pkg/include/gd/gd.h -a -z "$GD_INCLUDE" ; then
- AC_ADD_INCLUDE(/usr/pkg/include/gd)
- fi
-
- AC_MSG_CHECKING(whether to include GD support)
- if test "$ac_cv_lib_gd_gdImageCreateFromPng" = "no" &&
- test "$ac_cv_lib_gd_gdImageCreateFromGif" = "no"; then
- AC_MSG_RESULT(no)
- else
- AC_DEFINE(HAVE_LIBGD)
- AC_MSG_RESULT(yes)
- fi
- else
- AC_MSG_CHECKING(whether to include GD support)
- AC_MSG_RESULT(no)
+ AC_CHECK_LIB(gd, gdImageLzw, [ AC_DEFINE(HAVE_LIBGD_LZW) ])
+ old_LIBS=$LIBS
+ AC_CHECK_LIB(z,compress, LIBS="$LIBS -lz",,)
+ AC_CHECK_LIB(png,png_info_init, LIBS="$LIBS -lpng",,)
+ AC_CHECK_LIB(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG)])
+ AC_CHECK_LIB(gd, gdImageCreateFromGif, [AC_DEFINE(HAVE_GD_GIF)])
+ 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)
+ AC_ADD_LIBRARY(z)
fi
+ 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) ])
+ AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13) ])
])
+if test -f /usr/pkg/include/gd/gd.h -a -z "$GD_INCLUDE" ; then
+ AC_ADD_INCLUDE(/usr/pkg/include/gd)
+fi
+if test "$ac_cv_lib_gd_gdImageLine" = "yes"; then
+ CHECK_TTF="yes"
+ AC_ARG_WITH(ttf,
+ [ --with-ttf[=DIR] Include Freetype support],[
+ if test "$withval" != "no" ; then
+ CHECK_TTF="$withval"
+ fi
+ ])
+
+ AC_MSG_CHECKING(whether to include ttf support)
+ if test -n "$CHECK_TTF" ; then
+ for i in /usr /usr/local "$CHECK_TTF" ; do
+ if test -f "$i/include/truetype.h" ; then
+ FREETYPE_DIR="$i"
+ fi
+ if test -f "$i/include/freetype.h" ; then
+ TTF_DIR="$i"
+ fi
+ done
-AC_ARG_WITH(ttf,
-[ --with-ttf[=DIR] Include FreeType support],
-[
- case "$withval" in
- no)
- AC_MSG_CHECKING(whether to include FreeType support)
- AC_MSG_RESULT(no)
- ;;
- yes)
- AC_CHECK_LIB(freetype, TT_Init_FreeType, [
- AC_DEFINE(HAVE_LIBFREETYPE)
- ])
- AC_CHECK_LIB(ttf, TT_Init_FreeType, [
+ if test -n "$FREETYPE_DIR" ; then
+ AC_DEFINE(HAVE_LIBFREETYPE)
+ AC_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE_DIR/lib)
+ AC_ADD_INCLUDE($FREETYPE_DIR/include)
+ AC_MSG_RESULT(yes)
+ else
+ if test -n "$TTF_DIR" ; then
AC_DEFINE(HAVE_LIBTTF)
- ])
- AC_MSG_CHECKING(whether to include FreeType support)
- if test "$ac_cv_lib_freetype_TT_Init_FreeType" = "yes"; then
- AC_ADD_LIBRARY(freetype)
+ AC_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/lib)
+ AC_ADD_INCLUDE($TTF_DIR/include)
AC_MSG_RESULT(yes)
- else
- if test "$ac_cv_lib_ttf_TT_Init_FreeType" = "yes"; then
- AC_ADD_LIBRARY(ttf)
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- fi
- fi
- ;;
- *)
- test -f $withval/freetype.h && TTF_INCLUDE="$withval"
- test -f $withval/include/freetype.h && TTF_INCLUDE="$withval/include"
- test -f $withval/include/freetype/freetype.h && TTF_INCLUDE="$withval/include/freetype"
- test -f $withval/truetype.h && FREETYPE_INCLUDE="$withval"
- test -f $withval/include/truetype.h && FREETYPE_INCLUDE="$withval/include"
- test -f $withval/include/freetype/truetype.h && FREETYPE_INCLUDE="$withval/include/freetype"
-
- test -f $withval/libttf.a && TTF_LIB="$withval"
- test -f $withval/lib/libttf.a && TTF_LIB="$withval/lib"
- test -f $withval/lib/freetype/libttf.a && TTF_LIB="$withval/lib/freetype"
- test -f $withval/libfreetype.a && FREETYPE_LIB="$withval"
- test -f $withval/lib/libfreetype.a && FREETYPE_LIB="$withval/lib"
- test -f $withval/lib/freetype/libfreetype.a && FREETYPE_LIB="$withval/lib/freetype"
-
- dnl Based on our little probe above, we decide on which FreeType
- dnl version gets used. Note that we prefer FreeType 2 with 1.x
- dnl compatibility API.
-
- AC_MSG_CHECKING(whether to include FreeType support)
-
- if test -n "$FREETYPE_INCLUDE" && test -n "$FREETYPE_LIB"; then
- AC_ADD_INCLUDE($FREETYPE_INCLUDE)
- AC_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE_LIB)
- AC_DEFINE(HAVE_LIBFREETYPE)
- AC_MSG_RESULT(yes)
else
- if test -n "$TTF_INCLUDE" && test -n "$TTF_LIB"; then
- AC_ADD_INCLUDE($TTF_INCLUDE)
- AC_ADD_LIBRARY_WITH_PATH(ttf, $TTF_LIB)
- AC_DEFINE(HAVE_LIBTTF)
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- fi
+ AC_MSG_RESULT(no)
fi
- ;;
- esac ],
-[
- AC_CHECK_LIB(freetype, TT_Init_FreeType, [
- AC_DEFINE(HAVE_LIBFREETYPE)
- ])
- AC_CHECK_LIB(ttf, TT_Init_FreeType, [
- AC_DEFINE(HAVE_LIBTTF)
- ])
- AC_MSG_CHECKING(whether to include FreeType support)
- if test "$ac_cv_lib_freetype_TT_Init_FreeType" = "yes"; then
- AC_ADD_LIBRARY(freetype)
- AC_MSG_RESULT(yes)
- else
- if test "$ac_cv_lib_ttf_TT_Init_FreeType" = "yes"; then
- AC_ADD_LIBRARY(ttf)
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
fi
+ else
+ AC_MSG_RESULT(no)
fi
-])
-AC_ARG_ENABLE(t1lib,
-[ --enable-t1lib Enable t1lib support.],[
- if test "$enableval" = "yes"; then
- AC_CHECK_LIB(t1, T1_SetDefaultEncoding, [ AC_DEFINE(HAVE_LIBT1) ], [
- AC_MSG_ERROR(T1lib version 0.8 or higher required)
- ])
- AC_CHECK_LIB(t1, T1_GetCharOutline, [
- AC_DEFINE(HAVE_LIBT1_OUTLINE)
- T1LIB_WARNING="WARNING: You *must* read README.t1lib for a necessary patch"
- ])
- AC_ADD_LIBRARY(t1)
- AC_MSG_CHECKING(whether to enable t1lib support)
+ AC_MSG_CHECKING(whether to enable 4bit antialias hack with FreeType2)
+ AC_ARG_ENABLE(freetype-4bit-antialias-hack,
+ [ --enable-freetype-4bit-antialias-hack For the crazy with FreeType2.],[
+ if test "$enableval" = "yes" ; then
+ AC_DEFINE(FREETYPE_4BIT_ANTIALIAS_HACK, 1)
AC_MSG_RESULT(yes)
else
- AC_DEFINE(HAVE_LIBT1, 0)
- AC_MSG_CHECKING(whether to enable t1lib support)
AC_MSG_RESULT(no)
fi
+ ],[
+ AC_MSG_RESULT(no)
+ ])
+
+fi
+
+AC_MSG_CHECKING(whether to enable t1lib support with GD)
+AC_ARG_ENABLE(t1lib,
+[ --enable-t1lib Compile GD with t1lib support.],[
+ if test "$ac_cv_lib_gd_gdImageLine" = "yes"; then
+ if test "$enableval" = "yes"; then
+ AC_CHECK_LIB(t1, T1_SetDefaultEncoding, [ AC_DEFINE(HAVE_LIBT1) ], [ AC_MSG_ERROR(T1lib version 0.8 or higher required) ])
+ AC_CHECK_LIB(t1, T1_GetCharOutline, [ AC_DEFINE(HAVE_LIBT1_OUTLINE) T1LIB_WARNING="WARNING: You *must* read README.t1lib for a necessary patch"])
+ AC_ADD_LIBRARY(t1)
+ AC_MSG_RESULT(yes)
+ else
+ AC_DEFINE(HAVE_LIBT1, 0)
+ AC_MSG_RESULT(no)
+ fi
+ else
+ AC_DEFINE(HAVE_LIBT1, 0)
+ AC_MSG_RESULT(no)
+ fi
],[
AC_DEFINE(HAVE_LIBT1, 0)
- AC_MSG_CHECKING(whether to enable t1lib support)
AC_MSG_RESULT(no)
])
Index: php3/functions/gd.c
diff -u php3/functions/gd.c:1.139 php3/functions/gd.c:1.140
--- php3/functions/gd.c:1.139 Wed Jan 12 16:43:04 2000
+++ php3/functions/gd.c Thu Jan 13 05:16:05 2000
@@ -29,7 +29,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.139 2000/01/13 00:43:04 markonen Exp $ */
+/* $Id: gd.c,v 1.140 2000/01/13 13:16:05 rasmus Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -180,20 +180,31 @@
void php3_info_gd(void) {
/* need to use a PHPAPI function here because it is external module in Windows */
-#if HAVE_GD_PNG
- php3_printf("Version 1.6 (PNG) or later");
-#endif
-#if HAVE_GD_GIF
- php3_printf("Version 1.5 (GIF) or earlier");
+#if HAVE_LIBGD16
+ php3_printf("Version 1.6+");
+#elif HAVE_LIBGD15
+ php3_printf("Version 1.5");
+#elif HAVE_LIBGD14
+ php3_printf("Version 1.4");
+#elif HAVE_LIBGD13
+ php3_printf("Version 1.3");
+#else
+ php3_printf("Version 1.2");
#endif
#if HAVE_LIBTTF
- php3_printf(", FreeType support");
+ php3_printf(" with FreeType support");
#endif
#if HAVE_LIBFREETYPE
- php3_printf(", FreeType 2 support");
+ php3_printf(" with FreeType 2 support");
#endif
#if HAVE_LIBT1
- php3_printf(", t1lib support");
+ php3_printf(" with Type1 font support");
+#endif
+#if HAVE_GD_PNG
+ php3_printf(" with PNG support");
+#endif
+#if HAVE_GD_GIF
+ php3_printf(" with GIF support");
#endif
}
@@ -220,7 +231,7 @@
/* */
/* in a single function */
-#ifndef HAVE_GD_COLORRESOLVE
+#ifndef HAVE_GDIMAGECOLORRESOLVE
int
gdImageColorResolve(gdImagePtr im, int r, int g, int b)
{
@@ -540,10 +551,10 @@
RETURN_FALSE;
}
if (gdImageBoundsSafe(im, x->value.lval, y->value.lval)) {
-#if HAVE_GD_ANCIENT
- RETURN_LONG(im->pixels[x->value.lval][y->value.lval]);
-#else
+#if HAVE_LIBGD13
RETURN_LONG(im->pixels[y->value.lval][x->value.lval]);
+#else
+ RETURN_LONG(im->pixels[x->value.lval][y->value.lval]);
#endif
}
else {
@@ -812,11 +823,7 @@
php3_error(E_WARNING, "ImageGif: unable to open %s for writing", fn);
RETURN_FALSE;
}
-#if HAVE_GD_LZW && defined(LZW_LICENCED)
- gdImageLzw (im,fp);
-#else
gdImageGif (im,fp);
-#endif
fflush(fp);
fclose(fp);
}
@@ -834,11 +841,7 @@
output = php3_header();
if (output) {
-#if HAVE_GD_LZW && defined(LZW_LICENCED)
- gdImageLzw (im, tmp);
-#else
gdImageGif (im, tmp);
-#endif
fseek(tmp, 0, SEEK_SET);
#if APACHE && defined(CHARSET_EBCDIC)
/* This is a binary file already: avoid EBCDIC->ASCII conversion */
Index: php3/functions/gdttf.c
diff -u php3/functions/gdttf.c:1.24 php3/functions/gdttf.c:1.25
--- php3/functions/gdttf.c:1.24 Wed Jan 12 16:43:04 2000
+++ php3/functions/gdttf.c Thu Jan 13 05:16:05 2000
@@ -2,7 +2,7 @@
/* */
/* John Ellson ellson <email protected> */
-/* $Id: gdttf.c,v 1.24 2000/01/13 00:43:04 markonen Exp $ */
+/* $Id: gdttf.c,v 1.25 2000/01/13 13:16:05 rasmus Exp $ */
#if WIN32|WINNT
#include "config.w32.h"
@@ -149,7 +149,7 @@
/* 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);
-#ifndef HAVE_GD_COLORRESOLVE
+#ifndef HAVE_GDIMAGECOLORRESOLVE
int gdImageColorResolve(gdImagePtr im, int r, int g, int b);
/********************************************************************/
@@ -748,10 +748,10 @@
if (tweencolorkey.pixel > 0) {
x3 = x2 + col;
if (x3 >= im->sx || x3 < 0) continue;
-#if HAVE_GD_ANCIENT
- pixel = &im->pixels[x3][y3];
-#else
+#if HAVE_LIBGD13
pixel = &im->pixels[y3][x3];
+#else
+ pixel = &im->pixels[x3][y3];
#endif
tweencolorkey.bgcolor = *pixel;
tweencolor = (tweencolor_t *)gdCacheGet(
Index: php3/functions/php3_gd.h
diff -u php3/functions/php3_gd.h:1.39 php3/functions/php3_gd.h:1.40
--- php3/functions/php3_gd.h:1.39 Wed Jan 12 16:43:04 2000
+++ php3/functions/php3_gd.h Thu Jan 13 05:16:05 2000
@@ -29,7 +29,7 @@
*/
-/* $Id: php3_gd.h,v 1.39 2000/01/13 00:43:04 markonen Exp $ */
+/* $Id: php3_gd.h,v 1.40 2000/01/13 13:16:05 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_GD_COLORRESOLVE
+#ifndef HAVE_GDIMAGECOLORRESOLVE
extern int gdImageColorResolve(gdImagePtr, int, int, int);
#endif
extern void php3_imagearc(INTERNAL_FUNCTION_PARAMETERS);
-- PHP Development Mailing List <http://www.php.net/> To unsubscribe, e-mail: php-dev-unsubscribe <email protected> For additional commands, e-mail: php-dev-help <email protected> To contact the list administrators, e-mail: php-list-admin <email protected>
- Next message: Rasmus Lerdorf: "[PHP-DEV] cvs: /php3 ChangeLog acconfig.h configure.in /php3/functions gd.c gdttf.c php3_gd.h"
- Previous message: Frank M. Kromann: "Re: [PHP-DEV] 3.0.14 Win32 binary"
- Next in thread: Rasmus Lerdorf: "[PHP-DEV] cvs: /php3 ChangeLog acconfig.h configure.in /php3/functions gd.c gdttf.c php3_gd.h"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]