diff options
| author | marha <marha@users.sourceforge.net> | 2013-02-13 09:55:16 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-02-13 09:55:16 +0100 |
| commit | 88bcd02cfecbf8ba9cf726b0d337c56f9c9b2bc4 (patch) | |
| tree | ded42639873b943c7ec97b06961ad067228652d1 /freetype/src/pshinter/pshpic.c | |
| parent | 3247a4e031a7d5160332c0d7ca2a91a516c082bb (diff) | |
| parent | aaf21968deb85b635cb6aa6544df233ea5981346 (diff) | |
| download | vcxsrv-88bcd02cfecbf8ba9cf726b0d337c56f9c9b2bc4.tar.gz vcxsrv-88bcd02cfecbf8ba9cf726b0d337c56f9c9b2bc4.tar.bz2 vcxsrv-88bcd02cfecbf8ba9cf726b0d337c56f9c9b2bc4.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Update to following packages:
Conflicts:
freetype/src/autofit/afhints.c
freetype/src/autofit/afmodule.c
freetype/src/psaux/psconv.c
freetype/src/sfnt/sfntpic.h
openssl/Makefile
openssl/util/pl/VC-32.pl
Diffstat (limited to 'freetype/src/pshinter/pshpic.c')
| -rw-r--r-- | freetype/src/pshinter/pshpic.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/freetype/src/pshinter/pshpic.c b/freetype/src/pshinter/pshpic.c index 0eaf7335f..626e93228 100644 --- a/freetype/src/pshinter/pshpic.c +++ b/freetype/src/pshinter/pshpic.c @@ -4,7 +4,7 @@ /* */ /* The FreeType position independent code services for pshinter module. */ /* */ -/* Copyright 2009, 2010 by */ +/* Copyright 2009, 2010, 2012 by */ /* Oran Agra and Mickey Gabel. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -22,6 +22,7 @@ #include "pshpic.h" #include "pshnterr.h" + #ifdef FT_CONFIG_OPTION_PIC /* forward declaration of PIC init functions from pshmod.c */ @@ -33,7 +34,7 @@ pshinter_module_class_pic_free( FT_Library library ) { FT_PIC_Container* pic_container = &library->pic_container; - FT_Memory memory = library->memory; + FT_Memory memory = library->memory; if ( pic_container->pshinter ) @@ -49,7 +50,7 @@ { FT_PIC_Container* pic_container = &library->pic_container; FT_Error error = PSH_Err_Ok; - PSHinterPIC* container; + PSHinterPIC* container = NULL; FT_Memory memory = library->memory; @@ -63,13 +64,12 @@ FT_Init_Class_pshinter_interface( library, &container->pshinter_interface ); -/*Exit:*/ if( error ) pshinter_module_class_pic_free( library ); return error; } - #endif /* FT_CONFIG_OPTION_PIC */ + /* END */ |