Commit 0f2a415770d34996fe382333971a1f0c863eafd6
2004-12-28T07:31:35
* src/base/ftbitmap.c (FT_Bitmap_Convert): Fix compiler warning.
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
diff --git a/ChangeLog b/ChangeLog
index 5215d67..52b9b38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-25 Werner Lemberg <wl@gnu.org>
+
+ * src/base/ftbitmap.c (FT_Bitmap_Convert): Fix compiler warning.
+
2004-12-15 Werner Lemberg <wl@gnu.org>
* 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 3e3d0fc..ea62aa2 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 340a599..f89d4b1 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 ec4d1e4..c896dad 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. */