summaryrefslogtreecommitdiff
path: root/ext/gd/libgd/gd.h
diff options
context:
space:
mode:
authorRasmus Lerdorf <rasmus@php.net>2002-10-29 23:08:01 +0000
committerRasmus Lerdorf <rasmus@php.net>2002-10-29 23:08:01 +0000
commita24534a1ed1a38024fba0c5fe5374effb7432d0b (patch)
treed60c061c3cec25d29c4d99026eee958b75aa4a34 /ext/gd/libgd/gd.h
parent8c95cefac6db0ec18002e9c46b55895c584c8c07 (diff)
downloadphp-git-a24534a1ed1a38024fba0c5fe5374effb7432d0b.tar.gz
Update bundled gd library with relevant changes from gd-2.0.4
I still need to add a configure check for the gdIOCtx struct changes so building against older external gd libs will work again.
Diffstat (limited to 'ext/gd/libgd/gd.h')
-rw-r--r--ext/gd/libgd/gd.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/ext/gd/libgd/gd.h b/ext/gd/libgd/gd.h
index ab38a577c9..21c3c5515b 100644
--- a/ext/gd/libgd/gd.h
+++ b/ext/gd/libgd/gd.h
@@ -7,7 +7,7 @@ extern "C" {
#ifndef WIN32
/* default fontpath for unix systems */
-#define DEFAULT_FONTPATH "/usr/share/fonts/truetype"
+#define DEFAULT_FONTPATH "/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1"
#define PATHSEPARATOR ":"
#else
/* default fontpath for windows systems */
@@ -254,6 +254,9 @@ void gdImageStringUp(gdImagePtr im, gdFontPtr f, int x, int y, unsigned char *s,
void gdImageString16(gdImagePtr im, gdFontPtr f, int x, int y, unsigned short *s, int color);
void gdImageStringUp16(gdImagePtr im, gdFontPtr f, int x, int y, unsigned short *s, int color);
+/* clean up after using fonts in gdImageStringFT() */
+void gdFreeFontCache();
+
/* Calls gdImageStringFT. Provided for backwards compatibility only. */
char *gdImageStringTTF(gdImage *im, int *brect, int fg, char *fontlist,
double ptsize, double angle, int x, int y, char *string);
@@ -370,6 +373,8 @@ void gdFree(void *m);
/* Best to free this memory with gdFree(), not free() */
void *gdImageWBMPPtr(gdImagePtr im, int *size, int fg);
+/* 100 is highest quality (there is always a little loss with JPEG).
+ 0 is lowest. 10 is about the lowest useful setting. */
void gdImageJpeg(gdImagePtr im, FILE *out, int quality);
void gdImageJpegCtx(gdImagePtr im, gdIOCtx *out, int quality);