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/psnames | |
| 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/psnames')
| -rw-r--r-- | freetype/src/psnames/psmodule.c | 6 | ||||
| -rw-r--r-- | freetype/src/psnames/pspic.c | 14 |
2 files changed, 12 insertions, 8 deletions
diff --git a/freetype/src/psnames/psmodule.c b/freetype/src/psnames/psmodule.c index 0ff231c2b..26f3c973c 100644 --- a/freetype/src/psnames/psmodule.c +++ b/freetype/src/psnames/psmodule.c @@ -366,11 +366,13 @@ if ( count == 0 ) { + /* No unicode chars here! */ FT_FREE( table->maps ); if ( !error ) - error = PSnames_Err_Invalid_Argument; /* No unicode chars here! */ + error = PSnames_Err_No_Unicode_Glyph_Name; } - else { + else + { /* Reallocate if the number of used entries is much smaller. */ if ( count < num_glyphs / 2 ) { diff --git a/freetype/src/psnames/pspic.c b/freetype/src/psnames/pspic.c index 6ecabeb1a..fa14f79d6 100644 --- a/freetype/src/psnames/pspic.c +++ b/freetype/src/psnames/pspic.c @@ -4,7 +4,7 @@ /* */ /* The FreeType position independent code services for psnames module. */ /* */ -/* Copyright 2009 by */ +/* Copyright 2009, 2010 by */ /* Oran Agra and Mickey Gabel. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -44,13 +44,15 @@ } } + FT_Error - psnames_module_class_pic_init( FT_Library library ) + psnames_module_class_pic_init( FT_Library library ) { - FT_PIC_Container* pic_container = &library->pic_container; - FT_Error error = FT_Err_Ok; - PSModulePIC* container; - FT_Memory memory = library->memory; + FT_PIC_Container* pic_container = &library->pic_container; + FT_Error error = PSnames_Err_Ok; + PSModulePIC* container; + FT_Memory memory = library->memory; + /* allocate pointer, clear and set global container pointer */ if ( FT_ALLOC ( container, sizeof ( *container ) ) ) |