From f726afbfebedbc36b076cd6c58746b043d791e3f Mon Sep 17 00:00:00 2001 From: Pierre Joye Date: Wed, 27 May 2009 08:18:24 +0000 Subject: [PATCH] - [DOC] always enable imagecolormatch --- ext/gd/config.m4 | 5 ++-- ext/gd/config.w32 | 2 +- ext/gd/gd.c | 8 ++--- ext/gd/libgd/gd_color.c | 65 ++++++++++++++++++++++++++++++++++++++++ ext/gd/libgd/gd_compat.h | 4 +-- ext/gd/libgd/gd_topal.c | 56 ---------------------------------- ext/gd/php_gd.h | 3 +- 7 files changed, 76 insertions(+), 67 deletions(-) create mode 100644 ext/gd/libgd/gd_color.c diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 index 6bcd203db7..34144c4537 100644 --- a/ext/gd/config.m4 +++ b/ext/gd/config.m4 @@ -270,7 +270,7 @@ if test "$PHP_GD" = "yes"; then 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 @@ else 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 diff --git a/ext/gd/config.w32 b/ext/gd/config.w32 index aa0993bc4c..47d22f983d 100644 --- a/ext/gd/config.w32 +++ b/ext/gd/config.w32 @@ -34,7 +34,7 @@ if (PHP_GD != "no") { 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 \ diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 6b655d553c..4b8e34d55a 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -195,12 +195,10 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagetruecolortopalette, 0) 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 @@ const zend_function_entry gd_functions[] = { #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 @@ PHP_FUNCTION(imagetruecolortopalette) } /* }}} */ -#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 */ PHP_FUNCTION(imagecolormatch) @@ -1713,7 +1712,6 @@ PHP_FUNCTION(imagecolormatch) RETURN_TRUE; } /* }}} */ -#endif /* {{{ proto bool imagesetthickness(resource im, int thickness) Set line thickness for drawing lines, ellipses, rectangles, polygons etc. */ diff --git a/ext/gd/libgd/gd_color.c b/ext/gd/libgd/gd_color.c new file mode 100644 index 0000000000..2d061a5cb4 --- /dev/null +++ b/ext/gd/libgd/gd_color.c @@ -0,0 +1,65 @@ +#if HAVE_GD_BUNDLED +# include "gd.h" +#else +# include +#endif + +#include "gd_intern.h" +#include "php.h" + +/* bring the palette colors in im2 to be closer to im1 + * + */ +int gdImageColorMatch (gdImagePtr im1, gdImagePtr im2) +{ + unsigned long *buf; /* stores our calculations */ + unsigned long *bp; /* buf ptr */ + int color, rgb; + int x,y; + int count; + + if( !im1->trueColor ) { + return -1; /* im1 must be True Color */ + } + if( im2->trueColor ) { + return -2; /* im2 must be indexed */ + } + if( (im1->sx != im2->sx) || (im1->sy != im2->sy) ) { + return -3; /* the images are meant to be the same dimensions */ + } + if (im2->colorsTotal<1) { + return -4; /* At least 1 color must be allocated */ + } + + buf = (unsigned long *)safe_emalloc(sizeof(unsigned long), 5 * im2->colorsTotal, 0); + memset( buf, 0, sizeof(unsigned long) * 5 * im2->colorsTotal ); + + for (x=0; xsx; x++) { + for( y=0; ysy; y++ ) { + color = im2->pixels[y][x]; + rgb = im1->tpixels[y][x]; + bp = buf + (color * 5); + (*(bp++))++; + *(bp++) += gdTrueColorGetRed(rgb); + *(bp++) += gdTrueColorGetGreen(rgb); + *(bp++) += gdTrueColorGetBlue(rgb); + *(bp++) += gdTrueColorGetAlpha(rgb); + } + } + bp = buf; + for (color=0; colorcolorsTotal; color++) { + count = *(bp++); + if( count > 0 ) { + im2->red[color] = *(bp++) / count; + im2->green[color] = *(bp++) / count; + im2->blue[color] = *(bp++) / count; + im2->alpha[color] = *(bp++) / count; + } else { + bp += 4; + } + } + gdFree(buf); + return 0; +} + + diff --git a/ext/gd/libgd/gd_compat.h b/ext/gd/libgd/gd_compat.h index 382db9c494..022d0a8896 100644 --- a/ext/gd/libgd/gd_compat.h +++ b/ext/gd/libgd/gd_compat.h @@ -7,8 +7,6 @@ # include #endif - - const char * gdPngGetVersionString(); int gdJpegGetVersionString(); int gdJpegGetVersionInt(); @@ -55,5 +53,7 @@ void gdImageEllipse(gdImagePtr im, int cx, int cy, int w, int h, int c); gdImagePtr gdImageRotate (gdImagePtr src, double dAngle, int clrBack, int ignoretransparent); +int gdImageColorMatch (gdImagePtr im1, gdImagePtr im2); + #endif diff --git a/ext/gd/libgd/gd_topal.c b/ext/gd/libgd/gd_topal.c index d2cd13f5b9..b9cb928648 100644 --- a/ext/gd/libgd/gd_topal.c +++ b/ext/gd/libgd/gd_topal.c @@ -2067,60 +2067,4 @@ success: } -/* bring the palette colors in im2 to be closer to im1 - * - */ -int gdImageColorMatch (gdImagePtr im1, gdImagePtr im2) -{ - unsigned long *buf; /* stores our calculations */ - unsigned long *bp; /* buf ptr */ - int color, rgb; - int x,y; - int count; - - if( !im1->trueColor ) { - return -1; /* im1 must be True Color */ - } - if( im2->trueColor ) { - return -2; /* im2 must be indexed */ - } - if( (im1->sx != im2->sx) || (im1->sy != im2->sy) ) { - return -3; /* the images are meant to be the same dimensions */ - } - if (im2->colorsTotal<1) { - return -4; /* At least 1 color must be allocated */ - } - - buf = (unsigned long *)safe_emalloc(sizeof(unsigned long), 5 * im2->colorsTotal, 0); - memset( buf, 0, sizeof(unsigned long) * 5 * im2->colorsTotal ); - - for (x=0; xsx; x++) { - for( y=0; ysy; y++ ) { - color = im2->pixels[y][x]; - rgb = im1->tpixels[y][x]; - bp = buf + (color * 5); - (*(bp++))++; - *(bp++) += gdTrueColorGetRed(rgb); - *(bp++) += gdTrueColorGetGreen(rgb); - *(bp++) += gdTrueColorGetBlue(rgb); - *(bp++) += gdTrueColorGetAlpha(rgb); - } - } - bp = buf; - for (color=0; colorcolorsTotal; color++) { - count = *(bp++); - if( count > 0 ) { - im2->red[color] = *(bp++) / count; - im2->green[color] = *(bp++) / count; - im2->blue[color] = *(bp++) / count; - im2->alpha[color] = *(bp++) / count; - } else { - bp += 4; - } - } - gdFree(buf); - return 0; -} - - #endif diff --git a/ext/gd/php_gd.h b/ext/gd/php_gd.h index cc87bd5bab..a38fdb2fe7 100644 --- a/ext/gd/php_gd.h +++ b/ext/gd/php_gd.h @@ -190,9 +190,10 @@ PHP_FUNCTION(jpeg2wbmp); PHP_FUNCTION(png2wbmp); PHP_FUNCTION(image2wbmp); +PHP_FUNCTION(imagecolormatch); + #if HAVE_GD_BUNDLED PHP_FUNCTION(imagelayereffect); -PHP_FUNCTION(imagecolormatch); PHP_FUNCTION(imagexbm); #endif -- 2.40.0