* src/base/ftbitmap.c (FT_Bitmap_Convert): Fix compiler warning.
This commit is contained in:
parent
b88624fc3b
commit
0f2a415770
|
@ -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>
|
2004-12-15 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
* vms_make.com: Add ftbitmap.obj.
|
* 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/win32/visualc/freetype.vcproj: s/219/2110/, s/2.1.9/2.1.10/.
|
||||||
|
|
||||||
* builds/freetype.mk (refdoc), README, Jamfile (RefDoc):
|
* 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.
|
* docs/CHANGES, docs/VERSION.DLL: Updated.
|
||||||
|
|
||||||
|
|
|
@ -44,7 +44,7 @@
|
||||||
FT_Bitmap *target,
|
FT_Bitmap *target,
|
||||||
FT_Int alignment )
|
FT_Int alignment )
|
||||||
{
|
{
|
||||||
FT_Error error;
|
FT_Error error = FT_Err_Ok;
|
||||||
FT_Memory memory;
|
FT_Memory memory;
|
||||||
FT_Int i, j, old_size;
|
FT_Int i, j, old_size;
|
||||||
FT_Byte *s, *ss, *t, *tt;
|
FT_Byte *s, *ss, *t, *tt;
|
||||||
|
|
|
@ -2100,6 +2100,7 @@
|
||||||
FT_ULong base_offset;
|
FT_ULong base_offset;
|
||||||
CFF_FontRecDict dict;
|
CFF_FontRecDict dict;
|
||||||
|
|
||||||
|
|
||||||
FT_ZERO( font );
|
FT_ZERO( font );
|
||||||
|
|
||||||
font->stream = stream;
|
font->stream = stream;
|
||||||
|
|
|
@ -464,7 +464,8 @@
|
||||||
cff->psnames = (void*)psnames;
|
cff->psnames = (void*)psnames;
|
||||||
|
|
||||||
/* Complement the root flags with some interesting information. */
|
/* 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;
|
cffface->num_glyphs = cff->num_glyphs;
|
||||||
|
|
||||||
|
@ -486,7 +487,7 @@
|
||||||
char* style_name = NULL;
|
char* style_name = NULL;
|
||||||
|
|
||||||
|
|
||||||
/* Set up num_faces. */
|
/* set up num_faces */
|
||||||
cffface->num_faces = cff->num_faces;
|
cffface->num_faces = cff->num_faces;
|
||||||
|
|
||||||
/* compute number of glyphs */
|
/* compute number of glyphs */
|
||||||
|
@ -558,7 +559,7 @@
|
||||||
|
|
||||||
if ( !*family && *fullp )
|
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 */
|
/* family name, with spaces and dashes removed. In this */
|
||||||
/* case, the remaining string in `fullp' will be used as */
|
/* case, the remaining string in `fullp' will be used as */
|
||||||
/* the style name. */
|
/* the style name. */
|
||||||
|
|
Loading…
Reference in New Issue