- expose gdImageGetTrueColorPixel in bundled lib

- fix bundled lib build

diff --git a/ext/gd/libgd/gd.h b/ext/gd/libgd/gd.h
index b974fe0b2f270b7c64a1f7056b47346f1daec4f3..34bf4c6444909436f4f15cd9715ef2fd8cace0ad 100644 (file)
--- a/ext/gd/libgd/gd.h
+++ b/ext/gd/libgd/gd.h
@@ -293,6 +293,7 @@ void gdImageDestroy(gdImagePtr im);
 
 void gdImageSetPixel(gdImagePtr im, int x, int y, int color);
 
+int gdImageGetTrueColorPixel (gdImagePtr im, int x, int y);
 int gdImageGetPixel(gdImagePtr im, int x, int y);
 
 void gdImageAABlend(gdImagePtr im);

diff --git a/ext/gd/libgd/gd_filter.c b/ext/gd/libgd/gd_filter.c
index 084e15c20e965c1689006b56761332f7e96955cb..22a393c1263f556ed86375f97874eb2439c93e0d 100644 (file)
--- a/ext/gd/libgd/gd_filter.c
+++ b/ext/gd/libgd/gd_filter.c
@@ -5,13 +5,12 @@
 #endif
 
 #include "gd_intern.h"
+
 /* Filters function added on 2003/12
- * by Pierre-Alain Joye (pajoye@pearfr.org)
+ * by Pierre-Alain Joye (pierre@php.net)
  **/
 /* Begin filters function */
-#ifndef HAVE_GET_TRUE_COLOR
 #define GET_PIXEL_FUNCTION(src)(src->trueColor?gdImageGetTrueColorPixel:gdImageGetPixel)
-#endif
 
 /* invert src image */
 int gdImageNegate(gdImagePtr src)