[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd config.m4 config.w32 gd.c php_gd.h /ext/gd/libgd gd_color.c gd_compat.h gd_topal.c
pajoye Wed May 27 08:18:24 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/gd/libgd gd_color.c
Modified files:
/php-src/ext/gd config.m4 config.w32 gd.c php_gd.h
/php-src/ext/gd/libgd gd_compat.h gd_topal.c
Log:
- [DOC] always enable imagecolormatch
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.m4?r1=1.154.2.1.2.6.2.7&r2=1.154.2.1.2.6.2.8&diff_format=u
Index: php-src/ext/gd/config.m4
diff -u php-src/ext/gd/config.m4:1.154.2.1.2.6.2.7
php-src/ext/gd/config.m4:1.154.2.1.2.6.2.8
--- php-src/ext/gd/config.m4:1.154.2.1.2.6.2.7 Wed May 27 07:17:53 2009
+++ php-src/ext/gd/config.m4Wed May 27 08:18:23 2009
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.154.2.1.2.6.2.7 2009/05/27 07:17:53 pajoye Exp $
+dnl $Id: config.m4,v 1.154.2.1.2.6.2.8 2009/05/27 08:18:23 pajoye Exp $
dnl
dnl
@@ -270,7 +270,7 @@
libgd/gdfontg.c libgd/gdtables.c libgd/gdft.c libgd/gdcache.c
libgd/gdkanji.c \
libgd/wbmp.c libgd/gd_wbmp.c libgd/gdhelpers.c
libgd/gd_topal.c libgd/gd_gif_in.c \
libgd/xbm.c libgd/gd_gif_out.c libgd/gd_security.c
libgd/gd_filter.c \
- libgd/gd_pixelate.c libgd/gd_arc.c libgd/gd_rotate.c"
+ libgd/gd_pixelate.c libgd/gd_arc.c libgd/gd_rotate.c
libgd/gd_color.c"
dnl check for fabsf and floorf which are available since C99
AC_CHECK_FUNCS(fabsf floorf)
@@ -343,7 +343,8 @@
if test "$PHP_GD" != "no"; then
GD_MODULE_TYPE=external
- extra_sources="gdcache.c libgd/gd_compat.c libgd/gd_filter.c
libgd/gd_pixelate.c libgd/gd_arc.c libgd/gd_rotate.c"
+ extra_sources="gdcache.c libgd/gd_compat.c libgd/gd_filter.c
libgd/gd_pixelate.c libgd/gd_arc.c \
+ libgd/gd_rotate.c libgd/gd_color.c"
dnl Various checks for GD features
PHP_GD_ZLIB
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.10.4.4.2.14&r2=1.10.4.4.2.15&diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.10.4.4.2.14
php-src/ext/gd/config.w32:1.10.4.4.2.15
--- php-src/ext/gd/config.w32:1.10.4.4.2.14 Wed May 27 07:17:53 2009
+++ php-src/ext/gd/config.w32 Wed May 27 08:18:23 2009
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.10.4.4.2.14 2009/05/27 07:17:53 pajoye Exp $
+// $Id: config.w32,v 1.10.4.4.2.15 2009/05/27 08:18:23 pajoye Exp $
// vim:ft=javascript
ARG_WITH("gd", "Bundled GD support", "yes,shared");
@@ -34,7 +34,7 @@
gdft.c gd_gd2.c gd_gd.c gd_gif_in.c gd_gif_out.c
gdhelpers.c gd_io.c gd_io_dp.c \
gd_io_file.c gd_io_ss.c gd_jpeg.c gdkanji.c gd_png.c
gd_ss.c \
gdtables.c gd_topal.c gd_wbmp.c gdxpm.c wbmp.c xbm.c
gd_security.c \
- gd_filter.c gd_pixelate.c gd_arc.c gd_rotate.c", "gd");
+ gd_filter.c gd_pixelate.c gd_arc.c gd_rotate.c
gd_color.c", "gd");
AC_DEFINE('HAVE_LIBGD', 1, 'GD support');
ADD_FLAG("CFLAGS_GD", " \
/D HAVE_GD_DYNAMIC_CTX_EX=1 \
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.41&r2=1.312.2.20.2.32.2.42&diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.41
php-src/ext/gd/gd.c:1.312.2.20.2.32.2.42
--- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.41Wed May 27 07:17:53 2009
+++ php-src/ext/gd/gd.c Wed May 27 08:18:23 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.312.2.20.2.32.2.41 2009/05/27 07:17:53 pajoye Exp $ */
+/* $Id: gd.c,v 1.312.2.20.2.32.2.42 2009/05/27 08:18:23 pajoye Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -195,12 +195,10 @@
ZEND_ARG_INFO(0, colorsWanted)
ZEND_END_ARG_INFO()
-#if HAVE_GD_BUNDLED
ZEND_BEGIN_ARG_INFO(arginfo_imagecolormatch, 0)
ZEND_ARG_INFO(0, im1)
ZEND_ARG_INFO(0, im2)
ZEND_END_ARG_INFO()
-#endif
ZEND_BEGIN_ARG_INFO(arginfo_imagesetthickness, 0)
ZEND_ARG_INFO(0, im)
@@ -1038,9 +1036,11 @@
#endif
#if HAVE_GD_BUNDLED
PHP_FE(imagelayereffect,
arginfo_imagelayereffect)
- PHP_FE(imagecolormatch,
arginfo_imagecolormatch)
PHP_FE(imagexbm,arginfo_imagexbm)
#endif
+
+ PHP_FE(imagecolormatch,
arginfo_imagecolormatch)
+
/* gd filters */
PHP_FE(imagefilter,
arginfo_imagefilter)
PHP_FE(imageconvolution,
arginfo_imageconvolution)
@@ -1674,7 +1674,6 @@
}
/* }}} */
-#if HAVE_GD_BUNDLED
/* {{{ proto bool imagecolormatch(resource im1, resource im2)
Makes the colors of the palette version of an image more closely match the
true color version */
PH
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd config.m4 config.w32 gd.c php_gd.h /ext/gd/libgd gd.c gd_compat.h
pajoye Wed May 27 07:17:54 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/gd config.m4 config.w32 gd.c php_gd.h
/php-src/ext/gd/libgd gd.c gd_compat.h
Log:
- MFH: [DOC] always enable imagerotate (bundled or system gd)
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.m4?r1=1.154.2.1.2.6.2.6&r2=1.154.2.1.2.6.2.7&diff_format=u
Index: php-src/ext/gd/config.m4
diff -u php-src/ext/gd/config.m4:1.154.2.1.2.6.2.6
php-src/ext/gd/config.m4:1.154.2.1.2.6.2.7
--- php-src/ext/gd/config.m4:1.154.2.1.2.6.2.6 Tue May 26 20:12:45 2009
+++ php-src/ext/gd/config.m4Wed May 27 07:17:53 2009
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.154.2.1.2.6.2.6 2009/05/26 20:12:45 pajoye Exp $
+dnl $Id: config.m4,v 1.154.2.1.2.6.2.7 2009/05/27 07:17:53 pajoye Exp $
dnl
dnl
@@ -269,7 +269,8 @@
libgd/gdxpm.c libgd/gdfontt.c libgd/gdfonts.c
libgd/gdfontmb.c libgd/gdfontl.c \
libgd/gdfontg.c libgd/gdtables.c libgd/gdft.c libgd/gdcache.c
libgd/gdkanji.c \
libgd/wbmp.c libgd/gd_wbmp.c libgd/gdhelpers.c
libgd/gd_topal.c libgd/gd_gif_in.c \
- libgd/xbm.c libgd/gd_gif_out.c libgd/gd_security.c
libgd/gd_filter.c libgd/gd_pixelate.c libgd/gd_arc.c"
+ libgd/xbm.c libgd/gd_gif_out.c libgd/gd_security.c
libgd/gd_filter.c \
+ libgd/gd_pixelate.c libgd/gd_arc.c libgd/gd_rotate.c"
dnl check for fabsf and floorf which are available since C99
AC_CHECK_FUNCS(fabsf floorf)
@@ -342,7 +343,7 @@
if test "$PHP_GD" != "no"; then
GD_MODULE_TYPE=external
- extra_sources="gdcache.c libgd/gd_compat.c libgd/gd_filter.c
libgd/gd_pixelate.c libgd/gd_arc.c"
+ extra_sources="gdcache.c libgd/gd_compat.c libgd/gd_filter.c
libgd/gd_pixelate.c libgd/gd_arc.c libgd/gd_rotate.c"
dnl Various checks for GD features
PHP_GD_ZLIB
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.10.4.4.2.13&r2=1.10.4.4.2.14&diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.10.4.4.2.13
php-src/ext/gd/config.w32:1.10.4.4.2.14
--- php-src/ext/gd/config.w32:1.10.4.4.2.13 Tue May 26 20:12:45 2009
+++ php-src/ext/gd/config.w32 Wed May 27 07:17:53 2009
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.10.4.4.2.13 2009/05/26 20:12:45 pajoye Exp $
+// $Id: config.w32,v 1.10.4.4.2.14 2009/05/27 07:17:53 pajoye Exp $
// vim:ft=javascript
ARG_WITH("gd", "Bundled GD support", "yes,shared");
@@ -33,7 +33,8 @@
gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c
gdfontt.c \
gdft.c gd_gd2.c gd_gd.c gd_gif_in.c gd_gif_out.c
gdhelpers.c gd_io.c gd_io_dp.c \
gd_io_file.c gd_io_ss.c gd_jpeg.c gdkanji.c gd_png.c
gd_ss.c \
- gdtables.c gd_topal.c gd_wbmp.c gdxpm.c wbmp.c xbm.c
gd_security.c gd_filter.c gd_pixelate.c gd_arc.c", "gd");
+ gdtables.c gd_topal.c gd_wbmp.c gdxpm.c wbmp.c xbm.c
gd_security.c \
+ gd_filter.c gd_pixelate.c gd_arc.c gd_rotate.c", "gd");
AC_DEFINE('HAVE_LIBGD', 1, 'GD support');
ADD_FLAG("CFLAGS_GD", " \
/D HAVE_GD_DYNAMIC_CTX_EX=1 \
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.40&r2=1.312.2.20.2.32.2.41&diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.40
php-src/ext/gd/gd.c:1.312.2.20.2.32.2.41
--- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.40Tue May 26 20:12:45 2009
+++ php-src/ext/gd/gd.c Wed May 27 07:17:53 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.312.2.20.2.32.2.40 2009/05/26 20:12:45 pajoye Exp $ */
+/* $Id: gd.c,v 1.312.2.20.2.32.2.41 2009/05/27 07:17:53 pajoye Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -300,14 +300,12 @@
ZEND_END_ARG_INFO()
#endif
-#ifdef HAVE_GD_BUNDLED
ZEND_BEGIN_ARG_INFO_EX(arginfo_imagerotate, 0, 0, 3)
ZEND_ARG_INFO(0, im)
ZEND_ARG_INFO(0, angle)
ZEND_ARG_INFO(0, bgdcolor)
ZEND_ARG_INFO(0, ignoretransparent)
ZEND_END_ARG_INFO()
-#endif
#if HAVE_GD_IMAGESETTILE
ZEND_BEGIN_ARG_INFO(arginfo_imagesettile, 0)
@@ -930,8 +928,9 @@
PHP_FE(imagegrabscreen,
arginfo_imagegrabscreen)
#endif
-#ifdef HAVE_GD_BUNDLED
PHP_FE(imagerotate,
arginfo_imagerotate)
+
+#ifdef HAVE_GD_BUNDLED
PHP_FE(imageantialias,
arginfo_imageantialias)
#endif
@@ -2104,7 +2103,6 @@
/* }}} */
#endif /* PHP_WIN32 */
-#ifdef HAVE_GD_BUNDLED
/* {{{ proto resource imagerotate(resource src_im, float angle, int bgdcolor
[, int ignoretransparent])
Rotate an image using a custom angle */
PHP_FUNCTION(imagerotate)
@@ -2130,7 +2128,6 @@
}
}
/* }}} */
-
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd config.m4 config.w32 gd.c /ext/gd/libgd gd.c gd_compat.h
pajoye Tue May 26 20:12:45 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/gd config.m4 config.w32 gd.c
/php-src/ext/gd/libgd gd.c gd_compat.h
Log:
- MFH: [DOC] - add image(filled)ellipse to the compat layer (work around a
bug in debian too, function is declared but not present in the lib...)
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.m4?r1=1.154.2.1.2.6.2.5&r2=1.154.2.1.2.6.2.6&diff_format=u
Index: php-src/ext/gd/config.m4
diff -u php-src/ext/gd/config.m4:1.154.2.1.2.6.2.5
php-src/ext/gd/config.m4:1.154.2.1.2.6.2.6
--- php-src/ext/gd/config.m4:1.154.2.1.2.6.2.5 Tue May 26 12:50:40 2009
+++ php-src/ext/gd/config.m4Tue May 26 20:12:45 2009
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.154.2.1.2.6.2.5 2009/05/26 12:50:40 pajoye Exp $
+dnl $Id: config.m4,v 1.154.2.1.2.6.2.6 2009/05/26 20:12:45 pajoye Exp $
dnl
dnl
@@ -269,7 +269,7 @@
libgd/gdxpm.c libgd/gdfontt.c libgd/gdfonts.c
libgd/gdfontmb.c libgd/gdfontl.c \
libgd/gdfontg.c libgd/gdtables.c libgd/gdft.c libgd/gdcache.c
libgd/gdkanji.c \
libgd/wbmp.c libgd/gd_wbmp.c libgd/gdhelpers.c
libgd/gd_topal.c libgd/gd_gif_in.c \
- libgd/xbm.c libgd/gd_gif_out.c libgd/gd_security.c
libgd/gd_filter.c libgd/gd_pixelate.c"
+ libgd/xbm.c libgd/gd_gif_out.c libgd/gd_security.c
libgd/gd_filter.c libgd/gd_pixelate.c libgd/gd_arc.c"
dnl check for fabsf and floorf which are available since C99
AC_CHECK_FUNCS(fabsf floorf)
@@ -342,7 +342,7 @@
if test "$PHP_GD" != "no"; then
GD_MODULE_TYPE=external
- extra_sources="gdcache.c libgd/gd_compat.c libgd/gd_filter.c
libgd/gd_pixelate.c"
+ extra_sources="gdcache.c libgd/gd_compat.c libgd/gd_filter.c
libgd/gd_pixelate.c libgd/gd_arc.c"
dnl Various checks for GD features
PHP_GD_ZLIB
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.10.4.4.2.12&r2=1.10.4.4.2.13&diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.10.4.4.2.12
php-src/ext/gd/config.w32:1.10.4.4.2.13
--- php-src/ext/gd/config.w32:1.10.4.4.2.12 Tue May 26 12:50:40 2009
+++ php-src/ext/gd/config.w32 Tue May 26 20:12:45 2009
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.10.4.4.2.12 2009/05/26 12:50:40 pajoye Exp $
+// $Id: config.w32,v 1.10.4.4.2.13 2009/05/26 20:12:45 pajoye Exp $
// vim:ft=javascript
ARG_WITH("gd", "Bundled GD support", "yes,shared");
@@ -33,7 +33,7 @@
gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c
gdfontt.c \
gdft.c gd_gd2.c gd_gd.c gd_gif_in.c gd_gif_out.c
gdhelpers.c gd_io.c gd_io_dp.c \
gd_io_file.c gd_io_ss.c gd_jpeg.c gdkanji.c gd_png.c
gd_ss.c \
- gdtables.c gd_topal.c gd_wbmp.c gdxpm.c wbmp.c xbm.c
gd_security.c gd_filter.c gd_pixelate.c", "gd");
+ gdtables.c gd_topal.c gd_wbmp.c gdxpm.c wbmp.c xbm.c
gd_security.c gd_filter.c gd_pixelate.c gd_arc.c", "gd");
AC_DEFINE('HAVE_LIBGD', 1, 'GD support');
ADD_FLAG("CFLAGS_GD", " \
/D HAVE_GD_DYNAMIC_CTX_EX=1 \
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.39&r2=1.312.2.20.2.32.2.40&diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.39
php-src/ext/gd/gd.c:1.312.2.20.2.32.2.40
--- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.39Tue May 26 13:57:07 2009
+++ php-src/ext/gd/gd.c Tue May 26 20:12:45 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.312.2.20.2.32.2.39 2009/05/26 13:57:07 pajoye Exp $ */
+/* $Id: gd.c,v 1.312.2.20.2.32.2.40 2009/05/26 20:12:45 pajoye Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -3302,12 +3302,7 @@
ZEND_FETCH_RESOURCE(im, gdImagePtr, &IM, -1, "Image", le_gd);
-#ifdef HAVE_GD_IMAGEELLIPSE /* this function is missing from GD 2.0.1 */
gdImageEllipse(im, cx, cy, w, h, color);
-#else
- gdImageArc(im, cx, cy, w, h, 0, 360, color);
-#endif
-
RETURN_TRUE;
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.c?r1=1.90.2.1.2.21.2.11&r2=1.90.2.1.2.21.2.12&diff_format=u
Index: php-src/ext/gd/libgd/gd.c
diff -u php-src/ext/gd/libgd/gd.c:1.90.2.1.2.21.2.11
php-src/ext/gd/libgd/gd.c:1.90.2.1.2.21.2.12
--- php-src/ext/gd/libgd/gd.c:1.90.2.1.2.21.2.11Tue May 26 12:50:40 2009
+++ php-src/ext/gd/libgd/gd.c Tue May 26 20:12:45 2009
@@ -26,11 +26,15 @@
#endif
#if HAVE_FABSF == 0
/* float fabsf(float x); */
-# define fabsf(x) ((float)(fabs(x)))
+# ifndef fabsf
+# define fabsf(x) ((float)(fabs(x)))
+# endif
#endif
#if HAVE_FLOORF == 0
+# ifndef floorf
/* float floorf(float x);*/
-# define floorf(x) ((float)(floor(x)))
+# define floorf(x) ((float)(floor(x)))
+# endif
#endif
#ifdef _OSD_POSIX /* BS2000 uses the EBCDIC char set instea
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd config.m4 config.w32 gd.c php_gd.h /ext/gd/libgd gd.c gd_compat.h gd_filter.c gd_intern.h
pajoye Tue May 26 12:50:40 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/gd/libgd gd_filter.c gd_intern.h
Modified files:
/php-src/ext/gd config.m4 config.w32 gd.c php_gd.h
/php-src/ext/gd/libgd gd.c gd_compat.h
Log:
- [DOC] always enable imagefilter and imageconvolution, even when built
against system's gd
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.m4?r1=1.154.2.1.2.6.2.4&r2=1.154.2.1.2.6.2.5&diff_format=u
Index: php-src/ext/gd/config.m4
diff -u php-src/ext/gd/config.m4:1.154.2.1.2.6.2.4
php-src/ext/gd/config.m4:1.154.2.1.2.6.2.5
--- php-src/ext/gd/config.m4:1.154.2.1.2.6.2.4 Tue May 26 08:53:13 2009
+++ php-src/ext/gd/config.m4Tue May 26 12:50:40 2009
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.154.2.1.2.6.2.4 2009/05/26 08:53:13 pajoye Exp $
+dnl $Id: config.m4,v 1.154.2.1.2.6.2.5 2009/05/26 12:50:40 pajoye Exp $
dnl
dnl
@@ -269,7 +269,7 @@
libgd/gdxpm.c libgd/gdfontt.c libgd/gdfonts.c
libgd/gdfontmb.c libgd/gdfontl.c \
libgd/gdfontg.c libgd/gdtables.c libgd/gdft.c libgd/gdcache.c
libgd/gdkanji.c \
libgd/wbmp.c libgd/gd_wbmp.c libgd/gdhelpers.c
libgd/gd_topal.c libgd/gd_gif_in.c \
- libgd/xbm.c libgd/gd_gif_out.c libgd/gd_security.c
libgd/gd_pixelate.c"
+ libgd/xbm.c libgd/gd_gif_out.c libgd/gd_security.c
libgd/gd_filter.c libgd/gd_pixelate.c"
dnl check for fabsf and floorf which are available since C99
AC_CHECK_FUNCS(fabsf floorf)
@@ -342,7 +342,7 @@
if test "$PHP_GD" != "no"; then
GD_MODULE_TYPE=external
- extra_sources="gdcache.c libgd/gd_compat.c"
+ extra_sources="gdcache.c libgd/gd_compat.c libgd/gd_filter.c
libgd/gd_pixelate.c"
dnl Various checks for GD features
PHP_GD_ZLIB
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.10.4.4.2.11&r2=1.10.4.4.2.12&diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.10.4.4.2.11
php-src/ext/gd/config.w32:1.10.4.4.2.12
--- php-src/ext/gd/config.w32:1.10.4.4.2.11 Mon Apr 6 09:39:02 2009
+++ php-src/ext/gd/config.w32 Tue May 26 12:50:40 2009
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.10.4.4.2.11 2009/04/06 09:39:02 pajoye Exp $
+// $Id: config.w32,v 1.10.4.4.2.12 2009/05/26 12:50:40 pajoye Exp $
// vim:ft=javascript
ARG_WITH("gd", "Bundled GD support", "yes,shared");
@@ -33,7 +33,7 @@
gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c
gdfontt.c \
gdft.c gd_gd2.c gd_gd.c gd_gif_in.c gd_gif_out.c
gdhelpers.c gd_io.c gd_io_dp.c \
gd_io_file.c gd_io_ss.c gd_jpeg.c gdkanji.c gd_png.c
gd_ss.c \
- gdtables.c gd_topal.c gd_wbmp.c gdxpm.c wbmp.c xbm.c
gd_security.c gd_pixelate.c", "gd");
+ gdtables.c gd_topal.c gd_wbmp.c gdxpm.c wbmp.c xbm.c
gd_security.c gd_filter.c gd_pixelate.c", "gd");
AC_DEFINE('HAVE_LIBGD', 1, 'GD support');
ADD_FLAG("CFLAGS_GD", " \
/D HAVE_GD_DYNAMIC_CTX_EX=1 \
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.36&r2=1.312.2.20.2.32.2.37&diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.36
php-src/ext/gd/gd.c:1.312.2.20.2.32.2.37
--- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.36Tue Apr 7 12:45:26 2009
+++ php-src/ext/gd/gd.c Tue May 26 12:50:40 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.312.2.20.2.32.2.36 2009/04/07 12:45:26 pajoye Exp $ */
+/* $Id: gd.c,v 1.312.2.20.2.32.2.37 2009/05/26 12:50:40 pajoye Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -132,7 +132,6 @@
* IMAGE_FILTER_MAX_ARGS: define the biggest amout of arguments
* image_filter array in PHP_FUNCTION(imagefilter)
* */
-#if HAVE_GD_BUNDLED
#define IMAGE_FILTER_NEGATE 0
#define IMAGE_FILTER_GRAYSCALE 1
#define IMAGE_FILTER_BRIGHTNESS 2
@@ -159,7 +158,7 @@
static void php_image_filter_mean_removal(INTERNAL_FUNCTION_PARAMETERS);
static void php_image_filter_smooth(INTERNAL_FUNCTION_PARAMETERS);
static void php_image_filter_pixelate(INTERNAL_FUNCTION_PARAMETERS);
-#endif
+
/* End Section filters declarations */
static gdImagePtr _php_image_create_from_string (zval **Data, char *tn,
gdImagePtr (*ioctx_func_p)() TSRMLS_DC);
static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int
image_type, char *tn, gdImagePtr (*func_p)(), gdImagePtr (*ioctx_func_p)());
@@ -855,7 +854,6 @@
ZEND_END_ARG_INFO()
#endif
-#ifdef HAVE_GD_BUNDLED
ZEND_BEGIN_ARG_INFO_EX(arginfo_imagefilter, 0, 0, 2)
ZEND_ARG_INFO(0, im)
ZEND_ARG_INFO(0, filtertype)
@@ -871,7 +869,6 @@
ZEND_ARG_INFO(0, div)
ZEND_ARG_INFO(0, offset)
ZEND_END_ARG_INFO()
-#endif
#ifdef HAVE_GD_BUNDLED
ZEND_BEGIN_ARG_INFO(arginfo_imageantialias,
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd config.m4
pajoye Tue May 26 08:53:13 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/gd config.m4 Log: - always add libgd/ http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.m4?r1=1.154.2.1.2.6.2.3&r2=1.154.2.1.2.6.2.4&diff_format=u Index: php-src/ext/gd/config.m4 diff -u php-src/ext/gd/config.m4:1.154.2.1.2.6.2.3 php-src/ext/gd/config.m4:1.154.2.1.2.6.2.4 --- php-src/ext/gd/config.m4:1.154.2.1.2.6.2.3 Tue Apr 7 09:26:22 2009 +++ php-src/ext/gd/config.m4Tue May 26 08:53:13 2009 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.154.2.1.2.6.2.3 2009/04/07 09:26:22 pajoye Exp $ +dnl $Id: config.m4,v 1.154.2.1.2.6.2.4 2009/05/26 08:53:13 pajoye Exp $ dnl dnl @@ -401,9 +401,10 @@ if test "$PHP_GD" != "no"; then PHP_NEW_EXTENSION(gd, gd.c $extra_sources, $ext_shared,, \\$(GDLIB_CFLAGS)) + PHP_ADD_BUILD_DIR($ext_builddir/libgd) + if test "$GD_MODULE_TYPE" = "builtin"; then GDLIB_CFLAGS="-I$ext_srcdir/libgd $GDLIB_CFLAGS" -PHP_ADD_BUILD_DIR($ext_builddir/libgd) GD_HEADER_DIRS="ext/gd/ ext/gd/libgd/" PHP_TEST_BUILD(foobar, [], [ @@ -413,7 +414,6 @@ GD_HEADER_DIRS="ext/gd/" GDLIB_CFLAGS="-I$GD_INCLUDE $GDLIB_CFLAGS" PHP_ADD_INCLUDE($GD_INCLUDE) - PHP_CHECK_LIBRARY(gd, gdImageCreate, [], [ AC_MSG_ERROR([GD build test failed. Please check the config.log for details.]) ], [ -L$GD_LIB $GD_SHARED_LIBADD ]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd config.m4 gd.c /ext/gd/libgd gd_jpeg.c
pajoye Tue Apr 7 09:26:23 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/gd config.m4 gd.c
/php-src/ext/gd/libgd gd_jpeg.c
Log:
- #47812, undefined symbol: gdJpegGetVersionInt
- #46015, Build fails with system gd
- enable gd_compat when built using system's gd
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.m4?r1=1.154.2.1.2.6.2.2&r2=1.154.2.1.2.6.2.3&diff_format=u
Index: php-src/ext/gd/config.m4
diff -u php-src/ext/gd/config.m4:1.154.2.1.2.6.2.2
php-src/ext/gd/config.m4:1.154.2.1.2.6.2.3
--- php-src/ext/gd/config.m4:1.154.2.1.2.6.2.2 Wed Jan 14 19:05:59 2009
+++ php-src/ext/gd/config.m4Tue Apr 7 09:26:22 2009
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.154.2.1.2.6.2.2 2009/01/14 19:05:59 tabe Exp $
+dnl $Id: config.m4,v 1.154.2.1.2.6.2.3 2009/04/07 09:26:22 pajoye Exp $
dnl
dnl
@@ -184,6 +184,7 @@
PHP_ADD_INCLUDE($FREETYPE2_INC_DIR)
AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
+ AC_DEFINE(ENABLE_GD_TTF,1,[ ])
],[
AC_MSG_ERROR([Problem with freetype.(a|so). Please check config.log for
more information.])
],[
@@ -328,7 +329,8 @@
if test -n "$FREETYPE2_DIR"; then
AC_DEFINE(HAVE_GD_STRINGFT, 1, [ ])
AC_DEFINE(HAVE_GD_STRINGFTEX, 1, [ ])
-GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_LIBFREETYPE"
+AC_DEFINE(ENABLE_GD_TTF, 1, [ ])
+GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_LIBFREETYPE -DENABLE_GD_TTF"
fi
if test -n "$USE_GD_JIS_CONV"; then
@@ -340,7 +342,7 @@
if test "$PHP_GD" != "no"; then
GD_MODULE_TYPE=external
- extra_sources="gdcache.c"
+ extra_sources="gdcache.c libgd/gd_compat.c"
dnl Various checks for GD features
PHP_GD_ZLIB
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.34&r2=1.312.2.20.2.32.2.35&diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.34
php-src/ext/gd/gd.c:1.312.2.20.2.32.2.35
--- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.34Thu Mar 26 00:43:45 2009
+++ php-src/ext/gd/gd.c Tue Apr 7 09:26:22 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.312.2.20.2.32.2.34 2009/03/26 00:43:45 felipe Exp $ */
+/* $Id: gd.c,v 1.312.2.20.2.32.2.35 2009/04/07 09:26:22 pajoye Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -54,6 +54,10 @@
#endif
#if HAVE_LIBGD
+#if !HAVE_GD_BUNDLED
+# include "libgd/gd_compat.h"
+#endif
+
static int le_gd, le_gd_font;
#if HAVE_LIBT1
@@ -69,7 +73,6 @@
#include /* 3 Medium bold font */
#include /* 4 Large font */
#include /* 5 Giant font */
-#include
#ifdef HAVE_GD_WBMP
#include "libgd/wbmp.h"
@@ -1294,7 +1297,7 @@
#ifdef HAVE_GD_JPG
{
char tmp[12];
- snprintf(tmp, sizeof(tmp), "%d", gdJpegGetVersionInt());
+ snprintf(tmp, sizeof(tmp), "%s", gdJpegGetVersionString());
php_info_print_table_row(2, "JPEG Support", "enabled");
php_info_print_table_row(2, "libJPEG Version", tmp);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd_jpeg.c?r1=1.18.4.2.4.1&r2=1.18.4.2.4.2&diff_format=u
Index: php-src/ext/gd/libgd/gd_jpeg.c
diff -u php-src/ext/gd/libgd/gd_jpeg.c:1.18.4.2.4.1
php-src/ext/gd/libgd/gd_jpeg.c:1.18.4.2.4.2
--- php-src/ext/gd/libgd/gd_jpeg.c:1.18.4.2.4.1 Thu Nov 6 10:14:37 2008
+++ php-src/ext/gd/libgd/gd_jpeg.c Tue Apr 7 09:26:22 2009
@@ -107,6 +107,18 @@
return JPEG_LIB_VERSION;
}
+const char * gdJpegGetVersionString()
+{
+ switch(JPEG_LIB_VERSION) {
+ case 62:
+ return "6b";
+ break;
+ default:
+ return "unknown";
+ }
+}
+
+
/*
* Write IM to OUTFILE as a JFIF-formatted JPEG image, using quality
* QUALITY. If QUALITY is in the range 0-100, increasing values
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd config.m4 config.w32 gd.c /ext/gd/libgd gd.h gd_pixelate.c /ext/gd/tests imagefilter.phpt
tabeWed Jan 14 19:06:13 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/gd/libgd gd_pixelate.c
Modified files:
/php-src/ext/gd config.m4 config.w32 gd.c
/php-src/ext/gd/libgd gd.h
/php-src/ext/gd/tests imagefilter.phpt
Log:
MFH: added pixelate filter.
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.m4?r1=1.154.2.1.2.6.2.1&r2=1.154.2.1.2.6.2.2&diff_format=u
Index: php-src/ext/gd/config.m4
diff -u php-src/ext/gd/config.m4:1.154.2.1.2.6.2.1
php-src/ext/gd/config.m4:1.154.2.1.2.6.2.2
--- php-src/ext/gd/config.m4:1.154.2.1.2.6.2.1 Fri Jul 18 01:16:25 2008
+++ php-src/ext/gd/config.m4Wed Jan 14 19:05:59 2009
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.154.2.1.2.6.2.1 2008/07/18 01:16:25 scottmac Exp $
+dnl $Id: config.m4,v 1.154.2.1.2.6.2.2 2009/01/14 19:05:59 tabe Exp $
dnl
dnl
@@ -268,7 +268,7 @@
libgd/gdxpm.c libgd/gdfontt.c libgd/gdfonts.c
libgd/gdfontmb.c libgd/gdfontl.c \
libgd/gdfontg.c libgd/gdtables.c libgd/gdft.c libgd/gdcache.c
libgd/gdkanji.c \
libgd/wbmp.c libgd/gd_wbmp.c libgd/gdhelpers.c
libgd/gd_topal.c libgd/gd_gif_in.c \
- libgd/xbm.c libgd/gd_gif_out.c libgd/gd_security.c"
+ libgd/xbm.c libgd/gd_gif_out.c libgd/gd_security.c
libgd/gd_pixelate.c"
dnl check for fabsf and floorf which are available since C99
AC_CHECK_FUNCS(fabsf floorf)
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.10.4.4.2.8&r2=1.10.4.4.2.9&diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.10.4.4.2.8
php-src/ext/gd/config.w32:1.10.4.4.2.9
--- php-src/ext/gd/config.w32:1.10.4.4.2.8 Sun Jul 20 19:03:18 2008
+++ php-src/ext/gd/config.w32 Wed Jan 14 19:06:01 2009
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.10.4.4.2.8 2008/07/20 19:03:18 kalle Exp $
+// $Id: config.w32,v 1.10.4.4.2.9 2009/01/14 19:06:01 tabe Exp $
// vim:ft=javascript
ARG_WITH("gd", "Bundled GD support", "yes,shared");
@@ -33,7 +33,7 @@
gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c
gdfontt.c \
gdft.c gd_gd2.c gd_gd.c gd_gif_in.c gd_gif_out.c
gdhelpers.c gd_io.c gd_io_dp.c \
gd_io_file.c gd_io_ss.c gd_jpeg.c gdkanji.c gd_png.c
gd_ss.c \
- gdtables.c gd_topal.c gd_wbmp.c gdxpm.c wbmp.c xbm.c
gd_security.c", "gd");
+ gdtables.c gd_topal.c gd_wbmp.c gdxpm.c wbmp.c xbm.c
gd_security.c gd_pixelate.c", "gd");
AC_DEFINE('HAVE_LIBGD', 1, 'GD support');
ADD_FLAG("CFLAGS_GD", " \
/D HAVE_GD_DYNAMIC_CTX_EX=1 \
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.27&r2=1.312.2.20.2.32.2.28&diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.27
php-src/ext/gd/gd.c:1.312.2.20.2.32.2.28
--- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.27Wed Dec 31 11:15:37 2008
+++ php-src/ext/gd/gd.c Wed Jan 14 19:06:01 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.312.2.20.2.32.2.27 2008/12/31 11:15:37 sebastian Exp $ */
+/* $Id: gd.c,v 1.312.2.20.2.32.2.28 2009/01/14 19:06:01 tabe Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -141,7 +141,8 @@
#define IMAGE_FILTER_SELECTIVE_BLUR 8
#define IMAGE_FILTER_MEAN_REMOVAL 9
#define IMAGE_FILTER_SMOOTH 10
-#define IMAGE_FILTER_MAX10
+#define IMAGE_FILTER_PIXELATE 11
+#define IMAGE_FILTER_MAX11
#define IMAGE_FILTER_MAX_ARGS 5
static void php_image_filter_negate(INTERNAL_FUNCTION_PARAMETERS);
static void php_image_filter_grayscale(INTERNAL_FUNCTION_PARAMETERS);
@@ -154,6 +155,7 @@
static void php_image_filter_selective_blur(INTERNAL_FUNCTION_PARAMETERS);
static void php_image_filter_mean_removal(INTERNAL_FUNCTION_PARAMETERS);
static void php_image_filter_smooth(INTERNAL_FUNCTION_PARAMETERS);
+static void php_image_filter_pixelate(INTERNAL_FUNCTION_PARAMETERS);
#endif
/* End Section filters declarations */
static gdImagePtr _php_image_create_from_string (zval **Data, char *tn,
gdImagePtr (*ioctx_func_p)() TSRMLS_DC);
@@ -1187,6 +1189,7 @@
REGISTER_LONG_CONSTANT("IMG_FILTER_EMBOSS", IMAGE_FILTER_EMBOSS,
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_FILTER_MEAN_REMOVAL",
IMAGE_FILTER_MEAN_REMOVAL, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_FILTER_SMOOTH", IMAGE_FILTER_SMOOTH,
CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("IMG_FILTER_PIXELATE", IMAGE_FILTER_PIXELATE,
CONST_CS | CONST_PERSISTENT);
/* End Section Filters */
#else
REGISTER_LONG_CONSTANT("GD_BUNDLED", 0, CONST_CS | CONST_PERSISTENT);
@@ -4915,6 +4918,29 @@
RETURN_FALSE;
}
+static void php_image_filter_pixelate(INTERNAL_FUNCTION_PARAM
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd config.m4 config.w32 gd.c gdcache.c gdttf.c gdttf.h php_gd.h /ext/gd/libgd gdcache.c
scottmacFri Jul 18 01:16:25 2008 UTC
Removed files: (Branch: PHP_5_3)
/php-src/ext/gd gdttf.c gdttf.h
Modified files:
/php-src/ext/gd config.m4 config.w32 gd.c gdcache.c php_gd.h
/php-src/ext/gd/libgd gdcache.c
Log:
Remove freetype1 support
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.m4?r1=1.154.2.1.2.6&r2=1.154.2.1.2.6.2.1&diff_format=u
Index: php-src/ext/gd/config.m4
diff -u php-src/ext/gd/config.m4:1.154.2.1.2.6
php-src/ext/gd/config.m4:1.154.2.1.2.6.2.1
--- php-src/ext/gd/config.m4:1.154.2.1.2.6 Tue Jul 3 17:25:33 2007
+++ php-src/ext/gd/config.m4Fri Jul 18 01:16:25 2008
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.154.2.1.2.6 2007/07/03 17:25:33 sniper Exp $
+dnl $Id: config.m4,v 1.154.2.1.2.6.2.1 2008/07/18 01:16:25 scottmac Exp $
dnl
dnl
@@ -28,9 +28,6 @@
PHP_ARG_WITH(xpm-dir, for the location of libXpm,
[ --with-xpm-dir[=DIR] GD: Set the path to libXpm install prefix], no,
no)
-PHP_ARG_WITH(ttf, for FreeType 1.x support,
-[ --with-ttf[=DIR] GD: Include FreeType 1.x support], no, no)
-
PHP_ARG_WITH(freetype-dir, for FreeType 2,
[ --with-freetype-dir[=DIR] GD: Set the path to FreeType 2 install prefix],
no, no)
@@ -165,41 +162,6 @@
fi
])
-AC_DEFUN([PHP_GD_FREETYPE1],[
- if test "$PHP_TTF" != "no"; then
-if test "$PHP_FREETYPE_DIR" = "no" || test "$PHP_FREETYPE_DIR" = ""; then
- if test -n "$PHP_TTF"; then
-for i in $PHP_TTF /usr/local /usr; do
- if test -f "$i/include/freetype.h"; then
-TTF_DIR=$i
-unset TTF_INC_DIR
- fi
- if test -f "$i/include/freetype/freetype.h"; then
-TTF_DIR=$i
-TTF_INC_DIR=$i/include/freetype
- fi
- if test -f "$i/include/freetype1/freetype/freetype.h"; then
-TTF_DIR=$i
-TTF_INC_DIR=$i/include/freetype1/freetype
- fi
- test -n "$TTF_DIR" && break
-done
- fi
- if test -n "$TTF_DIR" ; then
-AC_DEFINE(HAVE_LIBTTF,1,[ ])
-PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
- fi
- if test -z "$TTF_INC_DIR"; then
-TTF_INC_DIR=$TTF_DIR/include
- fi
- PHP_ADD_INCLUDE($TTF_INC_DIR)
-else
- AC_MSG_CHECKING(for FreeType 1 support)
- AC_MSG_RESULT([no - FreeType 2.x is to be used instead])
-fi
- fi
-])
-
AC_DEFUN([PHP_GD_FREETYPE2],[
if test "$PHP_FREETYPE_DIR" != "no"; then
@@ -322,7 +284,6 @@
PHP_GD_PNG
PHP_GD_XPM
PHP_GD_FREETYPE2
- PHP_GD_FREETYPE1
PHP_GD_T1LIB
dnl These are always available with bundled library
@@ -370,10 +331,6 @@
GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_LIBFREETYPE"
fi
- if test -n "$TTF_DIR"; then
-GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_LIBTTF"
- fi
-
if test -n "$USE_GD_JIS_CONV"; then
AC_DEFINE(USE_GD_JISX0208, 1, [ ])
GDLIB_CFLAGS="$GDLIB_CFLAGS -DJISX0208"
@@ -392,7 +349,6 @@
PHP_GD_PNG
PHP_GD_XPM
PHP_GD_FREETYPE2
- PHP_GD_FREETYPE1
PHP_GD_T1LIB
dnl Header path
@@ -441,7 +397,7 @@
dnl Common for both builtin and external GD
dnl
if test "$PHP_GD" != "no"; then
- PHP_NEW_EXTENSION(gd, gd.c gdttf.c $extra_sources, $ext_shared,,
\\$(GDLIB_CFLAGS))
+ PHP_NEW_EXTENSION(gd, gd.c $extra_sources, $ext_shared,, \\$(GDLIB_CFLAGS))
if test "$GD_MODULE_TYPE" = "builtin"; then
GDLIB_CFLAGS="-I$ext_srcdir/libgd $GDLIB_CFLAGS"
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.10.4.4.2.6&r2=1.10.4.4.2.7&diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.10.4.4.2.6
php-src/ext/gd/config.w32:1.10.4.4.2.7
--- php-src/ext/gd/config.w32:1.10.4.4.2.6 Fri Jul 11 15:05:05 2008
+++ php-src/ext/gd/config.w32 Fri Jul 18 01:16:25 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.10.4.4.2.6 2008/07/11 15:05:05 rrichards Exp $
+// $Id: config.w32,v 1.10.4.4.2.7 2008/07/18 01:16:25 scottmac Exp $
// vim:ft=javascript
ARG_WITH("gd", "Bundled GD support", "yes,shared");
@@ -28,7 +28,7 @@
CHECK_LIB("User32.lib", "gd", PHP_GD);
CHECK_LIB("Gdi32.lib", "gd", PHP_GD);
- EXTENSION("gd", "gd.c gdttf.c", null, "-Iext/gd/libgd",
"php_gd2.dll");
+ EXTENSION("gd", "gd.c", null, "-Iext/gd/libgd", "php_gd2.dll");
ADD_SOURCES("ext/gd/libgd", "gd2copypal.c gd_arc_f_buggy.c gd.c
\
gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c
gdfontt.c \
gdft.c gd_gd2.c gd_gd.c gd_gif_in.c gd_gif_out.c
gdhelpers.c gd_io.c gd_io_dp.c \
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.11&r2=1.312.2.20.2.32.2.12&diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.11
php-src/ext/gd/gd.c:1.312.2.20.2.32.2.12
--- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.11Thu Jul 17 23:13:09 2008
+++ php-src/ext/gd/gd.c Fri Jul 18 01:16:25 2008
@@ -
