cvs: gd /libgd/src gd.c gd.h

tabe Mon Mar 9 15:10:53 2009 UTC Modified files: /gd/libgd/src gd.c gd.h Log: see FS#170: give the callback its own type. http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd.c?r1=1.81&r2=1.82&diff_format=u Index: gd/libgd/src/gd.c diff -u gd/libgd/src/gd.c:1.81 gd/libgd/src/gd.c:1.82 --- gd/libgd/src/gd.c:1.81 Sun Mar 8 09:16:04 2009 +++ gd/libgd/src/gd.c Mon Mar 9 15:10:53 2009 @@ -1,4 +1,4 @@ -/* $Id: gd.c,v 1.81 2009/03/08 09:16:04 tabe Exp $ */ +/* $Id: gd.c,v 1.82 2009/03/09 15:10:53 tabe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -798,7 +798,7 @@ return n; } -BGD_DECLARE(int) gdImageColorReplaceCallback (gdImagePtr im, int (*callback)(gdImagePtr imx, int src)) +BGD_DECLARE(int) gdImageColorReplaceCallback (gdImagePtr im, gdCallbackImageColor callback) { int c, d, n = 0; http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd.h?r1=1.52&r2=1.53&diff_format=u Index: gd/libgd/src/gd.h diff -u gd/libgd/src/gd.h:1.52 gd/libgd/src/gd.h:1.53 --- gd/libgd/src/gd.h:1.52 Sun Mar 8 09:16:04 2009 +++ gd/libgd/src/gd.h Mon Mar 9 15:10:53 2009 @@ -591,10 +591,12 @@ BGD_DECLARE(void) gdImagePaletteCopy (gdImagePtr dst, gdImagePtr src); +typedef int (*gdCallbackImageColor)(gdImagePtr im, int src); + BGD_DECLARE(int) gdImageColorReplace(gdImagePtr im, int src, int dst); BGD_DECLARE(int) gdImageColorReplaceThreshold(gdImagePtr im, int src, int dst, float threshold); BGD_DECLARE(int) gdImageColorReplaceArray(gdImagePtr im, int len, int *src, int *dst); -BGD_DECLARE(int) gdImageColorReplaceCallback(gdImagePtr im, int (*callback)(gdImagePtr imx, int src)); +BGD_DECLARE(int) gdImageColorReplaceCallback(gdImagePtr im, gdCallbackImageColor callback); BGD_DECLARE(void) gdImageGif (gdImagePtr im, FILE * out); BGD_DECLARE(void) gdImagePng (gdImagePtr im, FILE * out);