From 9934670186e355738a2d2eeb95d49f55e23513f9 Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Mon, 29 Mar 2004 18:21:00 +0000 Subject: [PATCH] MFH: Synchronized bundled GD library with GD 2.0.22. --- NEWS | 1 + ext/gd/gd.c | 2 +- ext/gd/libgd/gd.c | 32 +++++++------ ext/gd/libgd/gd.h | 1 + ext/gd/libgd/gd_gd.c | 10 ++++ ext/gd/libgd/gd_gd2.c | 20 ++++++++ ext/gd/libgd/gd_io_dp.c | 30 +++++++++--- ext/gd/libgd/gd_jpeg.c | 104 +++++++++++++++++++++++++++++++++------- ext/gd/libgd/gd_png.c | 8 ++++ ext/gd/libgd/gd_wbmp.c | 9 ++++ ext/gd/libgd/gdfontg.c | 5 ++ ext/gd/libgd/gdfontg.h | 1 + ext/gd/libgd/gdfontl.c | 5 ++ ext/gd/libgd/gdfontl.h | 1 + ext/gd/libgd/gdfontmb.c | 5 ++ ext/gd/libgd/gdfontmb.h | 1 + ext/gd/libgd/gdfonts.c | 5 ++ ext/gd/libgd/gdfonts.h | 1 + ext/gd/libgd/gdfontt.c | 5 ++ ext/gd/libgd/gdfontt.h | 1 + ext/gd/libgd/gdft.c | 17 ++++--- 21 files changed, 219 insertions(+), 45 deletions(-) diff --git a/NEWS b/NEWS index 8a3274a849..73f1c71311 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,7 @@ PHP 4 NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2004, Version 4.3.6 +- Synchronized bundled GD library with GD 2.0.22. (Ilia) - Fixed bug #27732 (Fixed compilation bug inside php_sab_info.h). (Ilia) - Fixed bug #27731 (error_reporting() inside @ block fails to set error_reporting level). (Ilia) diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 5515b55acb..47b8deb389 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -390,7 +390,7 @@ PHP_RSHUTDOWN_FUNCTION(gd) /* }}} */ #if HAVE_GD_BUNDLED -#define PHP_GD_VERSION_STRING "bundled (2.0.17 compatible)" +#define PHP_GD_VERSION_STRING "bundled (2.0.22 compatible)" #elif HAVE_LIBGD20 #define PHP_GD_VERSION_STRING "2.0 or higher" #elif HAVE_GDIMAGECOLORRESOLVE diff --git a/ext/gd/libgd/gd.c b/ext/gd/libgd/gd.c index 96b6a68873..2d946265ea 100644 --- a/ext/gd/libgd/gd.c +++ b/ext/gd/libgd/gd.c @@ -1823,7 +1823,7 @@ void gdImageFillToBorder (gdImagePtr im, int x, int y, int border, int color) if (y < ((im->sy) - 1)) { lastBorder = 1; for (i = leftLimit; i <= rightLimit; i++) { - int c = gdImageGetPixel(im, i, y + 1); + int c = gdImageGetTrueColorPixel(im, i, y + 1); if (lastBorder) { if ((c != border) && (c != color)) { @@ -2292,7 +2292,8 @@ void gdImageCopyResized (gdImagePtr dst, gdImagePtr src, int dstX, int dstY, int int tmp = gdImageGetPixel (src, x, y); mapTo = gdImageGetTrueColorPixel (src, x, y); if (gdImageGetTransparent (src) == tmp) { - tox++; + /* 2.0.21, TK: not tox++ */ + tox += stx[x - srcX]; continue; } } else { @@ -2300,7 +2301,8 @@ void gdImageCopyResized (gdImagePtr dst, gdImagePtr src, int dstX, int dstY, int mapTo = gdImageGetTrueColorPixel (src, x, y); /* Added 7/24/95: support transparent copies */ if (gdImageGetTransparent (src) == mapTo) { - tox++; + /* 2.0.21, TK: not tox++ */ + tox += stx[x - srcX]; continue; } } @@ -2356,22 +2358,24 @@ void gdImageCopyResized (gdImagePtr dst, gdImagePtr src, int dstX, int dstY, int void gdImageCopyResampled (gdImagePtr dst, gdImagePtr src, int dstX, int dstY, int srcX, int srcY, int dstW, int dstH, int srcW, int srcH) { int x, y; + double sy1, sy2, sx1, sx2; if (!dst->trueColor) { gdImageCopyResized (dst, src, dstX, dstY, srcX, srcY, dstW, dstH, srcW, srcH); return; } for (y = dstY; (y < dstY + dstH); y++) { + sy1 = ((double) y - (double) dstY) * (double) srcH / (double) dstH; + sy2 = ((double) (y + 1) - (double) dstY) * (double) srcH / (double) dstH; for (x = dstX; (x < dstX + dstW); x++) { - float sy1, sy2, sx1, sx2; - float sx, sy; - float spixels = 0.0f; - float red = 0.0f, green = 0.0f, blue = 0.0f, alpha = 0.0f; - float alpha_factor, alpha_sum = 0.0f, contrib_sum = 0.0f; - sy1 = ((float)(y - dstY)) * (float)srcH / (float)dstH; - sy2 = ((float)(y + 1 - dstY)) * (float) srcH / (float) dstH; + double sx, sy; + double spixels = 0; + double red = 0.0, green = 0.0, blue = 0.0, alpha = 0.0; + double alpha_factor, alpha_sum = 0.0, contrib_sum = 0.0; + sx1 = ((double) x - (double) dstX) * (double) srcW / dstW; + sx2 = ((double) (x + 1) - (double) dstX) * (double) srcW / dstW; sy = sy1; do { - float yportion; + double yportion; if (floor_cast(sy) == floor_cast(sy1)) { yportion = 1.0f - (sy - floor_cast(sy)); if (yportion > sy2 - sy1) { @@ -2383,12 +2387,10 @@ void gdImageCopyResampled (gdImagePtr dst, gdImagePtr src, int dstX, int dstY, i } else { yportion = 1.0f; } - sx1 = ((float)(x - dstX)) * (float) srcW / dstW; - sx2 = ((float)(x + 1 - dstX)) * (float) srcW / dstW; sx = sx1; do { - float xportion; - float pcontribution; + double xportion; + double pcontribution; int p; if (floorf(sx) == floor_cast(sx1)) { xportion = 1.0f - (sx - floor_cast(sx)); diff --git a/ext/gd/libgd/gd.h b/ext/gd/libgd/gd.h index ba2731677a..ac7a8092b4 100644 --- a/ext/gd/libgd/gd.h +++ b/ext/gd/libgd/gd.h @@ -578,6 +578,7 @@ void gdImageSaveAlpha(gdImagePtr im, int saveAlphaArg); gdIOCtx* gdNewFileCtx(FILE*); gdIOCtx* gdNewDynamicCtx(int, void*); +gdIOCtx *gdNewDynamicCtxEx(int size, void *data, int freeFlag); gdIOCtx* gdNewSSCtx(gdSourcePtr in, gdSinkPtr out); void* gdDPExtractData(struct gdIOCtx* ctx, int *size); diff --git a/ext/gd/libgd/gd_gd.c b/ext/gd/libgd/gd_gd.c index 28755a8412..bff27223c0 100644 --- a/ext/gd/libgd/gd_gd.c +++ b/ext/gd/libgd/gd_gd.c @@ -147,6 +147,16 @@ gdImagePtr gdImageCreateFromGd (FILE * inFile) return im; } +gdImagePtr gdImageCreateFromGdPtr (int size, void *data) +{ + gdImagePtr im; + gdIOCtx *in = gdNewDynamicCtxEx(size, data, 0); + im = gdImageCreateFromGdCtx(in); + in->gd_free(in); + + return im; +} + gdImagePtr gdImageCreateFromGdCtx (gdIOCtxPtr in) { int sx, sy; diff --git a/ext/gd/libgd/gd_gd2.c b/ext/gd/libgd/gd_gd2.c index 0fadc71536..d815c67232 100644 --- a/ext/gd/libgd/gd_gd2.c +++ b/ext/gd/libgd/gd_gd2.c @@ -237,6 +237,16 @@ gdImagePtr gdImageCreateFromGd2 (FILE * inFile) return im; } +gdImagePtr gdImageCreateFromGd2Ptr (int size, void *data) +{ + gdImagePtr im; + gdIOCtx *in = gdNewDynamicCtxEx(size, data, 0); + im = gdImageCreateFromGd2Ctx(in); + in->gd_free(in); + + return im; +} + gdImagePtr gdImageCreateFromGd2Ctx (gdIOCtxPtr in) { int sx, sy; @@ -378,6 +388,16 @@ fail2: return 0; } +gdImagePtr gdImageCreateFromGd2PartPtr (int size, void *data, int srcx, int srcy, int w, int h) +{ + gdImagePtr im; + gdIOCtx *in = gdNewDynamicCtxEx(size, data, 0); + im = gdImageCreateFromGd2PartCtx(in, srcx, srcy, w, h); + in->gd_free(in); + + return im; +} + gdImagePtr gdImageCreateFromGd2Part (FILE * inFile, int srcx, int srcy, int w, int h) { gdImagePtr im; diff --git a/ext/gd/libgd/gd_io_dp.c b/ext/gd/libgd/gd_io_dp.c index 06c3ae80b6..fa4c900b16 100644 --- a/ext/gd/libgd/gd_io_dp.c +++ b/ext/gd/libgd/gd_io_dp.c @@ -33,6 +33,7 @@ typedef struct dpStruct int realSize; int dataGood; int pos; + int freeOK; } dynamicPtr; @@ -52,7 +53,7 @@ static int appendDynamic (dynamicPtr * dp, const void *src, int size); static int gdReallocDynamic (dynamicPtr * dp, int required); static int trimDynamic (dynamicPtr * dp); static void gdFreeDynamicCtx (struct gdIOCtx *ctx); -static dynamicPtr *newDynamic (int initialSize, void *data); +static dynamicPtr *newDynamic (int initialSize, void *data, int freeOKFlag); static int dynamicPutbuf (struct gdIOCtx *, const void *, int); static void dynamicPutchar (struct gdIOCtx *, int a); @@ -66,6 +67,11 @@ static long dynamicTell (struct gdIOCtx *); /* return data as a dynamic pointer */ gdIOCtx * gdNewDynamicCtx (int initialSize, void *data) +{ + return gdNewDynamicCtxEx(initialSize, data, 1); +} + +gdIOCtx * gdNewDynamicCtxEx (int initialSize, void *data, int freeOKFlag) { dpIOCtx *ctx; dynamicPtr *dp; @@ -76,7 +82,7 @@ gdNewDynamicCtx (int initialSize, void *data) return NULL; } - dp = newDynamic (initialSize, data); + dp = newDynamic (initialSize, data, freeOKFlag); if (!dp) { gdFree (ctx); @@ -120,7 +126,7 @@ gdDPExtractData (struct gdIOCtx *ctx, int *size) { *size = 0; data = NULL; - if (dp->data != NULL) + if (dp->data != NULL && dp->freeOK) { gdFree (dp->data); } @@ -177,6 +183,10 @@ dynamicSeek (struct gdIOCtx *ctx, const int pos) bytesNeeded = pos; if (bytesNeeded > dp->realSize) { + /* 2.0.21 */ + if (!dp->freeOK) { + return FALSE; + } if (!gdReallocDynamic (dp, dp->realSize * 2)) { dp->dataGood = FALSE; @@ -199,8 +209,7 @@ dynamicSeek (struct gdIOCtx *ctx, const int pos) } /* return data as a dynamic pointer */ -static dynamicPtr * -newDynamic (int initialSize, void *data) +static dynamicPtr * newDynamic (int initialSize, void *data, int freeOKFlag) { dynamicPtr *dp; dp = (dynamicPtr *) gdMalloc (sizeof (dynamicPtr)); @@ -213,6 +222,7 @@ newDynamic (int initialSize, void *data) return NULL; dp->pos = 0; + dp->freeOK = freeOKFlag; return dp; } @@ -348,6 +358,10 @@ appendDynamic (dynamicPtr * dp, const void *src, int size) if (bytesNeeded > dp->realSize) { + /* 2.0.21 */ + if (!dp->freeOK) { + return FALSE; + } if (!gdReallocDynamic (dp, bytesNeeded * 2)) { dp->dataGood = FALSE; @@ -407,5 +421,9 @@ gdReallocDynamic (dynamicPtr * dp, int required) static int trimDynamic (dynamicPtr * dp) { - return gdReallocDynamic (dp, dp->logicalSize); + /* 2.0.21: we don't reallocate memory we don't own */ + if (!dp->freeOK) { + return FALSE; + } + return gdReallocDynamic (dp, dp->logicalSize); } diff --git a/ext/gd/libgd/gd_jpeg.c b/ext/gd/libgd/gd_jpeg.c index e3f26659f0..36aa31cdef 100644 --- a/ext/gd/libgd/gd_jpeg.c +++ b/ext/gd/libgd/gd_jpeg.c @@ -221,8 +221,20 @@ gdImagePtr gdImageCreateFromJpeg (FILE * inFile) return im; } +gdImagePtr gdImageCreateFromJpegPtr (int size, void *data) +{ + gdImagePtr im; + gdIOCtx *in = gdNewDynamicCtxEx(size, data, 0); + im = gdImageCreateFromJpegCtx(in); + in->gd_free(in); + + return im; +} + void jpeg_gdIOCtx_src (j_decompress_ptr cinfo, gdIOCtx * infile); +static int CMYKToRGB(int c, int m, int y, int k, int inverted); + /* * Create a gd-format image from the JPEG-format INFILE. Returns the * image, or NULL upon error. @@ -239,6 +251,8 @@ gdImagePtr gdImageCreateFromJpegCtx (gdIOCtx * infile) unsigned int i, j; int retval; JDIMENSION nrows; + int channels = 3; + int inverted = 0; memset (&cinfo, 0, sizeof (cinfo)); memset (&jerr, 0, sizeof (jerr)); @@ -262,6 +276,9 @@ gdImagePtr gdImageCreateFromJpegCtx (gdIOCtx * infile) jpeg_gdIOCtx_src (&cinfo, infile); + /* 2.0.22: save the APP14 marker to check for Adobe Photoshop CMYK files with inverted components. */ + jpeg_save_markers(&cinfo, JPEG_APP0 + 14, 256); + retval = jpeg_read_header (&cinfo, TRUE); if (retval != JPEG_HEADER_OK) { php_gd_error_ex(E_WARNING, "gd-jpeg: warning: jpeg_read_header returned %d, expected %d", retval, JPEG_HEADER_OK); @@ -281,8 +298,14 @@ gdImagePtr gdImageCreateFromJpegCtx (gdIOCtx * infile) goto error; } - /* Force the image into RGB colorspace, but don't reduce the number of colors anymore (GD 2.0) */ - cinfo.out_color_space = JCS_RGB; + /* 2.0.22: very basic support for reading CMYK colorspace files. Nice for + * thumbnails but there's no support for fussy adjustment of the + * assumed properties of inks and paper. */ + if ((cinfo.jpeg_color_space == JCS_CMYK) || (cinfo.jpeg_color_space == JCS_YCCK)) { + cinfo.out_color_space = JCS_CMYK; + } else { + cinfo.out_color_space = JCS_RGB; + } if (jpeg_start_decompress (&cinfo) != TRUE) { php_gd_error("gd-jpeg: warning: jpeg_start_decompress reports suspended data source"); @@ -301,8 +324,29 @@ gdImagePtr gdImageCreateFromJpegCtx (gdIOCtx * infile) gdImageInterlace (im, cinfo.progressive_mode != 0); #endif - if (cinfo.output_components != 3) { - php_gd_error_ex(E_WARNING, "gd-jpeg: error: JPEG color quantization request resulted in output_components == %d (expected 3)", cinfo.output_components); + if (cinfo.out_color_space == JCS_RGB) { + if (cinfo.output_components != 3) { + php_gd_error_ex(E_WARNING, "gd-jpeg: error: JPEG color quantization request resulted in output_components == %d (expected 3 for RGB)", cinfo.output_components); + goto error; + } + channels = 3; + } else if (cinfo.out_color_space == JCS_CMYK) { + jpeg_saved_marker_ptr marker; + if (cinfo.output_components != 4) { + php_gd_error_ex(E_WARNING, "gd-jpeg: error: JPEG color quantization request resulted in output_components == %d (expected 4 for CMYK)", cinfo.output_components); + goto error; + } + channels = 4; + marker = cinfo.marker_list; + while (marker) { + if ((marker->marker == (JPEG_APP0 + 14)) && (marker->data_length >= 12) && (!strncmp((const char *) marker->data, "Adobe", 5))) { + inverted = 1; + break; + } + marker = marker->next; + } + } else { + php_gd_error_ex(E_WARNING, "gd-jpeg: error: unexpected colorspace."); goto error; } @@ -311,22 +355,37 @@ gdImagePtr gdImageCreateFromJpegCtx (gdIOCtx * infile) goto error; #endif /* BITS_IN_JSAMPLE == 12 */ - row = safe_emalloc(cinfo.output_width * 3, sizeof(JSAMPLE), 0); - memset(row, 0, cinfo.output_width * 3 * sizeof(JSAMPLE)); + row = safe_emalloc(cinfo.output_width * channels, sizeof(JSAMPLE), 0); + memset(row, 0, cinfo.output_width * channels * sizeof(JSAMPLE)); rowptr[0] = row; - for (i = 0; i < cinfo.output_height; i++) { - register JSAMPROW currow = row; - register int *tpix = im->tpixels[i]; - nrows = jpeg_read_scanlines (&cinfo, rowptr, 1); - if (nrows != 1) { - php_gd_error_ex(E_WARNING, "gd-jpeg: error: jpeg_read_scanlines returns %u, expected 1", nrows); - goto error; + if (cinfo.out_color_space == JCS_CMYK) { + for (i = 0; i < cinfo.output_height; i++) { + register JSAMPROW currow = row; + register int *tpix = im->tpixels[i]; + nrows = jpeg_read_scanlines (&cinfo, rowptr, 1); + if (nrows != 1) { + php_gd_error_ex(E_WARNING, "gd-jpeg: error: jpeg_read_scanlines returns %u, expected 1", nrows); + goto error; + } + for (j = 0; j < cinfo.output_width; j++, currow += 4, tpix++) { + *tpix = CMYKToRGB (currow[0], currow[1], currow[2], currow[3], inverted); + } } - for (j = 0; j < cinfo.output_width; j++, currow += 3, tpix++) { - *tpix = gdTrueColor (currow[0], currow[1], currow[2]); + } else { + for (i = 0; i < cinfo.output_height; i++) { + register JSAMPROW currow = row; + register int *tpix = im->tpixels[i]; + nrows = jpeg_read_scanlines (&cinfo, rowptr, 1); + if (nrows != 1) { + php_gd_error_ex(E_WARNING, "gd-jpeg: error: jpeg_read_scanlines returns %u, expected 1", nrows); + goto error; + } + for (j = 0; j < cinfo.output_width; j++, currow += 3, tpix++) { + *tpix = gdTrueColor (currow[0], currow[1], currow[2]); + } } - } + } if (jpeg_finish_decompress (&cinfo) != TRUE) { php_gd_error("gd-jpeg: warning: jpeg_finish_decompress reports suspended data source"); @@ -353,8 +412,19 @@ error: return 0; } -/* +/* A very basic conversion approach, TBB */ +static int CMYKToRGB(int c, int m, int y, int k, int inverted) +{ + if (inverted) { + c = 255 - c; + m = 255 - m; + y = 255 - y; + k = 255 - k; + } + return gdTrueColor((255 - c) * (255 - k) / 255, (255 - m) * (255 - k) / 255, (255 - y) * (255 - k) / 255); +} +/* * gdIOCtx JPEG data sources and sinks, T. Boutell * almost a simple global replace from T. Lane's stdio versions. * diff --git a/ext/gd/libgd/gd_png.c b/ext/gd/libgd/gd_png.c index 8db3bf6a36..83d3a3de38 100644 --- a/ext/gd/libgd/gd_png.c +++ b/ext/gd/libgd/gd_png.c @@ -93,6 +93,14 @@ gdImagePtr gdImageCreateFromPng (FILE * inFile) return im; } +gdImagePtr gdImageCreateFromPngPtr (int size, void *data) +{ + gdImagePtr im; + gdIOCtx *in = gdNewDynamicCtxEx(size, data, 0); + im = gdImageCreateFromPngCtx(in); + in->gd_free(in); + return im; +} /* This routine is based in part on the Chapter 13 demo code in "PNG: The * Definitive Guide" (http://www.cdrom.com/pub/png/pngbook.html). diff --git a/ext/gd/libgd/gd_wbmp.c b/ext/gd/libgd/gd_wbmp.c index 860f70c0a5..9728937741 100644 --- a/ext/gd/libgd/gd_wbmp.c +++ b/ext/gd/libgd/gd_wbmp.c @@ -192,6 +192,15 @@ gdImageCreateFromWBMP (FILE * inFile) return (im); } +gdImagePtr gdImageCreateFromWBMPPtr (int size, void *data) +{ + gdImagePtr im; + gdIOCtx *in = gdNewDynamicCtxEx(size, data, 0); + im = gdImageCreateFromWBMPCtx(in); + in->gd_free(in); + return im; +} + /* gdImageWBMP ** ----------- */ diff --git a/ext/gd/libgd/gdfontg.c b/ext/gd/libgd/gdfontg.c index fd0c1e0929..61c8c2710e 100644 --- a/ext/gd/libgd/gdfontg.c +++ b/ext/gd/libgd/gdfontg.c @@ -4381,4 +4381,9 @@ gdFont gdFontGiantRep = gdFontPtr gdFontGiant = &gdFontGiantRep; +gdFontPtr gdFontGetGiant(void) +{ + return gdFontGiant; +} + /* This file has not been truncated. */ diff --git a/ext/gd/libgd/gdfontg.h b/ext/gd/libgd/gdfontg.h index a70f266d63..8a3e95e8bc 100644 --- a/ext/gd/libgd/gdfontg.h +++ b/ext/gd/libgd/gdfontg.h @@ -20,6 +20,7 @@ extern "C" { #include "gd.h" extern gdFontPtr gdFontGiant; +extern gdFontPtr gdFontGetGiant(void); #ifdef __cplusplus } diff --git a/ext/gd/libgd/gdfontl.c b/ext/gd/libgd/gdfontl.c index e5d65d8fa8..6da54e1a12 100644 --- a/ext/gd/libgd/gdfontl.c +++ b/ext/gd/libgd/gdfontl.c @@ -4638,4 +4638,9 @@ gdFont gdFontLargeRep = gdFontPtr gdFontLarge = &gdFontLargeRep; +gdFontPtr gdFontGetLarge(void) +{ + return gdFontLarge; +} + /* This file has not been truncated. */ diff --git a/ext/gd/libgd/gdfontl.h b/ext/gd/libgd/gdfontl.h index d79f4771fd..92fee14ff3 100644 --- a/ext/gd/libgd/gdfontl.h +++ b/ext/gd/libgd/gdfontl.h @@ -21,6 +21,7 @@ extern "C" { #include "gd.h" extern gdFontPtr gdFontLarge; +extern gdFontPtr gdFontGetLarge(void); #ifdef __cplusplus } diff --git a/ext/gd/libgd/gdfontmb.c b/ext/gd/libgd/gdfontmb.c index 7a4f3b68ed..dab7c0589d 100644 --- a/ext/gd/libgd/gdfontmb.c +++ b/ext/gd/libgd/gdfontmb.c @@ -3868,4 +3868,9 @@ gdFont gdFontMediumBoldRep = gdFontPtr gdFontMediumBold = &gdFontMediumBoldRep; +gdFontPtr gdFontGetMediumBold(void) +{ + return gdFontMediumBold; +} + /* This file has not been truncated. */ diff --git a/ext/gd/libgd/gdfontmb.h b/ext/gd/libgd/gdfontmb.h index 0b3fbae113..2e2f0cbe47 100644 --- a/ext/gd/libgd/gdfontmb.h +++ b/ext/gd/libgd/gdfontmb.h @@ -19,6 +19,7 @@ extern "C" { #include "gd.h" extern gdFontPtr gdFontMediumBold; +extern gdFontPtr gdFontGetMediumBold(void); #ifdef __cplusplus } diff --git a/ext/gd/libgd/gdfonts.c b/ext/gd/libgd/gdfonts.c index eec0a3d71e..165cf70c54 100644 --- a/ext/gd/libgd/gdfonts.c +++ b/ext/gd/libgd/gdfonts.c @@ -3868,4 +3868,9 @@ gdFont gdFontSmallRep = gdFontPtr gdFontSmall = &gdFontSmallRep; +gdFontPtr gdFontGetSmall(void) +{ + return gdFontSmall; +} + /* This file has not been truncated. */ diff --git a/ext/gd/libgd/gdfonts.h b/ext/gd/libgd/gdfonts.h index 3882bd2318..55d0e1f0b2 100644 --- a/ext/gd/libgd/gdfonts.h +++ b/ext/gd/libgd/gdfonts.h @@ -19,6 +19,7 @@ extern "C" { #include "gd.h" extern gdFontPtr gdFontSmall; +extern gdFontPtr gdFontGetSmall(void); #ifdef __cplusplus } diff --git a/ext/gd/libgd/gdfontt.c b/ext/gd/libgd/gdfontt.c index 9d0b73cf23..2e6d241506 100644 --- a/ext/gd/libgd/gdfontt.c +++ b/ext/gd/libgd/gdfontt.c @@ -2589,4 +2589,9 @@ gdFont gdFontTinyRep = gdFontPtr gdFontTiny = &gdFontTinyRep; +gdFontPtr gdFontGetTiny(void) +{ + return gdFontTiny; +} + /* This file has not been truncated. */ diff --git a/ext/gd/libgd/gdfontt.h b/ext/gd/libgd/gdfontt.h index 181ce5c5f0..102fec991b 100644 --- a/ext/gd/libgd/gdfontt.h +++ b/ext/gd/libgd/gdfontt.h @@ -20,6 +20,7 @@ extern "C" { #include "gd.h" extern gdFontPtr gdFontTiny; +extern gdFontPtr gdFontGetTiny(void); #ifdef __cplusplus } diff --git a/ext/gd/libgd/gdft.c b/ext/gd/libgd/gdft.c index 7578857c1b..844e92ff2e 100644 --- a/ext/gd/libgd/gdft.c +++ b/ext/gd/libgd/gdft.c @@ -79,9 +79,9 @@ gdImageStringFT (gdImage * im, int *brect, int fg, char *fontlist, /* * The character (space) used to separate alternate fonts in the - * fontlist parameter to gdImageStringFT. + * fontlist parameter to gdImageStringFT. 2.0.18: space was a oor choice for this. */ -#define LISTSEPARATOR " " +#define LISTSEPARATOR ";" /* * DEFAULT_FONTPATH and PATHSEPARATOR are host type dependent and @@ -473,7 +473,7 @@ static void *fontFetch (char **error, void *key) encoding = charmap->encoding_id; /* EAM DEBUG - Newer versions of libfree2 make it easier by defining encodings */ -#ifdef FT_ENCODING_MS_SYMBOL +#if (defined(FREETYPE_MAJOR) && (FREETYPE_MAJOR >=2 ) && (FREETYPE_MINOR >= 1)) if (charmap->encoding == FT_ENCODING_MS_SYMBOL || charmap->encoding == FT_ENCODING_ADOBE_CUSTOM || charmap->encoding == FT_ENCODING_ADOBE_STANDARD) { @@ -482,7 +482,7 @@ static void *fontFetch (char **error, void *key) a->face->charmap = charmap; return (void *)a; } -#endif /* FT_ENCODING_MS_SYMBOL */ +#endif /* Freetype 2.1 or better */ /* EAM DEBUG */ if ((platform == 3 && encoding == 1) /* Windows Unicode */ @@ -777,6 +777,11 @@ void gdFontCacheShutdown() FT_Done_FreeType(library); } } + +void gdFreeFontCache() +{ + gdFontCacheShutdown(); +} int gdFontCacheSetup(void) { @@ -965,7 +970,7 @@ gdImageStringFTEx (gdImage * im, int *brect, int fg, char *fontlist, double ptsi } /* EAM DEBUG */ -#ifdef FT_ENCODING_MS_SYMBOL +#if (defined(FREETYPE_MAJOR) && (FREETYPE_MAJOR >=2 ) && (FREETYPE_MINOR >= 1)) 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 @@ -975,7 +980,7 @@ gdImageStringFTEx (gdImage * im, int *brect, int fg, char *fontlist, double ptsi ch |= 0xf000; next += len; } else -#endif /* FT_ENCODING_MS_SYMBOL */ +#endif /* Freetype 2.1 or better */ /* EAM DEBUG */ switch (m) { -- 2.40.0