minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

[bdf,pcf,truetype] NULL.

This commit is contained in:
Alexei Podtelezhnikov 2015-04-11 23:54:19 -04:00
parent 9de55e0355
commit adb08efcf1
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bdf/bdfdrivr.c
View File

@ -420,7 +420,7 @@ THE SOFTWARE.
goto Exit;
}
else
bdfface->family_name = 0;
bdfface->family_name = NULL;
if ( ( error = bdf_interpret_style( face ) ) != 0 )
goto Exit;
@ -509,7 +509,7 @@ THE SOFTWARE.
/* charmaps */
{
bdf_property_t *charset_registry = 0, *charset_encoding = 0;
bdf_property_t *charset_registry, *charset_encoding;
FT_Bool unicode_charmap = 0;

6
src/bdf/bdflib.c
View File

@ -683,7 +683,7 @@
unsigned long lineno, buf_size;
int refill, hold, to_skip;
ptrdiff_t bytes, start, end, cursor, avail;
char* buf = 0;
char* buf = NULL;
FT_Memory memory = stream->memory;
FT_Error error = FT_Err_Ok;
@ -1751,7 +1751,7 @@
glyph->encoding = p->glyph_enc;
/* Reset the initial glyph info. */
p->glyph_name = 0;
p->glyph_name = NULL;
}
else
{
@ -1779,7 +1779,7 @@
/* kept. */
FT_FREE( p->glyph_name );
p->glyph_name = 0;
p->glyph_name = NULL;
}
/* Clear the flags that might be added when width and height are */

8
src/pcf/pcfread.c
View File

@ -448,14 +448,14 @@ THE SOFTWARE.
pcf_get_properties( FT_Stream stream,
PCF_Face face )
{
PCF_ParseProperty props = 0;
PCF_ParseProperty props = NULL;
PCF_Property properties = NULL;
FT_ULong nprops, i;
FT_ULong format, size;
FT_Error error;
FT_Memory memory = FT_FACE( face )->memory;
FT_ULong string_size;
FT_String* strings = 0;
FT_String* strings = NULL;
error = pcf_seek_to_table_type( stream,
@ -620,7 +620,7 @@ THE SOFTWARE.
FT_Error error;
FT_Memory memory = FT_FACE( face )->memory;
FT_ULong format, size;
PCF_Metric metrics = 0;
PCF_Metric metrics = NULL;
FT_ULong nmetrics, i;
@ -1316,7 +1316,7 @@ THE SOFTWARE.
/* set up charset */
{
PCF_Property charset_registry = 0, charset_encoding = 0;
PCF_Property charset_registry, charset_encoding;
charset_registry = pcf_find_property( face, "CHARSET_REGISTRY" );

4
src/truetype/ttgload.c
View File

@ -409,7 +409,7 @@
/* reading the bytecode instructions */
load->glyph->control_len = 0;
load->glyph->control_data = 0;
load->glyph->control_data = NULL;
if ( p + 2 > limit )
goto Invalid_Outline;
@ -1730,7 +1730,7 @@
{
FT_UInt n, num_base_points;
FT_SubGlyph subglyph = 0;
FT_SubGlyph subglyph = NULL;
FT_UInt num_points = start_point;
FT_UInt num_subglyphs = gloader->current.num_subglyphs;