pajoye Tue Dec 27 00:16:05 2005 EDT
Modified files:
/php-src/ext/gd config.m4 config.w32 gd.c gd.dsp php_gd.h
Log:
- remove HAVE_LIBGD20, we support only 2.0+ now
(some were removed by my previous commit)
http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/config.m4?r1=1.165&r2=1.166&diff_format=u
Index: php-src/ext/gd/config.m4
diff -u php-src/ext/gd/config.m4:1.165 php-src/ext/gd/config.m4:1.166
--- php-src/ext/gd/config.m4:1.165 Mon Dec 26 21:46:56 2005
+++ php-src/ext/gd/config.m4 Tue Dec 27 00:16:05 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.165 2005/12/26 21:46:56 pajoye Exp $
+dnl $Id: config.m4,v 1.166 2005/12/27 00:16:05 pajoye Exp $
dnl
dnl
@@ -327,7 +327,6 @@
dnl These defines are always available
dnl FIXME: Cleanup the sources so that these are not needed!
- AC_DEFINE(HAVE_LIBGD20, 1, [ ])
AC_DEFINE(HAVE_GD_IMAGESETTILE, 1, [ ])
AC_DEFINE(HAVE_GD_IMAGEELLIPSE, 1, [ ])
AC_DEFINE(HAVE_GD_IMAGESETBRUSH, 1, [ ])
http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/config.w32?r1=1.19&r2=1.20&diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.19 php-src/ext/gd/config.w32:1.20
--- php-src/ext/gd/config.w32:1.19 Mon Dec 26 21:46:56 2005
+++ php-src/ext/gd/config.w32 Tue Dec 27 00:16:05 2005
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.19 2005/12/26 21:46:56 pajoye Exp $
+// $Id: config.w32,v 1.20 2005/12/27 00:16:05 pajoye Exp $
// vim:ft=javascript
ARG_WITH("gd", "Bundled GD support", "yes,shared");
@@ -43,7 +43,6 @@
/D HAVE_GD_STRINGTTF=1 \
/D HAVE_GD_XBM \
/D HAVE_LIBFREETYPE=1 \
-/D HAVE_LIBGD20=1 \
/D HAVE_LIBJPEG \
/D HAVE_LIBPNG \
/D USE_GD_IMGSTRTTF \
http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/gd.c?r1=1.335&r2=1.336&diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.335 php-src/ext/gd/gd.c:1.336
--- php-src/ext/gd/gd.c:1.335 Tue Dec 27 00:11:16 2005
+++ php-src/ext/gd/gd.c Tue Dec 27 00:16:05 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.335 2005/12/27 00:11:16 pajoye Exp $ */
+/* $Id: gd.c,v 1.336 2005/12/27 00:16:05 pajoye Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -3235,20 +3235,12 @@
ZEND_FETCH_RESOURCE(f_ind, int *, &fnt, -1, "Type 1 font", le_ps_font);
/* Ensure that the provided colors are valid */
-#if HAVE_LIBGD20
if (_fg < 0 || (!gdImageTrueColor(bg_img) && _fg >
gdImageColorsTotal(bg_img))) {
-#else
- if (_fg < 0 || _fg > gdImageColorsTotal(bg_img)) {
-#endif
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Foreground color
index %ld out of range", _fg);
RETURN_FALSE;
}
-#if HAVE_LIBGD20
if (_bg < 0 || (!gdImageTrueColor(bg_img) && _fg >
gdImageColorsTotal(bg_img))) {
-#else
- if (_bg < 0 || _bg > gdImageColorsTotal(bg_img)) {
-#endif
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Background color
index %ld out of range", _bg);
RETURN_FALSE;
}
@@ -3256,27 +3248,19 @@
fg_rd = gdImageRed (bg_img, _fg);
fg_gr = gdImageGreen(bg_img, _fg);
fg_bl = gdImageBlue (bg_img, _fg);
-#if HAVE_LIBGD20
fg_al = gdImageAlpha(bg_img, _fg);
-#endif
bg_rd = gdImageRed (bg_img, _bg);
bg_gr = gdImageGreen(bg_img, _bg);
bg_bl = gdImageBlue (bg_img, _bg);
-#if HAVE_LIBGD20
bg_al = gdImageAlpha(bg_img, _bg);
-#endif
for (i = 0; i < aa_steps; i++) {
rd = bg_rd + (double) (fg_rd - bg_rd) / aa_steps * (i + 1);
gr = bg_gr + (double) (fg_gr - bg_gr) / aa_steps * (i + 1);
bl = bg_bl + (double) (fg_bl - bg_bl) / aa_steps * (i + 1);
-#if HAVE_LIBGD20
al = bg_al + (double) (fg_al - bg_al) / aa_steps * (i + 1);
aa[i] = gdImageColorResolveAlpha(bg_img, rd, gr, bl, al);
-#else
- aa[i] = gdImageColorResolve(bg_img, rd, gr, bl);
-#endif
}
T1_AASetBitsPerPixel(8);
@@ -3521,11 +3505,9 @@
return;
}
-#if HAVE_LIBGD20
if (im_org->trueColor) {
gdImageTrueColorToPalette(im_org, 1, 256);
}
-#endif
for (y = 0; y < dest_height; y++) {
for (x = 0; x < dest_width; x++) {
http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/gd.dsp?r1=1.26&r2=1.27&diff_format=u
Index: php-src/ext/gd/gd.dsp
diff -u php-src/ext/gd/gd.dsp:1.26 php-src/ext/gd/gd.dsp:1.27
--- php-src/ext/gd/gd.dsp:1.26 Mon Dec 26 20:44:19 2005
+++ php-src/ext/gd/gd.dsp Tue Dec 27 00:16:05 2005
@@ -44,7 +44,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I
"..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\zlib" /I "..\..\TSRM" /D
ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_GD" /D ZTS=1
/D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_GD_GIF_READ=1 /D HAVE_GD_GIF_CREATE=1 /D
"HAVE_GD_PNG" /D "HAVE_GD_JPG" /D "HAVE_GD_XBM" /D HAVE_LIBGD=1 /FR /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend"
/I "..\..\..\bindlib_w32" /I "..\..\..\zlib" /I "..\..\TSRM" /I "libgd" /D
ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_GD" /D ZTS=1
/D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_GD_GIF_READ=1 /D HAVE_GD_GIF_CREATE=1 /D
"HAVE_GD_PNG" /D "HAVE_GD_JPG" /D "HAVE_GD_XBM" /D HAVE_LIBGD=1 /D
HAVE_LIBGD20=1 /D HAVE_LIBFREETYPE=1 /D "USE_GD_IMGSTRTTF" /D
HAVE_GD_STRINGTTF=1 /D HAVE_GD_BUNDLED=1 /D "MSWIN32" /D "HAVE_LIBPNG" /D
"HAVE_LIBJPEG" /D HAVE_GD_STRINGFTEX=1 /D HAVE_GD_IMAGESETBRUSH=1 /D
HAVE_GD_IMAGESETTILE=1 /FR /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend"
/I "..\..\..\bindlib_w32" /I "..\..\..\zlib" /I "..\..\TSRM" /I "libgd" /D
ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_GD" /D ZTS=1
/D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_GD_GIF_READ=1 /D HAVE_GD_GIF_CREATE=1 /D
"HAVE_GD_PNG" /D "HAVE_GD_JPG" /D "HAVE_GD_XBM" /D HAVE_LIBGD=1 /D
HAVE_LIBFREETYPE=1 /D "USE_GD_IMGSTRTTF" /D HAVE_GD_STRINGTTF=1 /D
HAVE_GD_BUNDLED=1 /D "MSWIN32" /D "HAVE_LIBPNG" /D "HAVE_LIBJPEG" /D
HAVE_GD_STRINGFTEX=1 /D HAVE_GD_IMAGESETBRUSH=1 /D HAVE_GD_IMAGESETTILE=1 /FR
/FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -74,7 +74,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\.." /I "..\..\main" /I
"..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\zlib" /I "..\..\TSRM" /D
ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_GD" /D ZTS=1
/D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_GD_GIF_READ=1 /D HAVE_GD_GIF_CREATE=1 /D
"HAVE_GD_PNG" /D "HAVE_GD_JPG" /D HAVE_LIBGD=1 /FR /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\.." /I "..\..\main" /I
"..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\zlib" /I "..\..\TSRM" /I
"libgd" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_GD"
/D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_GD_GIF_READ=1 /D
HAVE_GD_GIF_CREATE=1 /D "HAVE_GD_PNG" /D "HAVE_GD_JPG" /D HAVE_LIBGD=1 /D
HAVE_LIBGD20=1 /D HAVE_LIBFREETYPE=1 /D "USE_GD_IMGSTRTTF" /D
HAVE_GD_STRINGTTF=1 /D HAVE_GD_BUNDLED=1 /D "MSWIN32" /D "HAVE_LIBPNG" /D
"HAVE_LIBJPEG" /D HAVE_GD_STRINGFTEX=1 /D HAVE_GD_IMAGESETBRUSH=1 /D
HAVE_GD_IMAGESETTILE=1 /FR /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\.." /I "..\..\main" /I
"..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\zlib" /I "..\..\TSRM" /I
"libgd" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_GD"
/D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_GD_GIF_READ=1 /D
HAVE_GD_GIF_CREATE=1 /D "HAVE_GD_PNG" /D "HAVE_GD_JPG" /D HAVE_LIBGD=1 /D
HAVE_LIBFREETYPE=1 /D "USE_GD_IMGSTRTTF" /D HAVE_GD_STRINGTTF=1 /D
HAVE_GD_BUNDLED=1 /D "MSWIN32" /D "HAVE_LIBPNG" /D "HAVE_LIBJPEG" /D
HAVE_GD_STRINGFTEX=1 /D HAVE_GD_IMAGESETBRUSH=1 /D HAVE_GD_IMAGESETTILE=1 /FR
/FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/php_gd.h?r1=1.62&r2=1.63&diff_format=u
Index: php-src/ext/gd/php_gd.h
diff -u php-src/ext/gd/php_gd.h:1.62 php-src/ext/gd/php_gd.h:1.63
--- php-src/ext/gd/php_gd.h:1.62 Wed Nov 2 21:26:08 2005
+++ php-src/ext/gd/php_gd.h Tue Dec 27 00:16:05 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_gd.h,v 1.62 2005/11/02 21:26:08 sniper Exp $ */
+/* $Id: php_gd.h,v 1.63 2005/12/27 00:16:05 pajoye Exp $ */
#ifndef PHP_GD_H
#define PHP_GD_H
@@ -67,7 +67,7 @@
PHP_MINFO_FUNCTION(gd);
PHP_MINIT_FUNCTION(gd);
PHP_MSHUTDOWN_FUNCTION(gd);
-#if HAVE_LIBGD20 && HAVE_GD_STRINGFT
+#if HAVE_GD_STRINGFT
PHP_RSHUTDOWN_FUNCTION(gd);
#endif
@@ -97,7 +97,6 @@
PHP_FUNCTION(imageftbbox);
PHP_FUNCTION(imagefttext);
-#ifdef HAVE_LIBGD20
PHP_FUNCTION(imagecreatetruecolor);
PHP_FUNCTION(imagetruecolortopalette);
PHP_FUNCTION(imagesetthickness);
@@ -110,7 +109,6 @@
PHP_FUNCTION(imagecolorclosestalpha);
PHP_FUNCTION(imagecolorexactalpha);
PHP_FUNCTION(imagecopyresampled);
-#endif
#ifdef HAVE_GD_BUNDLED
PHP_FUNCTION(imagerotate);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
