From 0f2a415770d34996fe382333971a1f0c863eafd6 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Tue, 28 Dec 2004 07:31:35 +0000 Subject: [PATCH] * src/base/ftbitmap.c (FT_Bitmap_Convert): Fix compiler warning. --- ChangeLog | 6 +++++- src/base/ftbitmap.c | 2 +- src/cff/cffload.c | 1 + src/cff/cffobjs.c | 7 ++++--- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5215d6754..52b9b38dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-12-25 Werner Lemberg + + * src/base/ftbitmap.c (FT_Bitmap_Convert): Fix compiler warning. + 2004-12-15 Werner Lemberg * vms_make.com: Add ftbitmap.obj. @@ -715,7 +719,7 @@ builds/win32/visualc/freetype.vcproj: s/219/2110/, s/2.1.9/2.1.10/. * builds/freetype.mk (refdoc), README, Jamfile (RefDoc): - s/2.1.8/2.1.9/. + s/2.1.9/2.1.10/. * docs/CHANGES, docs/VERSION.DLL: Updated. diff --git a/src/base/ftbitmap.c b/src/base/ftbitmap.c index 3e3d0fc1e..ea62aa287 100644 --- a/src/base/ftbitmap.c +++ b/src/base/ftbitmap.c @@ -44,7 +44,7 @@ FT_Bitmap *target, FT_Int alignment ) { - FT_Error error; + FT_Error error = FT_Err_Ok; FT_Memory memory; FT_Int i, j, old_size; FT_Byte *s, *ss, *t, *tt; diff --git a/src/cff/cffload.c b/src/cff/cffload.c index 340a5993c..f89d4b12a 100644 --- a/src/cff/cffload.c +++ b/src/cff/cffload.c @@ -2100,6 +2100,7 @@ FT_ULong base_offset; CFF_FontRecDict dict; + FT_ZERO( font ); font->stream = stream; diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c index ec4d1e4f5..c896daddc 100644 --- a/src/cff/cffobjs.c +++ b/src/cff/cffobjs.c @@ -464,7 +464,8 @@ cff->psnames = (void*)psnames; /* Complement the root flags with some interesting information. */ - /* Note that this is only necessary for pure CFF and CEF fonts. */ + /* Note that this is only necessary for pure CFF and CEF fonts; */ + /* SFNT based fonts use the `name' table instead. */ cffface->num_glyphs = cff->num_glyphs; @@ -486,7 +487,7 @@ char* style_name = NULL; - /* Set up num_faces. */ + /* set up num_faces */ cffface->num_faces = cff->num_faces; /* compute number of glyphs */ @@ -558,7 +559,7 @@ if ( !*family && *fullp ) { - /* Rhe full name begins with the same characters as the */ + /* The full name begins with the same characters as the */ /* family name, with spaces and dashes removed. In this */ /* case, the remaining string in `fullp' will be used as */ /* the style name. */