CVS update: php3/functions

Date: Sunday January 24, 1999 @ 17:41 Author: rasmus Update of /repository/php3/functions In directory asf:/home/rasmus/php3/functions Modified Files: gdttf.c Log Message: Improvements in FreeType support: Macintosh fonts work, and non-antialiased output is considerably cleaner <mka@satama.com> Index: php3/functions/gdttf.c diff -c php3/functions/gdttf.c:1.18 php3/functions/gdttf.c:1.19 *** php3/functions/gdttf.c:1.18 Mon Dec 28 04:34:54 1998 --- php3/functions/gdttf.c Sun Jan 24 17:41:45 1999 *************** *** 2,8 **** /* */ /* John Ellson ellson@lucent.com */ ! /* $Id: gdttf.c,v 1.18 1998/12/28 09:34:54 sas Exp $ */ #if WIN32|WINNT #include "config.w32.h" --- 2,8 ---- /* */ /* John Ellson ellson@lucent.com */ ! /* $Id: gdttf.c,v 1.19 1999/01/24 22:41:45 rasmus Exp $ */ #if WIN32|WINNT #include "config.w32.h" *************** *** 93,98 **** --- 93,99 ---- typedef struct { int character; /* key */ int hinting; /* key */ + int gray_render; font_t *font; } glyphkey_t; *************** *** 413,419 **** for (i = 0; i < n; i++) { TT_Get_CharMap_ID(a->face, i, &platform, &encoding); if ((platform == 3 && encoding == 1) || ! (platform == 0 && encoding == 0)) { TT_Get_CharMap(a->face, i, &a->char_map); i = n+1; } --- 414,421 ---- for (i = 0; i < n; i++) { TT_Get_CharMap_ID(a->face, i, &platform, &encoding); if ((platform == 3 && encoding == 1) || ! (platform == 2 && encoding == 1) || ! (platform == 0)) { TT_Get_CharMap(a->face, i, &a->char_map); i = n+1; } *************** *** 457,463 **** glyphkey_t *b=(glyphkey_t *)key; return (a->character == b->character ! && a->hinting == b->hinting); } static void * --- 459,466 ---- glyphkey_t *b=(glyphkey_t *)key; return (a->character == b->character ! && a->hinting == b->hinting ! && a->gray_render == b->gray_render); } static void * *************** *** 473,479 **** a = (glyph_t *)malloc(sizeof(glyph_t)); a->character = b->character; a->hinting = b->hinting; ! a->gray_render = (b->font->ptsize < MINANTIALIASPTSIZE)?FALSE:TRUE; a->oldx = a->oldy = 0; /* create glyph container */ --- 476,482 ---- a = (glyph_t *)malloc(sizeof(glyph_t)); a->character = b->character; a->hinting = b->hinting; ! a->gray_render = b->gray_render; a->oldx = a->oldy = 0; /* create glyph container */ *************** *** 686,691 **** --- 689,696 ---- glyphkey.character = ch; glyphkey.hinting = 1; + /* if fg is specified by a negative color idx, then don't antialias */ + glyphkey.gray_render = ((font->ptsize < MINANTIALIASPTSIZE) || (fg <0))?FALSE:TRUE; glyphkey.font = font; glyph = (glyph_t *)gdCacheGet(font->glyphCache, &glyphkey); if (! glyph) *************** *** 784,790 **** } sin_a = font->sin_a; cos_a = font->cos_a; - advance_x = advance_y = 0; next=string; --- 789,794 ---- -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net