Commit: 71e76816cec42ac1d4b47a6008bd8ebb6279b369 Author: Remi Collet <r...@php.net> Sat, 4 May 2013 16:54:46 +0200 Parents: d6de58d7e4b40a77df06139b0c9c7b5eaa527f42 d981c191d452fe1f95ac31fcea366bc0c770b4b7 Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=71e76816cec42ac1d4b47a6008bd8ebb6279b369 Log: Merge branch 'PHP-5.5' * PHP-5.5: NEWS fix build with bundled libgd Move png and jpeg version functions to gd.c so the external library build doesn't include anything from libgd/. Remove extra unused functions from gd_compat.h Rewrite Xpm library check so it doesn't break on MultiArch systems Required GD >= 2.1.0 or GD bundled, this allows us to remove most of the #ifdef * Remove overflow2, getmbi and skipheaders from gd_compat.h * Add missing return in _php_ctx_getmbi * Reintroduce imagecreatefromxbm by checking for gdCreateImageFromXbm Remove overflow2, getmbi and skipheader, since they are not needed anymore. Allow to use new GD-2.1.0 function from system library Changed paths: MM ext/gd/gd.c Diff: diff --cc ext/gd/gd.c index 802b3d3,9b32630..c39ffdf --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@@ -97,43 -131,8 +135,12 @@@ static void php_free_ps_enc(zend_rsrc_l static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int, int); #endif - #if HAVE_LIBGD15 - /* it's >= 1.5, i.e. has IOCtx */ - #define USE_GD_IOCTX 1 - #else - #undef USE_GD_IOCTX - #endif - - #ifdef USE_GD_IOCTX #include "gd_ctx.c" - #else - #define gdImageCreateFromGdCtx NULL - #define gdImageCreateFromGd2Ctx NULL - #define gdImageCreateFromGd2partCtx NULL - #define gdImageCreateFromGifCtx NULL - #define gdImageCreateFromJpegCtx NULL - #define gdImageCreateFromPngCtx NULL - #define gdImageCreateFromWBMPCtx NULL - typedef FILE gdIOCtx; - #define CTX_PUTC(c, fp) fputc(c, fp) - #endif - - #ifndef HAVE_GDIMAGECOLORRESOLVE - extern int gdImageColorResolve(gdImagePtr, int, int, int); - #endif - - #if HAVE_COLORCLOSESTHWB - int gdImageColorClosestHWB(gdImagePtr im, int r, int g, int b); - #endif - - #ifndef HAVE_GD_DYNAMIC_CTX_EX - #define gdNewDynamicCtxEx(len, data, val) gdNewDynamicCtx(len, data) - #endif +/* as it is not really public, duplicate declaration here to avoid + pointless warnings */ +int overflow2(int a, int b); + /* Section Filters Declarations */ /* IMPORTANT NOTE FOR NEW FILTER * Do not forget to update: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
