Fixed bug #28175 (Allow bundled GD to compile against freetype 2.1.2).

diff --git a/ext/gd/libgd/gdft.c b/ext/gd/libgd/gdft.c
index f6d9eae0041ca179303d0d3f361a2971e9cbb788..5e74b5757f92031bd48cd880015483a8abd70a57 100644 (file)
--- a/ext/gd/libgd/gdft.c
+++ b/ext/gd/libgd/gdft.c
@@ -914,7 +914,7 @@ gdImageStringFTEx (gdImage * im, int *brect, int fg, char *fontlist, double ptsi
                }
 
 /* EAM DEBUG */
-#if (defined(FREETYPE_MAJOR) && (FREETYPE_MAJOR >=2 ) && (FREETYPE_MINOR >= 1))
+#if (defined(FREETYPE_MAJOR) && ((FREETYPE_MAJOR == 2 && ((FREETYPE_MINOR == 1 && FREETYPE_PATCH >= 3) || FREETYPE_MINOR > 1) || FREETYPE_MAJOR > 2)))
                if (font->face->charmap->encoding == FT_ENCODING_MS_SYMBOL) {
                        /* I do not know the significance of the constant 0xf000.
                         * It was determined by inspection of the character codes