Re: cvs: php-src(PHP_5_2) / NEWS /ext/gd gd.c /ext/gd/libgd gd.h

Hello Pierre-Alain, it is [DOC] - we all seem to make that mistake and get it wrong somehow. Should we simply allow more than just [DOC] ? Sunday, June 3, 2007, 7:46:18 PM, you wrote: > pajoye Sun Jun 3 17:46:18 2007 UTC > Modified files: (Branch: PHP_5_2) > /php-src NEWS > /php-src/ext/gd gd.c > /php-src/ext/gd/libgd gd.h > Log: > - MFH: @DOC add constants GD_MAJOR_VERSION, GD_MINOR_VERSION, GD_RELEASE_VERSION > GD_EXTRA_VERSION and GD_VERSION_STRING > > > > http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.750&r2=1.2027.2.547.2.751&diff_format=uq q›¶¿.êÁÂr > u > Index: php-src/NEWS > diff -u php-src/NEWS:1.2027.2.547.2.750 php-src/NEWS:1.2027.2.547.2.751 > --- php-src/NEWS:1.2027.2.547.2.750 Sun Jun 3 16:19:14 2007 > +++ php-src/NEWS Sun Jun 3 17:46:17 2007 > @@ -2,6 +2,8 @@ > > ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| > ?? ??? 2007, PHP 5.2.4 > - Improved fix for MOPB-02-2007. (Ilia) > +- Added GD version constants GD_MAJOR_VERSION, GD_MINOR_VERSION > + GD_RELEASE_VERSION, GD_EXTRA_VERSION and GD_VERSION_STRING (Pierre) > - Fixed bug #41518 (file_exists() warns of open_basedir restriction on > non-existent file). (Tony) > - Fixed bug #39330 (apache2handler does not call shutdown actions before > > http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.27&r2=1.312.2.20.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.27 php-src/ext/gd/gd.c:1.312.2.20.2.28 > --- php-src/ext/gd/gd.c:1.312.2.20.2.27 Sat Jun 2 15:38:09 2007 > +++ php-src/ext/gd/gd.c Sun Jun 3 17:46:18 2007 > @@ -18,7 +18,7 @@ > +----------------------------------------------------------------------+ > */ > > -/* $Id: gd.c,v 1.312.2.20.2.27 2007/06/02 15:38:09 pajoye Exp $ */ > +/* $Id: gd.c,v 1.312.2.20.2.28 2007/06/03 17:46:18 pajoye Exp $ */ > > /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, > Cold Spring Harbor Labs. */ > @@ -1288,6 +1288,7 @@ > REGISTER_LONG_CONSTANT("IMG_EFFECT_NORMAL", gdEffectNormal, CONST_CS | > CONST_PERSISTENT); > REGISTER_LONG_CONSTANT("IMG_EFFECT_OVERLAY", gdEffectOverlay, CONST_CS | > CONST_PERSISTENT); > REGISTER_LONG_CONSTANT("GD_BUNDLED", 1, CONST_CS | CONST_PERSISTENT); > + > /* Section Filters */ > REGISTER_LONG_CONSTANT("IMG_FILTER_NEGATE", IMAGE_FILTER_NEGATE, CONST_CS | > CONST_PERSISTENT); > REGISTER_LONG_CONSTANT("IMG_FILTER_GRAYSCALE", > IMAGE_FILTER_GRAYSCALE, CONST_CS | CONST_PERSISTENT); > @@ -1305,6 +1306,18 @@ > REGISTER_LONG_CONSTANT("GD_BUNDLED", 0, CONST_CS | CONST_PERSISTENT); > #endif > > +#ifdef GD_VERSION_STRING > + REGISTER_STRING_CONSTANT("GD_VERSION", GD_VERSION_STRING, CONST_CS | > CONST_PERSISTENT); > +#endif > + > +#if defined(GD_MAJOR_VERSION) && defined(GD_MINOR_VERSION) && > defined(GD_RELEASE_VERSION) && defined(GD_EXTRA_VERSION) > + REGISTER_LONG_CONSTANT("GD_MAJOR_VERSION", GD_MAJOR_VERSION, CONST_CS | > CONST_PERSISTENT); > + REGISTER_LONG_CONSTANT("GD_MINOR_VERSION", GD_MINOR_VERSION, CONST_CS | > CONST_PERSISTENT); > + REGISTER_LONG_CONSTANT("GD_RELEASE_VERSION", GD_RELEASE_VERSION, CONST_CS | > CONST_PERSISTENT); > + REGISTER_STRING_CONSTANT("GD_EXTRA_VERSION", GD_EXTRA_VERSION, CONST_CS | > CONST_PERSISTENT); > +#endif > + > + > #ifdef HAVE_GD_PNG > > /* > > http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.h?r1=1.26.2.3.2.4&r2=1.26.2.3.2.5&diff_format=u > Index: php-src/ext/gd/libgd/gd.h > diff -u php-src/ext/gd/libgd/gd.h:1.26.2.3.2.4 > php-src/ext/gd/libgd/gd.h:1.26.2.3.2.5 > --- php-src/ext/gd/libgd/gd.h:1.26.2.3.2.4 Mon Apr 23 15:17:47 2007 > +++ php-src/ext/gd/libgd/gd.h Sun Jun 3 17:46:18 2007 > @@ -11,6 +11,12 @@ > > #include "php_compat.h" > > +#define GD_MAJOR_VERSION 2 > +#define GD_MINOR_VERSION 0 > +#define GD_RELEASE_VERSION 35 > +#define GD_EXTRA_VERSION "" > +#define GD_VERSION_STRING "2.0.35" > + > #ifdef NETWARE > /* default fontpath for netware systems */ > #define DEFAULT_FONTPATH "sys:/java/nwgfx/lib/x11/fonts/ttf;." Best regards, Marcus