pajoye Mon Dec 26 20:44:19 2005 EDT
Modified files:
/php-src/ext/gd config.m4 config.w32 gd.c gd.dsp gd_ctx.c
Log:
- remove HAVE_LIBGD204, always set
http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/config.m4?r1=1.163&r2=1.164&diff_format=u
Index: php-src/ext/gd/config.m4
diff -u php-src/ext/gd/config.m4:1.163 php-src/ext/gd/config.m4:1.164
--- php-src/ext/gd/config.m4:1.163 Thu Dec 22 23:22:26 2005
+++ php-src/ext/gd/config.m4 Mon Dec 26 20:44:19 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.163 2005/12/22 23:22:26 pajoye Exp $
+dnl $Id: config.m4,v 1.164 2005/12/26 20:44:19 pajoye Exp $
dnl
dnl
@@ -328,7 +328,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_LIBGD204, 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.17&r2=1.18&diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.17 php-src/ext/gd/config.w32:1.18
--- php-src/ext/gd/config.w32:1.17 Mon Dec 26 20:34:42 2005
+++ php-src/ext/gd/config.w32 Mon Dec 26 20:44:19 2005
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.17 2005/12/26 20:34:42 pajoye Exp $
+// $Id: config.w32,v 1.18 2005/12/26 20:44:19 pajoye Exp $
// vim:ft=javascript
ARG_WITH("gd", "Bundled GD support", "yes,shared");
@@ -45,7 +45,6 @@
/D HAVE_GD_XBM \
/D HAVE_LIBFREETYPE=1 \
/D HAVE_LIBGD20=1 \
-/D HAVE_LIBGD204=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.332&r2=1.333&diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.332 php-src/ext/gd/gd.c:1.333
--- php-src/ext/gd/gd.c:1.332 Mon Dec 26 20:34:42 2005
+++ php-src/ext/gd/gd.c Mon Dec 26 20:44:19 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.332 2005/12/26 20:34:42 pajoye Exp $ */
+/* $Id: gd.c,v 1.333 2005/12/26 20:44:19 pajoye Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -1242,18 +1242,10 @@
io_ctx = gdNewDynamicCtxEx(8, data, 0);
if (io_ctx) {
if (getmbi((int(*)(void *)) gdGetC, io_ctx) == 0 &&
skipheader((int(*)(void *)) gdGetC, io_ctx) == 0 ) {
-#if HAVE_LIBGD204
io_ctx->gd_free(io_ctx);
-#else
- io_ctx->free(io_ctx);
-#endif
return PHP_GDIMG_TYPE_WBM;
} else {
-#if HAVE_LIBGD204
io_ctx->gd_free(io_ctx);
-#else
- io_ctx->free(io_ctx);
-#endif
}
}
}
@@ -1280,11 +1272,7 @@
return NULL;
}
-#if HAVE_LIBGD204
io_ctx->gd_free(io_ctx);
-#else
- io_ctx->free(io_ctx);
-#endif
return im;
}
@@ -1424,11 +1412,7 @@
} else {
im = (*ioctx_func_p)(io_ctx);
}
-#if HAVE_LIBGD204
io_ctx->gd_free(io_ctx);
-#else
- io_ctx->free(io_ctx);
-#endif
} else {
/* try and force the stream to be FILE* */
if (FAILURE == php_stream_cast(stream, PHP_STREAM_AS_STDIO |
PHP_STREAM_CAST_TRY_HARD, (void **) &fp, REPORT_ERRORS)) {
http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/gd.dsp?r1=1.25&r2=1.26&diff_format=u
Index: php-src/ext/gd/gd.dsp
diff -u php-src/ext/gd/gd.dsp:1.25 php-src/ext/gd/gd.dsp:1.26
--- php-src/ext/gd/gd.dsp:1.25 Mon Dec 26 20:34:42 2005
+++ php-src/ext/gd/gd.dsp Mon Dec 26 20:44:19 2005
@@ -43,8 +43,8 @@
# PROP Intermediate_Dir "Release_TS"
# 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 /D
HAVE_LIBGD204=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 HAVE_LIBGD204=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_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 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
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -73,8 +73,8 @@
# PROP Intermediate_Dir "Debug_TS"
# 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 /D HAVE_LIBGD204=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 HAVE_LIBGD204=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 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
# 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/gd_ctx.c?r1=1.26&r2=1.27&diff_format=u
Index: php-src/ext/gd/gd_ctx.c
diff -u php-src/ext/gd/gd_ctx.c:1.26 php-src/ext/gd/gd_ctx.c:1.27
--- php-src/ext/gd/gd_ctx.c:1.26 Sun Dec 4 23:24:14 2005
+++ php-src/ext/gd/gd_ctx.c Mon Dec 26 20:44:19 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd_ctx.c,v 1.26 2005/12/04 23:24:14 sniper Exp $ */
+/* $Id: gd_ctx.c,v 1.27 2005/12/26 20:44:19 pajoye Exp $ */
#include "php_gd.h"
@@ -95,12 +95,7 @@
ctx = emalloc(sizeof(gdIOCtx));
ctx->putC = _php_image_output_putc;
ctx->putBuf = _php_image_output_putbuf;
-#if HAVE_LIBGD204
ctx->gd_free = _php_image_output_ctxfree;
-#else
- ctx->free = _php_image_output_ctxfree;
-#endif
-
}
switch(image_type) {
@@ -131,11 +126,7 @@
break;
}
-#if HAVE_LIBGD204
ctx->gd_free(ctx);
-#else
- ctx->free(ctx);
-#endif
if(fp) {
fflush(fp);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
