Commit bd8e324af93e96a8f3ec28a2aa1162f0ad01e867
2002-06-12T08:43:58
* src/bdf/bdflib.c: s/FT_Short/short/ for consistency.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101
diff --git a/ChangeLog b/ChangeLog
index d58bd41..3110f6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,25 @@
+2002-06-12 Werner Lemberg <wl@gnu.org>
+
+ * src/bdf/bdflib.c: s/FT_Short/short/ for consistency.
+
2002-06-11 David Turner <david@freetype.org>
- * 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
+ Removed the bug in Type 42 driver that prevented un-hinted outlines
+ to be loaded.
- * src/type42/t42objs.c: removed the bug 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 <jch@pps.jussieu.fr>
diff --git a/src/bdf/bdflib.c b/src/bdf/bdflib.c
index 8984040..f34760e 100644
--- 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 ));
}
}
diff --git a/src/type42/t42objs.c b/src/type42/t42objs.c
index 452550b..da2e7e6 100644
--- 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,
@@ -799,6 +799,7 @@
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 );
ft_glyphslot_clear( t42slot->ttslot );