ref: bd8e324af93e96a8f3ec28a2aa1162f0ad01e867
parent: a1e45652bec43ea1ebb6c654ee1de404638b75a4
author: Werner Lemberg <[email protected]>
date: Wed Jun 12 04:43:58 EDT 2002
* src/bdf/bdflib.c: s/FT_Short/short/ for consistency.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,25 @@
+2002-06-12 Werner Lemberg <[email protected]>
+
+ * src/bdf/bdflib.c: s/FT_Short/short/ for consistency.
+
2002-06-11 David Turner <[email protected]>
- * builds/win32/ftdebug.c: added a missing #endif
+ * builds/win32/ftdebug.c: Added a missing #endif.
- * src/sfnt/ttload.c, src/bdf/bdflib.c: removing compiler warnings
+ * src/sfnt/ttload.c, src/bdf/bdflib.c: Removing compiler warnings.
- * src/type42/t42objs.c: removed the bug that prevented un-hinted
- outlines to be loaded
+ Removed the bug in Type 42 driver that prevented un-hinted outlines
+ to be loaded.
+
+ * src/type42/t42objs.c (T42_Face_Init): Call FT_Done_Size.
+ (T42_Size_Init): Call FT_Activate_Size.
+ (t42_check_size_change): New function.
+ (T42_Size_SetChars, T42_Size_SetPixels): Use it.
+ (ft_glyphslot_clear): Replace FT_MEM_SET with FT_ZERO.
+ (T42_GlyphSlot_Load): Use t42_check_size_change.
+ Initialize more fields of `glyph'.
+
+ * builds/win32/visualc/freetype.dsp: Updated.
2002-06-08 Juliusz Chroboczek <[email protected]>
--- a/src/bdf/bdflib.c
+++ b/src/bdf/bdflib.c
@@ -1772,14 +1772,14 @@
/* Determine the overall font bounding box as the characters are */
/* loaded so corrections can be done later if indicated. */
- p->maxas = (FT_Short) MAX( glyph->bbx.ascent, p->maxas );
- p->maxds = (FT_Short) MAX( glyph->bbx.descent, p->maxds );
+ p->maxas = (short)MAX( glyph->bbx.ascent, p->maxas );
+ p->maxds = (short)MAX( glyph->bbx.descent, p->maxds );
p->rbearing = (short)( glyph->bbx.width + glyph->bbx.x_offset );
- p->maxrb = (FT_Short) MAX( p->rbearing, p->maxrb );
- p->minlb = (FT_Short) MIN( glyph->bbx.x_offset, p->minlb );
- p->maxlb = (FT_Short) MAX( glyph->bbx.x_offset, p->maxlb );
+ p->maxrb = (short)MAX( p->rbearing, p->maxrb );
+ p->minlb = (short)MIN( glyph->bbx.x_offset, p->minlb );
+ p->maxlb = (short)MAX( glyph->bbx.x_offset, p->maxlb );
if ( !( p->flags & _BDF_DWIDTH ) )
{@@ -2165,12 +2165,12 @@
shift >>= 1;
}
- shift = (FT_UShort)(( bitcount > 3 ) ? 8 : ( 1 << bitcount ));
+ shift = (short)( ( bitcount > 3 ) ? 8 : ( 1 << bitcount ) );
if ( p->font->bpp > shift || p->font->bpp != shift )
{/* select next higher value */
- p->font->bpp = (FT_UShort)(shift << 1);
+ p->font->bpp = (unsigned short)( shift << 1 );
FT_TRACE2(( "_bdf_parse_start: " ACMSG11, p->font->bpp ));
}
}
--- a/src/type42/t42objs.c
+++ b/src/type42/t42objs.c
@@ -711,6 +711,7 @@
FT_Face tt_face = ((T42_Face)face)->ttf_face;
FT_Size tt_size = ((T42_Size)face->size)->ttsize;
+
if ( tt_face->size != tt_size )
FT_Activate_Size( tt_size );
}
@@ -746,7 +747,6 @@
T42_Face t42face = (T42_Face)face;
-
t42_check_size_change( t42face->ttf_face );
return FT_Set_Pixel_Sizes( t42face->ttf_face,
@@ -798,6 +798,7 @@
T42_Size t42size = (T42_Size)size;
FT_Face tt_face = ((T42_Face) glyph->face)->ttf_face;
FT_Driver_Class ttclazz = ((T42_Driver)glyph->face->driver)->ttclazz;
+
t42_check_size_change( tt_face );