CVS update: php3/functions
| From: | rasmus | Date: | Tue, 08 Sep 1998 22:33:53 +0000 |
| Subject: | CVS update: php3/functions | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-12@lists.php.net to get a copy of this message | ||
Date: Tuesday September 8, 1998 @ 18:33
Author: rasmus
Update of /repository/php3/functions
In directory asf:/tmp/cvs-serv20744/functions
Modified Files:
gdttf.c
Log Message:
More gdttf.c roundoff fixes
Index: php3/functions/gdttf.c
diff -c php3/functions/gdttf.c:1.11 php3/functions/gdttf.c:1.12
*** php3/functions/gdttf.c:1.11 Thu Aug 6 21:54:11 1998
--- php3/functions/gdttf.c Tue Sep 8 18:33:53 1998
***************
*** 34,47 ****
/* ptsize below which anti-aliasing is ineffective */
#define MINANTIALIASPTSIZE 0
! /* display resolution - (Not really. This has to be 72 or hinting is wrong */
#define RESOLUTION 72
/* Number of colors used for anti-aliasing */
#define NUMCOLORS 4
/* Line separation as a factor of font height.
! No space between if LINESPACE = 1.00 */
#define LINESPACE 1.05
#ifndef TRUE
--- 34,48 ----
/* ptsize below which anti-aliasing is ineffective */
#define MINANTIALIASPTSIZE 0
! /* display resolution - (Not really. This has to be 72 or hinting is wrong) */
#define RESOLUTION 72
/* Number of colors used for anti-aliasing */
#define NUMCOLORS 4
/* Line separation as a factor of font height.
! No space between if LINESPACE = 1.00
! Line separation will be rounded up to next pixel row*/
#define LINESPACE 1.05
#ifndef TRUE
***************
*** 338,353 ****
return NULL;
}
- #if 0
- /* Set flag if font is rotated */
- if (a->angle == 0) {
- TT_Set_Instance_Transform_Flags(a->instance, FALSE, FALSE);
- }
- else {
- TT_Set_Instance_Transform_Flags(a->instance, TRUE, FALSE);
- }
- #endif
-
TT_Get_Instance_Metrics(a->instance, &a->imetrics);
/* First, look for a Unicode charmap */
--- 339,344 ----
***************
*** 628,638 ****
*next += len;
glyphkey.character = ch;
- #if 0
- glyphkey.hinting = (fg<0)?0:1;
- #else
glyphkey.hinting = 1;
- #endif
glyphkey.font = font;
glyph = (glyph_t *)gdCacheGet(font->glyphCache, &glyphkey);
if (! glyph)
--- 619,625 ----
***************
*** 652,659 ****
gdCacheGet(glyph->bitmapCache, &bitmapkey);
/* copy to gif, mapping colors */
! x2 = x + (glyph->xmin + ((x1+32) & -64)) / 64;
! y2 = y - (glyph->ymin + ((y1+32) & -64)) / 64;
tweencolorkey.fgcolor = fg;
tweencolorkey.im = im;
for (row = 0; row < glyph->Bit.rows; row++) {
--- 639,646 ----
gdCacheGet(glyph->bitmapCache, &bitmapkey);
/* copy to gif, mapping colors */
! x2 = x + (((glyph->xmin+32) & -64) + ((x1+32) & -64)) / 64;
! y2 = y - (((glyph->ymin+32) & -64) + ((y1+32) & -64)) / 64;
tweencolorkey.fgcolor = fg;
tweencolorkey.im = im;
for (row = 0; row < glyph->Bit.rows; row++) {
***************
*** 746,752 ****
}
/* newlines */
if (ch == '\n') {
! advance_y -= (TT_F26Dot6)((font->imetrics.y_ppem * LINESPACE) * 64);
next++;
continue;
}
--- 733,740 ----
}
/* newlines */
if (ch == '\n') {
! advance_y -= (TT_F26Dot6)(font->imetrics.y_ppem * LINESPACE * 64);
! advance_y = (advance_y-32) & -64; /* round to next pixel row */
next++;
continue;
}