pajoye Wed May 27 08:12:08 2009 UTC
Added files:
/php-src/ext/gd/libgd gd_color.c
Modified files:
/php-src/ext/gd config.m4 config.w32 gd.c php_gd.h
/php-src/ext/gd/libgd gd_topal.c
Log:
- [DOC] always enable imagecolormatch
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.m4?r1=1.182&r2=1.183&diff_format=u
Index: php-src/ext/gd/config.m4
diff -u php-src/ext/gd/config.m4:1.182 php-src/ext/gd/config.m4:1.183
--- php-src/ext/gd/config.m4:1.182 Wed May 27 07:16:55 2009
+++ php-src/ext/gd/config.m4 Wed May 27 08:12:07 2009
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.182 2009/05/27 07:16:55 pajoye Exp $
+dnl $Id: config.m4,v 1.183 2009/05/27 08:12:07 pajoye Exp $
dnl
dnl
@@ -275,7 +275,7 @@
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])
@@ -312,7 +312,8 @@
PHP_ADD_BUILD_DIR($ext_builddir/libgd)
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"
GD_FEATURES=`$GDLIB_CONFIG --features`
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.38&r2=1.39&diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.38 php-src/ext/gd/config.w32:1.39
--- php-src/ext/gd/config.w32:1.38 Wed May 27 07:16:55 2009
+++ php-src/ext/gd/config.w32 Wed May 27 08:12:07 2009
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.38 2009/05/27 07:16:55 pajoye Exp $
+// $Id: config.w32,v 1.39 2009/05/27 08:12:07 pajoye Exp $
// vim:ft=javascript
ARG_WITH("gd", "Bundled GD support", "yes,shared");
@@ -34,7 +34,7 @@
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_BUNDLED=1 \
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.414&r2=1.415&diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.414 php-src/ext/gd/gd.c:1.415
--- php-src/ext/gd/gd.c:1.414 Wed May 27 07:16:55 2009
+++ php-src/ext/gd/gd.c Wed May 27 08:12:07 2009
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.414 2009/05/27 07:16:55 pajoye Exp $ */
+/* $Id: gd.c,v 1.415 2009/05/27 08:12:07 pajoye Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -167,12 +167,10 @@
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)
@@ -980,9 +978,11 @@
PHP_FE(image2wbmp,
arginfo_image2wbmp)
#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)
@@ -1555,7 +1555,6 @@
}
/* }}} */
-#if HAVE_GD_BUNDLED
/* {{{ proto bool imagecolormatch(resource im1, resource im2) U
Makes the colors of the palette version of an image more closely match the
true color version */
PHP_FUNCTION(imagecolormatch)
@@ -1594,7 +1593,6 @@
RETURN_TRUE;
}
/* }}} */
-#endif
/* {{{ proto bool imagesetthickness(resource im, int thickness) U
Set line thickness for drawing lines, ellipses, rectangles, polygons etc. */
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/php_gd.h?r1=1.81&r2=1.82&diff_format=u
Index: php-src/ext/gd/php_gd.h
diff -u php-src/ext/gd/php_gd.h:1.81 php-src/ext/gd/php_gd.h:1.82
--- php-src/ext/gd/php_gd.h:1.81 Wed May 27 07:16:55 2009
+++ php-src/ext/gd/php_gd.h Wed May 27 08:12:07 2009
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_gd.h,v 1.81 2009/05/27 07:16:55 pajoye Exp $ */
+/* $Id: php_gd.h,v 1.82 2009/05/27 08:12:07 pajoye Exp $ */
#ifndef PHP_GD_H
#define PHP_GD_H
@@ -190,10 +190,11 @@
#if HAVE_GD_BUNDLED
PHP_FUNCTION(imagelayereffect);
-PHP_FUNCTION(imagecolormatch);
PHP_FUNCTION(imagexbm);
#endif
+PHP_FUNCTION(imagecolormatch);
+
PHP_FUNCTION(imagefilter);
PHP_FUNCTION(imageconvolution);
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd_topal.c?r1=1.19&r2=1.20&diff_format=u
Index: php-src/ext/gd/libgd/gd_topal.c
diff -u php-src/ext/gd/libgd/gd_topal.c:1.19
php-src/ext/gd/libgd/gd_topal.c:1.20
--- php-src/ext/gd/libgd/gd_topal.c:1.19 Wed Apr 4 00:41:08 2007
+++ php-src/ext/gd/libgd/gd_topal.c Wed May 27 08:12:07 2009
@@ -2066,61 +2066,4 @@
#endif
}
-
-/* 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; x<im1->sx; x++) {
- for( y=0; y<im1->sy; 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; color<im2->colorsTotal; 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
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd_color.c?view=markup&rev=1.1
Index: php-src/ext/gd/libgd/gd_color.c
+++ php-src/ext/gd/libgd/gd_color.c
#if HAVE_GD_BUNDLED
# include "gd.h"
#else
# include <gd.h>
#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; x<im1->sx; x++) {
for( y=0; y<im1->sy; 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; color<im2->colorsTotal; 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;
}
