diff options
| author | marha <marha@users.sourceforge.net> | 2010-08-06 11:48:36 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-08-06 11:48:36 +0000 |
| commit | 20ff8ddf2d9bb41050d10bbc75d61b9161880c7c (patch) | |
| tree | 22566fcd9663b2baa565cd0c64eaa662d6ba03ee /freetype/src/pfr/pfrload.c | |
| parent | c29011f2831315d3da9c4727c1e626d80520b97a (diff) | |
| parent | 6849d83857b4e470a44ad8b6aa5cfb283fd64c89 (diff) | |
| download | vcxsrv-20ff8ddf2d9bb41050d10bbc75d61b9161880c7c.tar.gz vcxsrv-20ff8ddf2d9bb41050d10bbc75d61b9161880c7c.tar.bz2 vcxsrv-20ff8ddf2d9bb41050d10bbc75d61b9161880c7c.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'freetype/src/pfr/pfrload.c')
| -rw-r--r-- | freetype/src/pfr/pfrload.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/freetype/src/pfr/pfrload.c b/freetype/src/pfr/pfrload.c index 4fed71a64..e9186e22c 100644 --- a/freetype/src/pfr/pfrload.c +++ b/freetype/src/pfr/pfrload.c @@ -4,7 +4,7 @@ /* */ /* FreeType PFR loader (body). */ /* */ -/* Copyright 2002, 2003, 2004, 2005, 2007, 2009 by */ +/* Copyright 2002, 2003, 2004, 2005, 2007, 2009, 2010 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -49,7 +49,7 @@ PFR_ExtraItem item_list, FT_Pointer item_data ) { - FT_Error error = 0; + FT_Error error = PFR_Err_Ok; FT_Byte* p = *pp; FT_UInt num_items, item_type, item_size; @@ -353,7 +353,7 @@ PFR_Strike strike; FT_UInt flags0; FT_UInt n, count, size1; - FT_Error error = 0; + FT_Error error = PFR_Err_Ok; PFR_CHECK( 5 ); @@ -449,7 +449,7 @@ FT_Byte* limit, PFR_PhyFont phy_font ) { - FT_Error error = 0; + FT_Error error = PFR_Err_Ok; FT_Memory memory = phy_font->memory; FT_PtrDist len = limit - p; @@ -477,7 +477,7 @@ { FT_UInt count, num_vert, num_horz; FT_Int* snaps; - FT_Error error = 0; + FT_Error error = PFR_Err_Ok; FT_Memory memory = phy_font->memory; @@ -520,8 +520,8 @@ FT_Byte* limit, PFR_PhyFont phy_font ) { - PFR_KernItem item; - FT_Error error = 0; + PFR_KernItem item = NULL; + FT_Error error = PFR_Err_Ok; FT_Memory memory = phy_font->memory; @@ -631,7 +631,7 @@ FT_Memory memory, FT_String* *astring ) { - FT_Error error = 0; + FT_Error error = PFR_Err_Ok; FT_String* result = NULL; FT_UInt n, ok; |